games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Added some checks & logs for empty def names, but it only delays the crash.

Browse Source
This commit is contained in:
DjWarmonger 2015-09-20 13:02:13 +02:00
parent e14faea181
commit 57637dd71a
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/Graphics.cpp
View File

@ -373,11 +373,21 @@ void Graphics::loadFonts()
CDefEssential * Graphics::getDef( const CGObjectInstance * obj ) CDefEssential * Graphics::getDef( const CGObjectInstance * obj )
{ {
if (obj->appearance.animationFile.empty())
{
logGlobal->warnStream() << boost::format("Def name for (%d,%d) is empty!") % obj->id % obj->subID;
return nullptr;
}
return advmapobjGraphics[obj->appearance.animationFile]; return advmapobjGraphics[obj->appearance.animationFile];
} }
CDefEssential * Graphics::getDef( const ObjectTemplate & info ) CDefEssential * Graphics::getDef( const ObjectTemplate & info )
{ {
if (info.animationFile.empty())
{
logGlobal->warnStream() << boost::format("Def name for obj (%d,%d) is empty!") % info.id % info.subid;
return nullptr;
}
return advmapobjGraphics[info.animationFile]; return advmapobjGraphics[info.animationFile];
} }

11
client/mapHandler.cpp
View File

@ -860,8 +860,15 @@ void CMapHandler::CMapBlitter::drawObjects(SDL_Surface * targetSurf, const Terra
if (!graphics->getDef(obj)) if (!graphics->getDef(obj))
processDef(obj->appearance); processDef(obj->appearance);
if (!graphics->getDef(obj) && !obj->appearance.animationFile.empty()) if (!graphics->getDef(obj))
logGlobal->errorStream() << "Failed to load image " << obj->appearance.animationFile; {
if (!obj->appearance.animationFile.empty())
logGlobal->errorStream() << "Failed to load image " << obj->appearance.animationFile;
else
logGlobal->warnStream() << boost::format("Def name for (%d,%d) is empty!") % obj->id % obj->subID;
continue;
}
if (!canDrawObject(obj)) if (!canDrawObject(obj))
continue; continue;

1
lib/VCMI_lib.vcxproj
View File

@ -364,6 +364,7 @@
<ClInclude Include="spells\CreatureSpellMechanics.h" /> <ClInclude Include="spells\CreatureSpellMechanics.h" />
<ClInclude Include="spells\CSpellHandler.h" /> <ClInclude Include="spells\CSpellHandler.h" />
<ClInclude Include="spells\ISpellMechanics.h" /> <ClInclude Include="spells\ISpellMechanics.h" />
<ClInclude Include="spells\Magic.h" />
<ClInclude Include="spells\SpellMechanics.h" /> <ClInclude Include="spells\SpellMechanics.h" />
<ClInclude Include="spells\ViewSpellInt.h" /> <ClInclude Include="spells\ViewSpellInt.h" />
<ClInclude Include="StartInfo.h" /> <ClInclude Include="StartInfo.h" />

4
lib/VCMI_lib.vcxproj.filters
View File

@ -225,6 +225,7 @@
<ClCompile Include="spells\CreatureSpellMechanics.cpp"> <ClCompile Include="spells\CreatureSpellMechanics.cpp">
<Filter>spells</Filter> <Filter>spells</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="mapping\CDrawRoadsOperation.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="CCreatureSet.h"> <ClInclude Include="CCreatureSet.h">
@ -533,5 +534,8 @@
<ClInclude Include="spells\SpellMechanics.h"> <ClInclude Include="spells\SpellMechanics.h">
<Filter>spells</Filter> <Filter>spells</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="spells\Magic.h">
<Filter>spells</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>