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

Merge branch 'autoSyndrome' into recent

develop
expwnent 2013-01-07 12:09:55 -05:00
parent 3ffbef2396 6fd9ce339d
commit 476afafb3c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/autoSyndrome.cpp
Unescape Escape View File

@ -184,8 +184,8 @@ bool maybeApply(color_ostream& out, df::syndrome* syndrome, int32_t workerId, df
* *
* Otherwise, it works like this: * Otherwise, it works like this:
* add all the affected class creatures * add all the affected class creatures
* remove all the immune class creatures
* add all the affected creatures * add all the affected creatures
* remove all the immune class creatures
* remove all the immune creatures * remove all the immune creatures
* you're affected if and only if you're in the remaining list after all of that * you're affected if and only if you're in the remaining list after all of that
**/ **/
@ -206,7 +206,7 @@ bool maybeApply(color_ostream& out, df::syndrome* syndrome, int32_t workerId, df
for ( size_t d = 0; d < caste->creature_class.size(); d++ ) { for ( size_t d = 0; d < caste->creature_class.size(); d++ ) {
if ( *syndrome->syn_immune_class[c] == *caste->creature_class[d] ) { if ( *syndrome->syn_immune_class[c] == *caste->creature_class[d] ) {
applies = false; applies = false;
break; return false;
} }
} }
} }
@ -230,7 +230,7 @@ bool maybeApply(color_ostream& out, df::syndrome* syndrome, int32_t workerId, df
if ( *syndrome->syn_immune_caste[c] == "ALL" || if ( *syndrome->syn_immune_caste[c] == "ALL" ||
*syndrome->syn_immune_caste[c] == creature_caste ) { *syndrome->syn_immune_caste[c] == creature_caste ) {
applies = false; applies = false;
break; return false;
} }
} }
if ( !applies ) { if ( !applies ) {