Fix broken auto condition

This commit is contained in:
mkwong98 2019-07-06 13:14:41 +08:00
parent 57a03323bd
commit 8eebce4eff
3 changed files with 248 additions and 245 deletions

View file

@ -7528,7 +7528,7 @@
1561782682 d:\work\hdnes\trunk\hdnespackeditor\paletteswap.h
"common.h"
1561782682 source:d:\work\hdnes\trunk\hdnespackeditor\gametile.cpp
1561808996 source:d:\work\hdnes\trunk\hdnespackeditor\gametile.cpp
"common.h"
"coreData.h"
"gameObjNode.h"
@ -7572,7 +7572,7 @@
"wx/gdicmn.h"
"wx/dialog.h"
1561782682 source:d:\work\hdnes\trunk\hdnespackeditor\hdnespackeditormainform.cpp
1562378178 source:d:\work\hdnes\trunk\hdnespackeditor\hdnespackeditormainform.cpp
"hdnesPackEditormainForm.h"
"hdnesPackEditornewProjectDialog.h"
"hdnesPackEditorcolourSelectDialog.h"

View file

@ -1,15 +1,57 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Release" />
<ActiveTarget name="Debug" />
<File name="gameObjNode.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="721" topLine="10" />
</Cursor>
</File>
<File name="hdnesPackEditornewProjectDialog.cpp" open="0" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="742" topLine="0" />
</Cursor>
</File>
<File name="gameTile.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6053" topLine="10" />
</Cursor>
<Folding>
<Collapse line="7" />
<Collapse line="22" />
<Collapse line="26" />
<Collapse line="56" />
<Collapse line="65" />
<Collapse line="135" />
</Folding>
</File>
<File name="image.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="359" topLine="0" />
</Cursor>
</File>
<File name="main.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="380" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorreplacementDialog.h" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="mainForm.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1177" topLine="0" />
<Cursor1 position="7723" topLine="221" />
</Cursor>
</File>
<File name="hdnesPackEditorreplacementDialog.cpp" open="0" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
<Cursor>
<Cursor1 position="2646" topLine="41" />
</Cursor>
<Folding>
<Collapse line="35" />
<Collapse line="47" />
</Folding>
</File>
<File name="colourDialogClient.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="235" topLine="0" />
</Cursor>
</File>
<File name="common.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -22,101 +64,9 @@
<Cursor1 position="776" topLine="28" />
</Cursor>
</File>
<File name="gameObjNode.cpp" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="hdnesPackEditorreplacementDialog.h" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3162" topLine="106" />
</Cursor>
</File>
<File name="gameTile.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1076" topLine="2" />
</Cursor>
<Folding>
<Collapse line="7" />
<Collapse line="22" />
<Collapse line="26" />
<Collapse line="56" />
<Collapse line="65" />
<Collapse line="135" />
<Collapse line="173" />
</Folding>
</File>
<File name="condition.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="312" topLine="0" />
</Cursor>
</File>
<File name="coreData.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="13453" topLine="82" />
</Cursor>
<Folding>
<Collapse line="24" />
<Collapse line="28" />
<Collapse line="32" />
<Collapse line="38" />
<Collapse line="53" />
<Collapse line="81" />
<Collapse line="198" />
<Collapse line="238" />
<Collapse line="258" />
<Collapse line="287" />
<Collapse line="325" />
<Collapse line="361" />
<Collapse line="366" />
<Collapse line="371" />
<Collapse line="385" />
<Collapse line="392" />
<Collapse line="475" />
<Collapse line="481" />
</Folding>
</File>
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3921" topLine="66" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.h" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="382" topLine="0" />
</Cursor>
</File>
<File name="colourDialogClient.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="235" topLine="0" />
</Cursor>
</File>
<File name="condition.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5196" topLine="143" />
</Cursor>
</File>
<File name="gameTile.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="804" topLine="20" />
</Cursor>
<Folding>
<Collapse line="8" />
</Folding>
</File>
<File name="hdnesPackEditormainForm.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6475" topLine="150" />
</Cursor>
</File>
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="0" />
</Cursor>
</File>
<File name="image.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="189" topLine="0" />
</Cursor>
</File>
<File name="mainForm.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="7723" topLine="221" />
<Cursor1 position="1177" topLine="0" />
</Cursor>
</File>
<File name="mainForm.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -124,69 +74,37 @@
<Cursor1 position="53767" topLine="929" />
</Cursor>
</File>
<File name="paletteSwap.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="condition.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="293" topLine="0" />
<Cursor1 position="5196" topLine="143" />
</Cursor>
</File>
<File name="tileReference.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="condition.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="893" topLine="34" />
<Cursor1 position="312" topLine="0" />
</Cursor>
</File>
<File name="tileReference.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="gameObjNode.cpp" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="412" topLine="0" />
<Cursor1 position="3162" topLine="106" />
</Cursor>
</File>
<File name="gameObjNode.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="gameTile.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="721" topLine="10" />
</Cursor>
</File>
<File name="main.cpp" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1118" topLine="32" />
</Cursor>
</File>
<File name="paletteSwap.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="279" topLine="0" />
<Cursor1 position="804" topLine="0" />
</Cursor>
<Folding>
<Collapse line="4" />
<Collapse line="11" />
<Collapse line="15" />
<Collapse line="66" />
<Collapse line="8" />
</Folding>
</File>
<File name="hdnesPackEditornewProjectDialog.cpp" open="0" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="742" topLine="0" />
</Cursor>
</File>
<File name="classList.h" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="256" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorreplacementDialog.cpp" open="0" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
<Cursor>
<Cursor1 position="2646" topLine="41" />
</Cursor>
<Folding>
<Collapse line="35" />
<Collapse line="47" />
</Folding>
</File>
<File name="image.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="359" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditormainForm.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="98898" topLine="367" />
<Cursor1 position="51174" topLine="376" />
</Cursor>
<Folding>
<Collapse line="16" />
@ -208,6 +126,7 @@
<Collapse line="111" />
<Collapse line="122" />
<Collapse line="136" />
<Collapse line="145" />
<Collapse line="149" />
<Collapse line="153" />
<Collapse line="204" />
@ -251,110 +170,193 @@
<Collapse line="902" />
<Collapse line="913" />
<Collapse line="924" />
<Collapse line="1012" />
<Collapse line="1312" />
<Collapse line="1349" />
<Collapse line="1366" />
<Collapse line="1404" />
<Collapse line="1416" />
<Collapse line="1446" />
<Collapse line="1482" />
<Collapse line="1494" />
<Collapse line="1508" />
<Collapse line="1513" />
<Collapse line="1526" />
<Collapse line="1546" />
<Collapse line="1558" />
<Collapse line="1570" />
<Collapse line="1584" />
<Collapse line="1598" />
<Collapse line="1604" />
<Collapse line="1622" />
<Collapse line="1639" />
<Collapse line="1653" />
<Collapse line="1713" />
<Collapse line="1723" />
<Collapse line="1792" />
<Collapse line="1832" />
<Collapse line="1866" />
<Collapse line="1908" />
<Collapse line="1916" />
<Collapse line="1924" />
<Collapse line="1935" />
<Collapse line="1948" />
<Collapse line="1960" />
<Collapse line="1967" />
<Collapse line="1979" />
<Collapse line="2031" />
<Collapse line="2042" />
<Collapse line="2049" />
<Collapse line="2056" />
<Collapse line="2067" />
<Collapse line="2075" />
<Collapse line="2083" />
<Collapse line="2086" />
<Collapse line="2089" />
<Collapse line="2094" />
<Collapse line="2114" />
<Collapse line="2123" />
<Collapse line="2127" />
<Collapse line="2132" />
<Collapse line="2141" />
<Collapse line="2146" />
<Collapse line="2155" />
<Collapse line="2165" />
<Collapse line="2169" />
<Collapse line="2178" />
<Collapse line="2193" />
<Collapse line="2207" />
<Collapse line="2214" />
<Collapse line="2223" />
<Collapse line="2259" />
<Collapse line="2419" />
<Collapse line="2436" />
<Collapse line="2439" />
<Collapse line="2444" />
<Collapse line="2493" />
<Collapse line="2498" />
<Collapse line="2519" />
<Collapse line="2524" />
<Collapse line="2528" />
<Collapse line="2532" />
<Collapse line="2536" />
<Collapse line="2540" />
<Collapse line="2551" />
<Collapse line="2561" />
<Collapse line="2571" />
<Collapse line="2610" />
<Collapse line="2621" />
<Collapse line="2646" />
<Collapse line="2651" />
<Collapse line="2680" />
<Collapse line="2684" />
<Collapse line="2695" />
<Collapse line="2707" />
<Collapse line="2718" />
<Collapse line="2739" />
<Collapse line="2763" />
<Collapse line="2810" />
<Collapse line="2818" />
<Collapse line="2826" />
<Collapse line="2834" />
<Collapse line="2847" />
<Collapse line="2913" />
<Collapse line="2925" />
<Collapse line="2931" />
<Collapse line="2937" />
<Collapse line="2967" />
<Collapse line="2971" />
<Collapse line="2987" />
<Collapse line="3027" />
<Collapse line="3039" />
<Collapse line="3049" />
<Collapse line="3056" />
<Collapse line="3089" />
<Collapse line="3111" />
<Collapse line="3160" />
<Collapse line="1313" />
<Collapse line="1350" />
<Collapse line="1367" />
<Collapse line="1405" />
<Collapse line="1417" />
<Collapse line="1447" />
<Collapse line="1483" />
<Collapse line="1495" />
<Collapse line="1509" />
<Collapse line="1514" />
<Collapse line="1527" />
<Collapse line="1547" />
<Collapse line="1559" />
<Collapse line="1571" />
<Collapse line="1585" />
<Collapse line="1599" />
<Collapse line="1605" />
<Collapse line="1623" />
<Collapse line="1640" />
<Collapse line="1654" />
<Collapse line="1714" />
<Collapse line="1724" />
<Collapse line="1793" />
<Collapse line="1833" />
<Collapse line="1867" />
<Collapse line="1909" />
<Collapse line="1917" />
<Collapse line="1925" />
<Collapse line="1936" />
<Collapse line="1949" />
<Collapse line="1961" />
<Collapse line="1968" />
<Collapse line="1980" />
<Collapse line="2032" />
<Collapse line="2043" />
<Collapse line="2050" />
<Collapse line="2057" />
<Collapse line="2068" />
<Collapse line="2076" />
<Collapse line="2084" />
<Collapse line="2087" />
<Collapse line="2090" />
<Collapse line="2095" />
<Collapse line="2115" />
<Collapse line="2124" />
<Collapse line="2128" />
<Collapse line="2133" />
<Collapse line="2142" />
<Collapse line="2147" />
<Collapse line="2156" />
<Collapse line="2166" />
<Collapse line="2170" />
<Collapse line="2179" />
<Collapse line="2194" />
<Collapse line="2208" />
<Collapse line="2215" />
<Collapse line="2224" />
<Collapse line="2256" />
<Collapse line="2260" />
<Collapse line="2269" />
<Collapse line="2302" />
<Collapse line="2420" />
<Collapse line="2437" />
<Collapse line="2440" />
<Collapse line="2445" />
<Collapse line="2494" />
<Collapse line="2499" />
<Collapse line="2520" />
<Collapse line="2525" />
<Collapse line="2529" />
<Collapse line="2533" />
<Collapse line="2537" />
<Collapse line="2541" />
<Collapse line="2552" />
<Collapse line="2562" />
<Collapse line="2572" />
<Collapse line="2611" />
<Collapse line="2622" />
<Collapse line="2647" />
<Collapse line="2652" />
<Collapse line="2681" />
<Collapse line="2685" />
<Collapse line="2696" />
<Collapse line="2708" />
<Collapse line="2719" />
<Collapse line="2740" />
<Collapse line="2764" />
<Collapse line="2811" />
<Collapse line="2819" />
<Collapse line="2827" />
<Collapse line="2835" />
<Collapse line="2848" />
<Collapse line="2914" />
<Collapse line="2926" />
<Collapse line="2932" />
<Collapse line="2938" />
<Collapse line="2968" />
<Collapse line="2972" />
<Collapse line="2988" />
<Collapse line="3028" />
<Collapse line="3040" />
<Collapse line="3050" />
<Collapse line="3057" />
<Collapse line="3090" />
<Collapse line="3112" />
<Collapse line="3161" />
</Folding>
</File>
<File name="tileReference.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="412" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3921" topLine="66" />
</Cursor>
</File>
<File name="main.cpp" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1118" topLine="32" />
</Cursor>
</File>
<File name="tileReference.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="893" topLine="34" />
</Cursor>
</File>
<File name="paletteSwap.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="279" topLine="0" />
</Cursor>
<Folding>
<Collapse line="4" />
<Collapse line="11" />
<Collapse line="15" />
<Collapse line="66" />
</Folding>
</File>
<File name="hdnesPackEditormainForm.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6475" topLine="150" />
</Cursor>
</File>
<File name="coreData.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="13427" topLine="65" />
</Cursor>
<Folding>
<Collapse line="24" />
<Collapse line="28" />
<Collapse line="32" />
<Collapse line="38" />
<Collapse line="53" />
<Collapse line="81" />
<Collapse line="198" />
<Collapse line="238" />
<Collapse line="258" />
<Collapse line="287" />
<Collapse line="325" />
<Collapse line="361" />
<Collapse line="366" />
<Collapse line="371" />
<Collapse line="385" />
<Collapse line="392" />
<Collapse line="475" />
<Collapse line="481" />
</Folding>
</File>
<File name="image.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="189" topLine="0" />
</Cursor>
</File>
<File name="paletteSwap.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="293" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.h" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="382" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>

View file

@ -1285,6 +1285,7 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
c.vFlip = (ndata->tiles[i].vFlip != t.vFlip);
c.name = main::intToStr(conditionCounter++);
ndata->tiles[i].conditions.push_back(c);
ndata->tiles[i].conSigns.push_back(false);
}
}
}