teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the ifcrc token: 0 is a valid CRC32 result!

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8296 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/defs.cpp
This commit is contained in:
hendricks266 2019-11-26 08:24:10 +00:00 committed by Christoph Oelckers
parent 92a699b7eb
commit 46d4855901
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/build/src/defs.cpp
View file

@ -650,7 +650,8 @@ static int32_t defsparser(scriptfile *script)
int32_t havexoffset = 0, haveyoffset = 0, haveextra = 0;
int32_t xoffset = 0, yoffset = 0;
int32_t istexture = 0;
int32_t tilecrc = 0, origcrc = 0;
int32_t tilecrc = 0;
uint8_t have_ifcrc = 0;
int32_t extra = 0;
static const tokenlist tilefromtexturetokens[] =
@ -695,6 +696,7 @@ static int32_t defsparser(scriptfile *script)
break;
case T_IFCRC:
scriptfile_getsymbol(script, &tilecrc);
have_ifcrc = 1;
break;
case T_TEXHITSCAN:
flags |= PICANM_TEXHITSCAN_BIT;
@ -721,9 +723,9 @@ static int32_t defsparser(scriptfile *script)
break;
}
if (tilecrc)
if (have_ifcrc)
{
origcrc = tileCRC(tile);
int32_t origcrc = tileCRC(tile);
if (origcrc != tilecrc)
{
//initprintf("CRC of tile %d doesn't match! CRC: %d, Expected: %d\n", tile, origcrc, tilecrc);