Merge pull request #566 from Aidoneus/fix525

Fixed #525 + prevent error (warning as error) when trying to build wi…
KranX · May 10, 2022 · 90e7e7e · 90e7e7e
2 parents c83543c + fd6d928
commit 90e7e7e
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/data/data/Incubator.dil b/data/data/Incubator.dil
@@ -46,7 +46,7 @@
 3 5 "Wormaster part note" "5" "0" "0" "data LUCK > 50 data INV_NYMBOS > 3 data HUSKER == 0" " " " " 
 4 5 "Last Moggy part note" "5" "0" "0" "data LUCK > 50 data INV_WEEZYK > 0 data PUT_PUT == 0" " " " " 
 7 7 "Eleerection Reject" "2" "0" "1" "data THIEF_PALOCHKA > 0" " " " " 
-8 7 "Eleerection Participation Question" "2" "0" "1" "visitE I > 1 visitE P > 1 data CYCLE == $PREV_CYCLE_1 cycle_exist 1 > 0 data THIEF_PALOCHKA == 0" " " " " 
+8 7 "Eleerection Participation Question" "2" "0" "1" "visitE I > 1 visitE P > 1 data CYCLE == $PREV_CYCLE_1 cycle_exist 1 > 0 cycle_exist 0 > 0 data THIEF_PALOCHKA == 0" " " " " 
 8 6 "empty" "0" "0" "0" "true" " " " " 
 8 4 "Ark-a-Znoy visit" "5" "0" "0" "visitW A > 0" " " " " 
 9 4 "Khox visit" "5" "0" "0" "visitW K > 0" " " " " 

diff --git a/data/data/Lampasso.dil b/data/data/Lampasso.dil
@@ -10,7 +10,7 @@
 10 0 "Mechanic Messiah in Inventory" "3" "0" "1" "data INV_MESSIAH > 0" "abort" "block" 
 0 8 "Sports Introduction" "1" "1" "0" "data TABUTASKS > 0" " " "continue" 
 11 8 "empty" "0" "0" "0" "true" " " " " 
-12 8 "Kernowar Waiting?" "2" "0" "1" "BSTATUS == 1 data CYCLE == $PREV_CYCLE_2 cycle_exist 2 > 0" " " " " 
+12 8 "Kernowar Waiting?" "2" "0" "1" "BSTATUS == 1 data CYCLE == $PREV_CYCLE_2 cycle_exist 2 > 0 cycle_exist 1 > 0" " " " " 
 0 7 "empty" "0" "0" "0" "true" " " " " 
 0 6 "Protractor in Inventory" "5" "0" "0" "data INV_PROTRACTOR > 0" " " " " 
 12 5 "hMok visit" "5" "0" "0" "visitW h > 0" " " " " 

diff --git a/data/data/Ogorod.dil b/data/data/Ogorod.dil
@@ -59,7 +59,7 @@
 4 10 "MP4 Comment" "2" "1" "1" "MP_GAME == 4" " " " " 
 4 9 "MP4 Start" "1" "0" "0" "MP_GAME == 4" " " "clear" 
 7 4 "Larva in Inventory" "2" "0" "1" "data INV_BAD_LARVA > 0 OR data INV_GOOD_LARVA > 0" " " " " 
-0 7 "Pipiska Waiting?" "2" "0" "1" "BSTATUS == 1 data CYCLE == $PREV_CYCLE_1 cycle_exist 1 > 0" " " " " 
+0 7 "Pipiska Waiting?" "2" "0" "1" "BSTATUS == 1 data CYCLE == $PREV_CYCLE_1 cycle_exist 1 > 0 cycle_exist 0 > 0" " " " " 
 11 0 "Mechanic Messiah in Inventory" "3" "0" "1" "data INV_MESSIAH > 0" "abort" "block" 
 6 5 "Weexow visit" "5" "0" "0" "visitW W > 0 BSTATUS == 2" " " " " 
 7 5 "Boozeena visit" "5" "0" "0" "visitW B > 0" " " " " 

diff --git a/data/data/VigBoo.dil b/data/data/VigBoo.dil
@@ -17,8 +17,8 @@
 0 7 "empty" "0" "0" "0" "true" " " " " 
 0 6 "Zyklope warning" "5" "0" "0" "( BSTATUS == 2 data LUCK > 75 ) OR ( BSTATUS == 2 AND data LUCK > 40 AND visitW N > 0 )" " " " " 
 0 5 "Protractor in Inventory" "5" "0" "0" "data INV_PROTRACTOR > 0" " " " " 
-1 8 "Pipiska Waiting?" "2" "0" "1" "BSTATUS == 1 data CYCLE == $PREV_CYCLE_1 cycle_exist 1 > 0" " " " " 
-0 8 "Kernowar Waiting?" "2" "0" "1" "BSTATUS == 1 data CYCLE == $PREV_CYCLE_2 cycle_exist 2 > 0" " " " " 
+1 8 "Pipiska Waiting?" "2" "0" "1" "BSTATUS == 1 data CYCLE == $PREV_CYCLE_1 cycle_exist 1 > 0 cycle_exist 0 > 0" " " " " 
+0 8 "Kernowar Waiting?" "2" "0" "1" "BSTATUS == 1 data CYCLE == $PREV_CYCLE_2 cycle_exist 2 > 0 cycle_exist 1 > 0" " " " " 
 6 4 "Good Larva Delivery" "2" "0" "1" "data INV_GOOD_LARVA > 0" " " " " 
 7 4 "Good Cirt Delivery" "2" "0" "1" "data INV_GOOD_CIRT > 0" " " " " 
 8 4 "NO-Cirt Delivery" "2" "0" "1" "data INV_GOOD_CIRT == 0 data INV_BAD_CIRT == 0" " " " " 

diff --git a/data/data/ZeePa.dil b/data/data/ZeePa.dil
@@ -40,7 +40,7 @@
 4 1 "NO-Cirt Delivery" "2" "0" "1" "data INV_GOOD_CIRT == 0 data INV_BAD_CIRT == 0" " " " " 
 5 1 "Toxick Delivery" "2" "0" "1" "data INV_TOXICK > 0" " " " " 
 0 2 "empty" "0" "0" "0" "true" " " " " 
-6 6 "Zyklope Waiting" "2" "0" "1" "data CYCLE == $PREV_CYCLE_1 cycle_exist 1 > 0" " " " " 
+6 6 "Zyklope Waiting" "2" "0" "1" "data CYCLE == $PREV_CYCLE_1 cycle_exist 1 > 0 cycle_exist 0 > 0" " " " " 
 7 6 "WeeZyk Assignment" "2" "0" "1" "data CYCLE == 1 QCODE > 0 data WEEZYK_ASSIGNMENT == 2" " " " " 
 8 6 "WeeZyk Recession" "2" "0" "1" "data CYCLE == 1 QCODE > 0 data WEEZYK_ASSIGNMENT == 1" " " " " 
 6 0 "Mechanic Messiah in Inventory" "3" "0" "1" "data INV_MESSIAH > 0" "abort" "block" 

diff --git a/data/diagen.text b/data/diagen.text
diff --git a/data/diagen_eng.text b/data/diagen_eng.text
diff --git a/src/uvs/diagen.cpp b/src/uvs/diagen.cpp
@@ -319,7 +319,7 @@ std::string cp1251_to_utf8(std::string in_string) {
 }
 
 #ifdef DIAGEN_TEST
-static char* strLine = "------------------------";
+static char* strLine = (char*) "------------------------";
 static int CommandMax;
 char* Command[16];
 XStream ffsave(1);