Skip to content

Commit 6a40d02

Browse files
Merge remote-tracking branch 'dhewm3/master'
2 parents a07aa97 + 8dc5c82 commit 6a40d02

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

neo/framework/Session_menu.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ static void loadMod ( const idStr& modName ) {
559559
static const char* d3xpMods[] = {
560560
// TODO: if there are more mods that need d3xp as base
561561
// (and that are supported by dhewm3), add them here
562+
"bloodmod_roe",
562563
"d3le", // The Lost Mission
563564
"librecoopd3xp",
564565
"perfected_roe",

neo/renderer/Image_files.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,9 @@ bool R_LoadCubeImages( const char *imgName, cubeFiles_t extensions, byte *pics[6
10761076
if ( pics ) {
10771077
for ( j = 0 ; j < i ; j++ ) {
10781078
R_StaticFree( pics[j] );
1079+
// DG: this lets ActuallyLoadImage() print a warning and load
1080+
// a default texture instead of crash later
1081+
pics[j] = NULL;
10791082
}
10801083
}
10811084

0 commit comments

Comments
 (0)