zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-14 03:40:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Always load widescreen def file

Browse source
This commit is contained in:
nukeykt 2019-08-10 03:25:44 +09:00 committed by Christoph Oelckers
parent 0a74187512
commit f87f38b8f0
3 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
source/blood/src/blood.cpp
View file

@ -1511,6 +1511,10 @@ int app_main(int argc, char const * const * argv)
LoadExtraArts(); LoadExtraArts();
levelLoadDefaults(); levelLoadDefaults();
loaddefinitionsfile(BLOODWIDESCREENDEF);
loaddefinitions_game(BLOODWIDESCREENDEF, FALSE);
const char *defsfile = G_DefFile(); const char *defsfile = G_DefFile();
uint32_t stime = timerGetTicks(); uint32_t stime = timerGetTicks();
if (!loaddefinitionsfile(defsfile)) if (!loaddefinitionsfile(defsfile))
@ -2134,31 +2138,34 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
} }
} }
if (EDUKE32_PREDICT_FALSE((unsigned)tile >= MAXUSERTILES)) if (!firstPass)
{ {
initprintf("Error: missing or invalid 'tile number' for texture definition near line %s:%d\n", if (EDUKE32_PREDICT_FALSE((unsigned)tile >= MAXUSERTILES))
pScript->filename, scriptfile_getlinum(pScript,texturetokptr));
break;
}
if (tilecrc)
{
origcrc = tileCRC(tile);
if (origcrc != tilecrc)
{ {
//initprintf("CRC of tile %d doesn't match! CRC: %d, Expected: %d\n", tile, origcrc, tilecrc); initprintf("Error: missing or invalid 'tile number' for texture definition near line %s:%d\n",
pScript->filename, scriptfile_getlinum(pScript,texturetokptr));
break; break;
} }
}
if (havesurface) if (tilecrc)
surfType[tile] = surface; {
if (havevox) origcrc = tileCRC(tile);
voxelIndex[tile] = vox; if (origcrc != tilecrc)
if (haveshade) {
tileShade[tile] = shade; //initprintf("CRC of tile %d doesn't match! CRC: %d, Expected: %d\n", tile, origcrc, tilecrc);
if (haveview) break;
picanm[tile].extra = view&7; }
}
if (havesurface)
surfType[tile] = surface;
if (havevox)
voxelIndex[tile] = vox;
if (haveshade)
tileShade[tile] = shade;
if (haveview)
picanm[tile].extra = view&7;
}
} }
break; break;

1
source/blood/src/common.cpp
View file

@ -241,6 +241,7 @@ void G_LoadGroups(int32_t autoload)
} }
} }
loaddefinitions_game(BLOODWIDESCREENDEF, TRUE);
loaddefinitions_game(G_DefFile(), TRUE); loaddefinitions_game(G_DefFile(), TRUE);
struct strllist *s; struct strllist *s;

2
source/blood/src/common_game.h
View file

@ -39,6 +39,8 @@ extern int g_useCwd;
#define APPBASENAME "nblood" #define APPBASENAME "nblood"
#endif #endif
#define BLOODWIDESCREENDEF "blood_widescreen.def"
#define BYTEVERSION 102 #define BYTEVERSION 102
#define EXEVERSION 101 #define EXEVERSION 101