1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve SurfaceCache error messages

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9352 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Asdow
2022-03-30 13:05:56 +00:00
parent 508adc4eee
commit 3577ffa91a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/LogicalBodyTypes/SurfaceCache.cpp
+6 -6
View File
@@ -30,7 +30,7 @@ AnimationSurfaceType* SurfaceCache::GetLoadedSurface(UINT32 idx) {
node->loaded = LoadSurface(node->surface, node->structFile);
// TODO more sensible handling of errors
if (!node->loaded) {
SET_ERROR("Error: a surface could not be laoded!");
SET_ERROR("Error: a surface could not be loaded! Surface file: %s", node->surface->Filename);
return NULL;
}
loadedElements++;
@@ -62,7 +62,7 @@ AnimationSurfaceType* SurfaceCache::GetLoadedSurface(UINT32 idx) {
node->loaded = LoadSurface(node->surface, node->structFile);
// TODO more sensible handling of errors
if (!node->loaded) {
SET_ERROR("Error: a surface could not be laoded!");
SET_ERROR("Error: a surface could not be loaded!");
return NULL;
}
}
@@ -90,14 +90,13 @@ bool SurfaceCache::UnloadSurface(AnimationSurfaceType* animSurfaceType) {
bool SurfaceCache::LoadSurface(AnimationSurfaceType* animSurfaceType, STRUCTURE_FILE_REF* pStructureFileRef) {
AuxObjectData *pAuxData;
AnimDebugMsg("SurfaceCache::LoadSurface");
// Load into memory
VOBJECT_DESC VObjectDesc;
HVOBJECT hVObject;
HIMAGE hImage;
CHAR8 sFilename[48];
// Create video object
FilenameForBPP(animSurfaceType->Filename, sFilename);
AnimDebugMsg(String("SurfaceCache::LoadSurface, %s", sFilename));
hImage = CreateImage(sFilename, IMAGE_ALLDATA);
if (hImage == NULL) return TRUE == SET_ERROR("Error: Could not load animation file %s", sFilename);
@@ -127,7 +126,8 @@ bool SurfaceCache::LoadSurface(AnimationSurfaceType* animSurfaceType, STRUCTURE_
if (AddZStripInfoToVObject(hVObject, pStructureFileRef, TRUE, sStartFrame) == FALSE) {
DestroyImage(hImage);
DeleteVideoObject(hVObject);
SET_ERROR("Animation structure ZStrip creation error: %s", sFilename);
AnimDebugMsg(String("Animation structure ZStrip creation error: %s", sFilename));
SET_ERROR(String("Animation structure ZStrip creation error: %s", sFilename));
return false;
}
}
@@ -137,7 +137,7 @@ bool SurfaceCache::LoadSurface(AnimationSurfaceType* animSurfaceType, STRUCTURE_
animSurfaceType->hVideoObject = hVObject;
// Determine if we have a problem with #frames + directions ( ie mismatch )
if ((animSurfaceType->uiNumDirections * animSurfaceType->uiNumFramesPerDir ) != animSurfaceType->hVideoObject->usNumberOfObjects) {
AnimDebugMsg(String("Surface Database: WARNING!!! Surface %d has #frames mismatch.", usSurfaceIndex));
AnimDebugMsg(String("Surface Database: WARNING!!! Surface %d has #frames mismatch. Filename %s", animSurfaceType->ubName, animSurfaceType->Filename));
}
return true;
}