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

syndromeTrigger: logic tweak.

develop
expwnent 2013-04-07 13:55:17 -04:00
parent 1c78f06a1c
commit 959321ec22
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/syndromeTrigger.cpp
Unescape Escape View File

@ -91,6 +91,7 @@ void syndromeHandler(color_ostream& out, void* ptr) {
} else { } else {
args.push_back(clazz); args.push_back(clazz);
} }
continue;
} }
if ( clazz == "\\COMMAND" ) { if ( clazz == "\\COMMAND" ) {
@ -101,7 +102,9 @@ void syndromeHandler(color_ostream& out, void* ptr) {
foundPermanent = true; foundPermanent = true;
continue; continue;
} }
if ( foundPermanent && raceId == -1 ) { if ( !foundPermanent )
continue;
if ( raceId == -1 ) {
//find the race with the name //find the race with the name
string& name = *syndrome->syn_class[a]; string& name = *syndrome->syn_class[a];
for ( size_t b = 0; b < df::global::world->raws.creatures.all.size(); b++ ) { for ( size_t b = 0; b < df::global::world->raws.creatures.all.size(); b++ ) {
@ -114,7 +117,7 @@ void syndromeHandler(color_ostream& out, void* ptr) {
} }
continue; continue;
} }
if ( foundPermanent && raceId != -1 && casteId == -1 ) { if ( raceId != -1 && casteId == -1 ) {
string& name = *syndrome->syn_class[a]; string& name = *syndrome->syn_class[a];
for ( size_t b = 0; b < creatureRaw->caste.size(); b++ ) { for ( size_t b = 0; b < creatureRaw->caste.size(); b++ ) {
df::caste_raw* caste = creatureRaw->caste[b]; df::caste_raw* caste = creatureRaw->caste[b];