MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apparently, casteFlagSet is a static function, despite its usefulness...

develop
Quietust 2015-12-12 17:58:58 -06:00
parent eb1092da6e
commit 7ef815afa8
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/strangemood.cpp
Unescape Escape View File

@ -26,6 +26,9 @@
#include "df/entity_raw.h" #include "df/entity_raw.h"
#include "df/builtin_mats.h" #include "df/builtin_mats.h"
#include "df/general_ref_unit_workerst.h" #include "df/general_ref_unit_workerst.h"
#include "df/creature_raw.h"
#include "df/caste_raw.h"
#include "df/caste_raw_flags.h"
using std::string; using std::string;
using std::vector; using std::vector;
@ -46,6 +49,17 @@ using df::global::debug_nomoods;
Random::MersenneRNG rng; Random::MersenneRNG rng;
static bool casteFlagSet(int race, int caste, df::caste_raw_flags flag)
{
auto creature = df::creature_raw::find(race);
if (!creature)
return false;
auto craw = vector_get(creature->caste, caste);
if (!craw)
return false;
return craw->flags.is_set(flag);
}
bool isUnitMoodable (df::unit *unit) bool isUnitMoodable (df::unit *unit)
{ {
if (!Units::isCitizen(unit)) if (!Units::isCitizen(unit))
@ -56,7 +70,7 @@ bool isUnitMoodable (df::unit *unit)
return false; return false;
if (!ENUM_ATTR(profession,moodable,unit->profession)) if (!ENUM_ATTR(profession,moodable,unit->profession))
return false; return false;
if (!Units::casteFlagSet(unit->race, unit->caste, caste_raw_flags::STRANGE_MOODS)) if (!casteFlagSet(unit->race, unit->caste, caste_raw_flags::STRANGE_MOODS))
return false; return false;
return true; return true;
} }