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

- little bit of cleanup on tileImport.

Browse source
This commit is contained in:
Christoph Oelckers 2020-09-16 00:10:12 +02:00
parent ce82eaf899
commit 616838dd0a
3 changed files with 45 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -760,7 +760,7 @@ static int32_t defsparser(scriptfile *script)
break;
}
}
tileImport(pos, imp);
processTileImport("tileimporttexture", pos, imp);
}
break;
case T_COPYTILE:

60
source/core/textures/buildtiles.cpp
View file

@ -1069,37 +1069,63 @@ bool PickTexture(int picnum, FGameTexture* tex, int paletteid, TexturePick& pick
return true;
}
//===========================================================================
//
// Parsing stuff for tile data comes below.
//
//===========================================================================
//===========================================================================
//
// Helpers for tile parsing
//
//===========================================================================
bool ValidateTileRange(const char* cmd, int &begin, int& end, FScriptPosition pos)
{
if (end < begin)
{
pos.Message(MSG_WARNING, "%s: tile range [%d..%d] is backwards. Indices were swapped.", cmd, begin, end);
std::swap(begin, end);
}
if ((unsigned)begin >= MAXUSERTILES || (unsigned)end >= MAXUSERTILES)
{
pos.Message(MSG_ERROR, "%s: Invalid tile range [%d..%d]", cmd, begin, end);
return false;
}
return true;
}
bool ValidateTilenum(const char* cmd, int tile, FScriptPosition pos)
{
if ((unsigned)tile >= MAXUSERTILES)
{
pos.Message(MSG_ERROR, "%s: Invalid tile number %d", cmd, tile);
return false;
}
return true;
}
//===========================================================================
//
// Internal worker for tileImportTexture
//
//===========================================================================
void tileImport(FScriptPosition& pos, TileImport& imp)
void processTileImport(const char *cmd, FScriptPosition& pos, TileImport& imp)
{
if (imp.tile == -1)
{
pos.Message(MSG_ERROR, "missing tile number in import declaration");
if (!ValidateTilenum(cmd, imp.tile, pos))
return;
}
if ((unsigned)imp.tile >= MAXUSERTILES)
{
pos.Message(MSG_ERROR, "Invalid tile number %d in import declaration", imp.tile);
return;
}
if (imp.crc32 != INT64_MAX && int(imp.crc32) != tileGetCRC32(imp.tile))
{
// Only print as developer diagnostic if that mode is enabled.
pos.Message(MSG_DEBUGMSG, "CRC32 mismatch for tile %d.", imp.tile);
return;
}
if (imp.sizex != INT_MAX && tileWidth(imp.tile) != imp.sizex && tileHeight(imp.tile) != imp.sizey)
{
pos.Message(MSG_DEBUGMSG, "Size mismatch for tile %d", imp.tile);
return;
}
gi->SetTileProps(imp.tile, imp.surface, imp.vox, imp.shade);
if (imp.fn.IsNotEmpty() && tileImportFromTexture(imp.fn, imp.tile, imp.alphacut, imp.istexture) < 0) return;

2
source/core/textures/buildtiles.h
View file

@ -518,4 +518,4 @@ struct TileImport
};
void tileImport(FScriptPosition& pos, TileImport& imp);
void processTileImport(const char* cmd, FScriptPosition& pos, TileImport& imp);