Fix crashing sub menu

This commit is contained in:
mkwong98 2020-05-03 12:59:39 +08:00
parent 1467fd896a
commit db9e4bcb2a
4 changed files with 337 additions and 311 deletions

View file

@ -7572,7 +7572,7 @@
"wx/gdicmn.h"
"wx/dialog.h"
1585990803 source:d:\work\hdnes\trunk\hdnespackeditor\hdnespackeditormainform.cpp
1588481832 source:d:\work\hdnes\trunk\hdnespackeditor\hdnespackeditormainform.cpp
"hdnesPackEditormainForm.h"
"hdnesPackEditornewProjectDialog.h"
"hdnesPackEditorcolourSelectDialog.h"

View file

@ -2,195 +2,15 @@
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Release" />
<File name="classList.h" open="1" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="256" topLine="0" />
</Cursor>
</File>
<File name="gameObjNode.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2696" topLine="3" />
</Cursor>
<Folding>
<Collapse line="7" />
<Collapse line="34" />
<Collapse line="38" />
<Collapse line="43" />
<Collapse line="47" />
<Collapse line="52" />
<Collapse line="61" />
<Collapse line="71" />
<Collapse line="172" />
<Collapse line="232" />
<Collapse line="253" />
<Collapse line="263" />
</Folding>
</File>
<File name="condition.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5395" topLine="0" />
</Cursor>
<Folding>
<Collapse line="15" />
<Collapse line="29" />
<Collapse line="53" />
<Collapse line="108" />
<Collapse line="126" />
</Folding>
</File>
<File name="condition.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="0" />
</Cursor>
<Folding>
<Collapse line="8" />
</Folding>
</File>
<File name="coreData.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="13402" topLine="16" />
</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="gameObjNode.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1292" topLine="0" />
</Cursor>
<Folding>
<Collapse line="28" />
</Folding>
</File>
<File name="gameTile.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="872" topLine="0" />
</Cursor>
<Folding>
<Collapse line="7" />
<Collapse line="22" />
<Collapse line="26" />
<Collapse line="42" />
<Collapse line="46" />
<Collapse line="56" />
<Collapse line="65" />
<Collapse line="135" />
<Collapse line="173" />
</Folding>
</File>
<File name="tileReference.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1081" topLine="0" />
</Cursor>
<Folding>
<Collapse line="43" />
<Collapse line="65" />
</Folding>
</File>
<File name="gameTile.h" open="1" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="804" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3921" 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="paletteSwap.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="279" topLine="0" />
</Cursor>
</File>
<File name="mainForm.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="53767" topLine="3" />
</Cursor>
</File>
<File name="hdnesPackEditornewProjectDialog.h" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="0" />
</Cursor>
</File>
<File name="mainForm.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="10060" topLine="37" />
</Cursor>
<Folding>
<Collapse line="47" />
</Folding>
</File>
<File name="hdnesPackEditorreplacementDialog.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
<Cursor>
<Cursor1 position="2646" topLine="0" />
</Cursor>
<Folding>
<Collapse line="35" />
<Collapse line="47" />
</Folding>
</File>
<File name="common.h" open="1" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="171" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.h" open="1" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="382" topLine="0" />
</Cursor>
</File>
<File name="tileReference.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="502" topLine="0" />
</Cursor>
<Folding>
<Collapse line="6" />
</Folding>
</File>
<File name="coreData.h" open="1" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="776" topLine="0" />
</Cursor>
</File>
<File name="main.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="565" topLine="2" />
</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="54373" topLine="138" />
<Cursor1 position="38542" topLine="204" />
</Cursor>
<Folding>
<Collapse line="16" />
<Collapse line="31" />
<Collapse line="32" />
<Collapse line="34" />
<Collapse line="47" />
<Collapse line="57" />
<Collapse line="60" />
<Collapse line="70" />
<Collapse line="75" />
<Collapse line="84" />
@ -246,130 +66,217 @@
<Collapse line="888" />
<Collapse line="902" />
<Collapse line="913" />
<Collapse line="924" />
<Collapse line="1012" />
<Collapse line="1313" />
<Collapse line="1350" />
<Collapse line="1405" />
<Collapse line="1419" />
<Collapse line="1449" />
<Collapse line="1485" />
<Collapse line="1497" />
<Collapse line="1511" />
<Collapse line="1516" />
<Collapse line="1529" />
<Collapse line="1549" />
<Collapse line="1561" />
<Collapse line="1573" />
<Collapse line="1587" />
<Collapse line="1601" />
<Collapse line="1607" />
<Collapse line="1625" />
<Collapse line="1642" />
<Collapse line="1656" />
<Collapse line="1716" />
<Collapse line="1726" />
<Collapse line="1795" />
<Collapse line="1835" />
<Collapse line="1869" />
<Collapse line="1911" />
<Collapse line="1919" />
<Collapse line="1927" />
<Collapse line="1938" />
<Collapse line="1951" />
<Collapse line="1963" />
<Collapse line="1320" />
<Collapse line="1357" />
<Collapse line="1374" />
<Collapse line="1412" />
<Collapse line="1426" />
<Collapse line="1456" />
<Collapse line="1492" />
<Collapse line="1504" />
<Collapse line="1518" />
<Collapse line="1523" />
<Collapse line="1536" />
<Collapse line="1556" />
<Collapse line="1568" />
<Collapse line="1580" />
<Collapse line="1594" />
<Collapse line="1608" />
<Collapse line="1614" />
<Collapse line="1632" />
<Collapse line="1649" />
<Collapse line="1663" />
<Collapse line="1723" />
<Collapse line="1733" />
<Collapse line="1802" />
<Collapse line="1842" />
<Collapse line="1876" />
<Collapse line="1918" />
<Collapse line="1958" />
<Collapse line="1970" />
<Collapse line="1982" />
<Collapse line="2034" />
<Collapse line="2045" />
<Collapse line="2041" />
<Collapse line="2052" />
<Collapse line="2059" />
<Collapse line="2070" />
<Collapse line="2078" />
<Collapse line="2086" />
<Collapse line="2089" />
<Collapse line="2092" />
<Collapse line="2097" />
<Collapse line="2117" />
<Collapse line="2126" />
<Collapse line="2130" />
<Collapse line="2135" />
<Collapse line="2144" />
<Collapse line="2149" />
<Collapse line="2158" />
<Collapse line="2168" />
<Collapse line="2172" />
<Collapse line="2181" />
<Collapse line="2196" />
<Collapse line="2210" />
<Collapse line="2066" />
<Collapse line="2077" />
<Collapse line="2085" />
<Collapse line="2093" />
<Collapse line="2096" />
<Collapse line="2099" />
<Collapse line="2104" />
<Collapse line="2124" />
<Collapse line="2133" />
<Collapse line="2137" />
<Collapse line="2142" />
<Collapse line="2151" />
<Collapse line="2156" />
<Collapse line="2165" />
<Collapse line="2175" />
<Collapse line="2179" />
<Collapse line="2188" />
<Collapse line="2203" />
<Collapse line="2217" />
<Collapse line="2226" />
<Collapse line="2258" />
<Collapse line="2262" />
<Collapse line="2271" />
<Collapse line="2304" />
<Collapse line="2422" />
<Collapse line="2439" />
<Collapse line="2442" />
<Collapse line="2447" />
<Collapse line="2496" />
<Collapse line="2501" />
<Collapse line="2522" />
<Collapse line="2527" />
<Collapse line="2531" />
<Collapse line="2535" />
<Collapse line="2539" />
<Collapse line="2543" />
<Collapse line="2554" />
<Collapse line="2564" />
<Collapse line="2574" />
<Collapse line="2613" />
<Collapse line="2624" />
<Collapse line="2649" />
<Collapse line="2654" />
<Collapse line="2683" />
<Collapse line="2687" />
<Collapse line="2698" />
<Collapse line="2710" />
<Collapse line="2721" />
<Collapse line="2742" />
<Collapse line="2766" />
<Collapse line="2813" />
<Collapse line="2821" />
<Collapse line="2829" />
<Collapse line="2837" />
<Collapse line="2846" />
<Collapse line="2859" />
<Collapse line="2925" />
<Collapse line="2937" />
<Collapse line="2943" />
<Collapse line="2949" />
<Collapse line="2979" />
<Collapse line="2983" />
<Collapse line="2999" />
<Collapse line="3039" />
<Collapse line="3051" />
<Collapse line="3061" />
<Collapse line="2224" />
<Collapse line="2233" />
<Collapse line="2265" />
<Collapse line="2269" />
<Collapse line="2278" />
<Collapse line="2311" />
<Collapse line="2429" />
<Collapse line="2446" />
<Collapse line="2449" />
<Collapse line="2454" />
<Collapse line="2503" />
<Collapse line="2508" />
<Collapse line="2529" />
<Collapse line="2534" />
<Collapse line="2538" />
<Collapse line="2542" />
<Collapse line="2546" />
<Collapse line="2550" />
<Collapse line="2561" />
<Collapse line="2571" />
<Collapse line="2581" />
<Collapse line="2620" />
<Collapse line="2631" />
<Collapse line="2656" />
<Collapse line="2661" />
<Collapse line="2690" />
<Collapse line="2694" />
<Collapse line="2705" />
<Collapse line="2717" />
<Collapse line="2728" />
<Collapse line="2749" />
<Collapse line="2773" />
<Collapse line="2820" />
<Collapse line="2828" />
<Collapse line="2836" />
<Collapse line="2844" />
<Collapse line="2853" />
<Collapse line="2866" />
<Collapse line="2932" />
<Collapse line="2944" />
<Collapse line="2950" />
<Collapse line="2956" />
<Collapse line="2986" />
<Collapse line="2990" />
<Collapse line="3006" />
<Collapse line="3046" />
<Collapse line="3058" />
<Collapse line="3068" />
<Collapse line="3101" />
<Collapse line="3123" />
<Collapse line="3172" />
<Collapse line="3075" />
<Collapse line="3108" />
<Collapse line="3130" />
<Collapse line="3179" />
</Folding>
</File>
<File name="main.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="hdnesPackEditornewProjectDialog.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="380" topLine="0" />
<Cursor1 position="742" topLine="0" />
</Cursor>
<Folding>
<Collapse line="10" />
<Collapse line="16" />
</Folding>
</File>
<File name="colourDialogClient.h" open="1" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="235" topLine="0" />
</Cursor>
<Folding>
<Collapse line="5" />
</Folding>
</File>
<File name="hdnesPackEditornewProjectDialog.h" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="0" />
</Cursor>
<Folding>
<Collapse line="3" />
<Collapse line="14" />
</Folding>
</File>
<File name="classList.h" open="1" top="0" tabpos="22" 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="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
<Cursor>
<Cursor1 position="2646" topLine="0" />
</Cursor>
<Folding>
<Collapse line="10" />
<Collapse line="19" />
<Collapse line="23" />
<Collapse line="30" />
<Collapse line="43" />
<Collapse line="55" />
</Folding>
</File>
<File name="paletteSwap.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="279" topLine="0" />
</Cursor>
</File>
<File name="coreData.h" open="1" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="776" topLine="0" />
</Cursor>
<Folding>
<Collapse line="8" />
</Folding>
</File>
<File name="tileReference.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1081" topLine="0" />
</Cursor>
<Folding>
<Collapse line="5" />
<Collapse line="10" />
<Collapse line="14" />
<Collapse line="29" />
<Collapse line="61" />
<Collapse line="73" />
<Collapse line="96" />
</Folding>
</File>
<File name="hdnesPackEditormainForm.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1133" topLine="0" />
</Cursor>
<Folding>
<Collapse line="32" />
</Folding>
</File>
<File name="main.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="565" topLine="2" />
</Cursor>
<Folding>
<Collapse line="10" />
<Collapse line="17" />
<Collapse line="24" />
<Collapse line="30" />
<Collapse line="36" />
<Collapse line="50" />
<Collapse line="60" />
<Collapse line="66" />
<Collapse line="78" />
<Collapse line="95" />
<Collapse line="108" />
<Collapse line="112" />
<Collapse line="118" />
</Folding>
</File>
<File name="hdnesPackEditorreplacementDialog.h" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1177" topLine="0" />
</Cursor>
</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>
<Folding>
<Collapse line="3" />
<Collapse line="15" />
</Folding>
</File>
<File name="paletteSwap.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
@ -379,22 +286,134 @@
<Collapse line="6" />
</Folding>
</File>
<File name="hdnesPackEditornewProjectDialog.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<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="742" topLine="0" />
<Cursor1 position="359" topLine="0" />
</Cursor>
</File>
<File name="colourDialogClient.h" open="1" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="mainForm.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="235" topLine="0" />
</Cursor>
</File>
<File name="hdnesPackEditormainForm.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3751" topLine="27" />
<Cursor1 position="53767" topLine="3" />
</Cursor>
<Folding>
<Collapse line="47" />
<Collapse line="12" />
<Collapse line="1161" />
<Collapse line="1296" />
<Collapse line="1352" />
<Collapse line="1359" />
<Collapse line="1714" />
<Collapse line="1849" />
<Collapse line="1909" />
</Folding>
</File>
<File name="common.h" open="1" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="171" 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="condition.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="5395" topLine="0" />
</Cursor>
<Folding>
<Collapse line="6" />
<Collapse line="11" />
<Collapse line="138" />
<Collapse line="161" />
</Folding>
</File>
<File name="main.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="380" topLine="0" />
</Cursor>
<Folding>
<Collapse line="12" />
</Folding>
</File>
<File name="condition.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="229" topLine="0" />
</Cursor>
</File>
<File name="tileReference.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="502" topLine="0" />
</Cursor>
</File>
<File name="gameTile.h" open="1" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="804" topLine="0" />
</Cursor>
<Folding>
<Collapse line="8" />
<Collapse line="18" />
</Folding>
</File>
<File name="coreData.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="13402" topLine="16" />
</Cursor>
<Folding>
<Collapse line="11" />
<Collapse line="22" />
<Collapse line="24" />
<Collapse line="28" />
<Collapse line="32" />
<Collapse line="412" />
</Folding>
</File>
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3921" topLine="0" />
</Cursor>
<Folding>
<Collapse line="11" />
<Collapse line="82" />
<Collapse line="89" />
<Collapse line="98" />
<Collapse line="114" />
</Folding>
</File>
<File name="gameObjNode.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2696" topLine="3" />
</Cursor>
</File>
<File name="hdnesPackEditorcolourSelectDialog.h" open="1" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="382" topLine="0" />
</Cursor>
<Folding>
<Collapse line="3" />
<Collapse line="15" />
</Folding>
</File>
<File name="gameObjNode.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1292" topLine="0" />
</Cursor>
<Folding>
<Collapse line="21" />
</Folding>
</File>
<File name="mainForm.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="10060" topLine="37" />
</Cursor>
<Folding>
<Collapse line="331" />
<Collapse line="357" />
<Collapse line="444" />
</Folding>
</File>
<File name="gameTile.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="872" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>

View file

@ -950,7 +950,8 @@ void hdnesPackEditormainForm::gameObjsRawRUp( wxMouseEvent& event ){
menu.Append(GAME_OBJ_PNL_AUTO_CONDITION, wxT("Add condition to untreated tiles"));
if(data->palettes.size() > 0){
wxMenu submenu(wxT(""));
wxMenu* submenu;
submenu = new wxMenu(wxT(""));
stringstream s;
for(int i = 0; i < data->palettes.size(); ++i){
s.str(std::string());
@ -960,9 +961,10 @@ void hdnesPackEditormainForm::gameObjsRawRUp( wxMouseEvent& event ){
s << main::intToHex(data->palettes[i][2]);
s << main::intToHex(data->palettes[i][3]);
submenu.Append(i + GAME_OBJ_PNL_PALETTE_SELECT_OFFSET, wxString(s.str().c_str()));
submenu->Append(i + GAME_OBJ_PNL_PALETTE_SELECT_OFFSET, wxString(s.str().c_str()));
}
menu.AppendSubMenu(&submenu, wxT("Select tiles with palette"));
menu.AppendSubMenu(submenu, wxT("Select tiles with palette"));
}
//check right click on a selected tile
@ -989,14 +991,17 @@ void hdnesPackEditormainForm::gameObjsRawRUp( wxMouseEvent& event ){
menu.Append(GAME_OBJ_PNL_GROUP_CONDITION, wxT("Set conditions for tiles"));
}
if(data->isSprite){
wxMenu submenu2(wxT(""));
submenu2.Append(GAME_OBJ_PNL_HFLIP, wxT("Flip direction horizontally"));
submenu2.Append(GAME_OBJ_PNL_VFLIP, wxT("Flip direction vertically"));
wxMenu* submenu2;
submenu2 = new wxMenu(wxT(""));
submenu2->Append(GAME_OBJ_PNL_HFLIP, wxT("Flip direction horizontally"));
submenu2->Append(GAME_OBJ_PNL_VFLIP, wxT("Flip direction vertically"));
if(gameObjSelectedTiles.size() > 1){
submenu2.Append(GAME_OBJ_PNL_HFLIP2, wxT("Flip direction and location horizontally"));
submenu2.Append(GAME_OBJ_PNL_VFLIP2, wxT("Flip direction and location vertically"));
submenu2->Append(GAME_OBJ_PNL_HFLIP2, wxT("Flip direction and location horizontally"));
submenu2->Append(GAME_OBJ_PNL_VFLIP2, wxT("Flip direction and location vertically"));
}
menu.AppendSubMenu(&submenu2, wxT("Flip tiles"));
menu.AppendSubMenu(submenu2, wxT("Flip tiles"));
}
}
else{
@ -1292,6 +1297,7 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
coreData::cData->dataChanged();
break;
default:
if(event.GetId() >= GAME_OBJ_PNL_PALETTE_SELECT_OFFSET){
offset = event.GetId() - GAME_OBJ_PNL_PALETTE_SELECT_OFFSET;
gameObjSelectedTiles.clear();
@ -1307,6 +1313,7 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
}
drawGameObjEdits();
}
break;
}
}