summaryrefslogtreecommitdiff
path: root/SpriteObjects.cpp
diff options
context:
space:
mode:
authorJapa2011-07-20 15:59:11 +0000
committerJapa2011-07-20 15:59:11 +0000
commitaee9dc6758120d57a8fabc013a16c82f6682099c (patch)
tree7d2ddd6cabb61e948d5cd19f7838ab313ac1c6e9 /SpriteObjects.cpp
parent3eacec9eef6da5e6ce6f7d966a6b601f6268557c (diff)
downloadstonesense-aee9dc6758120d57a8fabc013a16c82f6682099c.tar.gz
stonesense-aee9dc6758120d57a8fabc013a16c82f6682099c.tar.bz2
stonesense-aee9dc6758120d57a8fabc013a16c82f6682099c.tar.xz
Got some sort of functionality out of DFapi. this means an empty window.
Diffstat (limited to 'SpriteObjects.cpp')
-rw-r--r--SpriteObjects.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
index e987794..4445578 100644
--- a/SpriteObjects.cpp
+++ b/SpriteObjects.cpp
@@ -237,6 +237,7 @@ void c_sprite::set_by_xml(TiXmlElement *elemSprite)
if (filename != NULL && filename[0] != 0)
{
fileindex = loadConfigImgFile((char*)filename,elemSprite);
+ if(fileindex == -1) return;
}
animframes = getAnimFrames(elemSprite->Attribute("frames"));
@@ -641,8 +642,6 @@ void c_sprite::draw_world_offset(int x, int y, int z, Block * b, int tileoffset,
)
)
)
- )
- )
{
int32_t drawx = x;
int32_t drawy = y;
@@ -679,7 +678,7 @@ void c_sprite::draw_world_offset(int x, int y, int z, Block * b, int tileoffset,
sheety = ((sheetindex+tileoffset+randoffset) / SHEET_OBJECTSWIDE) * spriteheight;
}
ALLEGRO_COLOR shade_color = get_color(b);
- if(!b->designation.bits.pile && config.fog_of_war && (contentLoader.gameMode.control_mode == 1))
+ if(!b->designation.bits.pile && config.fog_of_war && (contentLoader.gameMode.g_mode == GAMEMODE_ADVENTURE))
{
shade_color.r *= 0.25f;
shade_color.g *= 0.25f;