summaryrefslogtreecommitdiff
path: root/Creatures.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-04-10 22:26:40 +0530
committerJapa Illo2012-04-10 22:26:40 +0530
commit172145fddc69b699ae678666c465cf1dc09ea7d9 (patch)
tree27e28dbe1643f1f1106ecf03c3d15c5d89d5dfc8 /Creatures.cpp
parentd1c87ec273ef5c928989437379943a9a71a1d4e0 (diff)
parent667ae8fb75b6d44b112abadc08b290d7c1ded10b (diff)
downloadstonesense-172145fddc69b699ae678666c465cf1dc09ea7d9.tar.gz
stonesense-172145fddc69b699ae678666c465cf1dc09ea7d9.tar.bz2
stonesense-172145fddc69b699ae678666c465cf1dc09ea7d9.tar.xz
Merge branch 'master' of https://github.com/Caldfir/stonesense
Diffstat (limited to 'Creatures.cpp')
-rw-r--r--Creatures.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Creatures.cpp b/Creatures.cpp
index 82eb801..0f5226a 100644
--- a/Creatures.cpp
+++ b/Creatures.cpp
@@ -281,6 +281,7 @@ void DrawCreature(int drawx, int drawy, t_unit* creature, Block * b){
unsigned int offsety = config.show_creature_names ? al_get_font_line_height(font) : 0;
sprite->draw_world(creature->x,creature->y, creature->z, b);
+
if(statusIcons.size())
{
for(int i = 0; i < statusIcons.size(); i++)
@@ -293,11 +294,11 @@ void DrawCreature(int drawx, int drawy, t_unit* creature, Block * b){
offsety += config.show_creature_moods ? 16 : 0;
- if(config.show_creature_jobs)
+ if(config.show_creature_professions)
{
unsigned int sheetx = 16 * (creature->profession % 7);
unsigned int sheety = 16 * (creature->profession / 7);
- al_draw_bitmap_region(IMGJobSheet, sheetx, sheety, 16, 16, drawx -8 + (SPRITEWIDTH*config.scale/2), drawy - (16 + WALLHEIGHT*config.scale + offsety), 0);
+ al_draw_bitmap_region(IMGProfSheet, sheetx, sheety, 16, 16, drawx -8 + (SPRITEWIDTH*config.scale/2), drawy - (16 + WALLHEIGHT*config.scale + offsety), 0);
}
}