summaryrefslogtreecommitdiff
path: root/Creatures.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-04-05 09:20:23 +0200
committerJapa Illo2012-04-05 09:20:23 +0200
commitea2e9dc5618ff9fbf2a9bf772f40118e8ab1defd (patch)
tree3bd859d1b8919f8502219a146fe0ce2cef3125de /Creatures.cpp
parent80329a160e26950bd02298e450c44a99a9c21efd (diff)
downloadstonesense-ea2e9dc5618ff9fbf2a9bf772f40118e8ab1defd.tar.gz
stonesense-ea2e9dc5618ff9fbf2a9bf772f40118e8ab1defd.tar.bz2
stonesense-ea2e9dc5618ff9fbf2a9bf772f40118e8ab1defd.tar.xz
Fixed item subtypes, made creature happiness only show on dwarves.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'Creatures.cpp')
-rw-r--r--Creatures.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/Creatures.cpp b/Creatures.cpp
index ba19970..82eb801 100644
--- a/Creatures.cpp
+++ b/Creatures.cpp
@@ -15,6 +15,9 @@
#include "df/profession.h"
+#include "df/creature_raw.h"
+#include "df/caste_raw.h"
+
//vector<t_matgloss> v_creatureNames;
//vector<CreatureConfiguration> creatureTypes;
@@ -235,7 +238,7 @@ void DrawCreature(int drawx, int drawy, t_unit* creature, Block * b){
vector<int> statusIcons;
//if(config.show_creature_happiness)
- if(config.show_creature_moods)
+ if(config.show_creature_moods && df::creature_raw::find(creature->race)->caste[creature->caste]->flags.is_set(caste_raw_flags::CAN_SPEAK))
{
if(creature->happiness == 0)
statusIcons.push_back(6);