Files
source/TileEngine/Tile Surface.cpp
T
00fb898600 Delete builddefines.h
Nothing was left in it but the include of profiler.h, and 132 translation units
were including it for that alone. Fifteen files were leaning on profiler.h to
drag in <set>, <vector> and <ostream> for them; those now include what they use.

This is the commit that moves line numbers. Removing an include line shifts
__LINE__ by one for everything below it, and __LINE__ is an immediate operand in
every Assert() and DebugMsg() call, so the four game executables differ from
their predecessors by roughly a thousand 32-bit constants each. Every one of
those is accounted for: each is a single immediate that moved by -1 where the
builddefines.h include went away, or +1 where a <set>/<vector> include was
added. Nothing else in .text, .rdata or .data moves, no object file's section
sizes change, and symbolize_crash and Ja2Export stay bit-identical.

The one non-immediate difference is that the 24 Editor translation units of the
non-editor apps stop emitting __Avx2WmemEnabledWeakValue, a 4-byte weak COMDAT
they only ever instantiated through profiler.h's <vector>. It is a UCRT weak
default that other translation units still provide.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-22 01:07:26 -03:00

237 lines
6.7 KiB
C++

#include "DEBUG.H"
#include "Sys Globals.h"
#include "XML.h"
TILE_IMAGERY *gTileSurfaceArray[ NUMBEROFTILETYPES ];
UINT8 gbDefaultSurfaceUsed[ NUMBEROFTILETYPES ];
UINT8 gbSameAsDefaultSurfaceUsed[ NUMBEROFTILETYPES ];
TILE_IMAGERY *LoadTileSurface( STR8 cFilename )
{
// Add tile surface
PTILE_IMAGERY pTileSurf = NULL;
VOBJECT_DESC VObjectDesc;
HVOBJECT hVObject;
HIMAGE hImage;
SGPFILENAME cStructureFilename;
SGPFILENAME cAdditionalPropertiesFilename;
SGPFILENAME cCommonAdditionalPropertiesFilename;
STR cEndOfName;
STRUCTURE_FILE_REF * pStructureFileRef;
BOOLEAN fOk;
hImage = CreateImage( cFilename, IMAGE_ALLDATA );
if (hImage == NULL)
{
// Report error
SET_ERROR( "Could not load tile file: %s", cFilename );
return( NULL );
}
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMHIMAGE;
VObjectDesc.hImage = hImage;
hVObject = CreateVideoObject( &VObjectDesc );
if ( hVObject == NULL )
{
// Report error
SET_ERROR( "Could not load tile file: %s", cFilename );
// Video Object will set error conition.]
DestroyImage( hImage );
return( NULL );
}
// Load structure data, if any.
// Start by hacking the image filename into that for the structure data
strcpy( cStructureFilename, cFilename );
cEndOfName = strchr( cStructureFilename, '.' );
if (cEndOfName != NULL)
{
cEndOfName++;
*cEndOfName = '\0';
}
else
{
strcat( cStructureFilename, "." );
}
strcat( cStructureFilename, STRUCTURE_FILE_EXTENSION );
if (FileExists( cStructureFilename ))
{
pStructureFileRef = LoadStructureFile( cStructureFilename );
if (pStructureFileRef == NULL || hVObject->usNumberOfObjects != pStructureFileRef->usNumberOfStructures)
{
DestroyImage( hImage );
DeleteVideoObject( hVObject );
SET_ERROR( "Structure file error: %s", cStructureFilename );
return( NULL );
}
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, cStructureFilename );
fOk = AddZStripInfoToVObject( hVObject, pStructureFileRef, FALSE, 0 );
if (fOk == FALSE)
{
DestroyImage( hImage );
DeleteVideoObject( hVObject );
SET_ERROR( "ZStrip creation error: %s", cStructureFilename );
return( NULL );
}
}
else
{
pStructureFileRef = NULL;
}
// anv: load additional tile properties, if any.
memset(&zAdditionalTileProperties,0,sizeof(zAdditionalTileProperties));
// Start by hacking the image filename into that for the structure data
strcpy( cAdditionalPropertiesFilename, cFilename );
cEndOfName = strchr( cAdditionalPropertiesFilename, '.' );
if (cEndOfName != NULL)
{
cEndOfName++;
*cEndOfName = '\0';
}
else
{
strcat( cAdditionalPropertiesFilename, "." );
}
strcat( cAdditionalPropertiesFilename, ADDITIONAL_TILE_PROPERTIES_EXTENSION );
// first in /Tilesets/XX/
if (FileExists(cAdditionalPropertiesFilename))
{
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", cAdditionalPropertiesFilename));
SGP_THROW_IFFALSE(ReadInAdditionalTileProperties(cAdditionalPropertiesFilename), cAdditionalPropertiesFilename);
}
else
{
// and if not found, then in /AdditionalProperties/
cEndOfName = strrchr( cAdditionalPropertiesFilename, '\\' );
sprintf( cCommonAdditionalPropertiesFilename, "TILESETS\\ADDITIONALPROPERTIES%s", cEndOfName );
if (FileExists( cCommonAdditionalPropertiesFilename ))
{
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", cAdditionalPropertiesFilename));
SGP_THROW_IFFALSE(ReadInAdditionalTileProperties(cCommonAdditionalPropertiesFilename), cCommonAdditionalPropertiesFilename);
}
}
pTileSurf = (PTILE_IMAGERY) MemAlloc( sizeof( TILE_IMAGERY ) );
// Set all values to zero
memset( pTileSurf, 0, sizeof( TILE_IMAGERY ) );
pTileSurf->vo = hVObject;
pTileSurf->pStructureFileRef = pStructureFileRef;
pTileSurf->ubTerrainID = zAdditionalTileProperties.ubTerrainID;
pTileSurf->bWoodCamoAffinity = zAdditionalTileProperties.bWoodCamoAffinity;
pTileSurf->bDesertCamoAffinity = zAdditionalTileProperties.bDesertCamoAffinity;
pTileSurf->bUrbanCamoAffinity = zAdditionalTileProperties.bUrbanCamoAffinity;
pTileSurf->bSnowCamoAffinity = zAdditionalTileProperties.bSnowCamoAffinity;
pTileSurf->bSoundModifier = zAdditionalTileProperties.bSoundModifier;
pTileSurf->bCamoStanceModifer = zAdditionalTileProperties.bCamoStanceModifer;
pTileSurf->bStealthDifficultyModifer = zAdditionalTileProperties.bStealthDifficultyModifer;
pTileSurf->bTrapBonus = zAdditionalTileProperties.bTrapBonus;
pTileSurf->uiAdditionalFlags = zAdditionalTileProperties.uiAdditionalFlags;
if (pStructureFileRef && pStructureFileRef->pAuxData != NULL)
{
pTileSurf->pAuxData = pStructureFileRef->pAuxData;
pTileSurf->pTileLocData = pStructureFileRef->pTileLocData;
}
else if (hImage->uiAppDataSize == hVObject->usNumberOfObjects * sizeof( AuxObjectData ))
{
// Valid auxiliary data, so make a copy of it for TileSurf
pTileSurf->pAuxData = (AuxObjectData *) MemAlloc( hImage->uiAppDataSize );
if ( pTileSurf->pAuxData == NULL)
{
DestroyImage( hImage );
DeleteVideoObject( hVObject );
return( NULL );
}
memcpy( pTileSurf->pAuxData, hImage->pAppData, hImage->uiAppDataSize );
}
else
{
pTileSurf->pAuxData = NULL;
}
// the hImage is no longer needed
DestroyImage( hImage );
return( pTileSurf );
}
void DeleteTileSurface( PTILE_IMAGERY pTileSurf )
{
if ( pTileSurf->pStructureFileRef != NULL )
{
FreeStructureFile( pTileSurf->pStructureFileRef );
}
else
{
// If a structure file exists, it will free the auxdata.
// Since there is no structure file in this instance, we
// free it ourselves.
if (pTileSurf->pAuxData != NULL)
{
MemFree( pTileSurf->pAuxData );
}
}
DeleteVideoObject( pTileSurf->vo );
MemFree( pTileSurf );
}
extern void GetRootName( STR8 pDestStr, const STR8 pSrcStr );
void SetRaisedObjectFlag( STR8 cFilename, TILE_IMAGERY *pTileSurf )
{
INT32 cnt = 0;
CHAR8 cRootFile[ 128 ];
CHAR8 ubRaisedObjectFiles[][80] =
{
"bones",
"bones2",
"grass2",
"grass3",
"l_weed3",
"litter",
"miniweed",
"sblast",
"sweeds",
"twigs",
"wing",
"1"
};
// Loop through array of RAISED objecttype imagery and
// set global value...
if ( ( pTileSurf->fType >= DEBRISWOOD && pTileSurf->fType <= DEBRISWEEDS ) || pTileSurf->fType == DEBRIS2MISC || pTileSurf->fType == ANOTHERDEBRIS )
{
GetRootName( cRootFile, cFilename );
while( ubRaisedObjectFiles[ cnt ][ 0 ] != '1' )
{
if ( _stricmp( ubRaisedObjectFiles[ cnt ], cRootFile ) == 0 )
{
pTileSurf->bRaisedObjectType = TRUE;
}
cnt++;
}
}
}