mirror of
https://github.com/mkwong98/HDNes.git
synced 2024-05-20 13:07:54 -04:00
This commit is contained in:
mkwong98
parent
1164c0a24e
commit
66113d6e39
|
|
@ -2135,7 +2135,7 @@
|
|||
"begin_code.h"
|
||||
"close_code.h"
|
||||
|
||||
1520385820 source:c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.cpp
|
||||
1522136595 source:c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.cpp
|
||||
"hdnesPackEditormainForm.h"
|
||||
"hdnesPackEditornewProjectDialog.h"
|
||||
"hdnesPackEditorcolourSelectDialog.h"
|
||||
|
|
@ -2149,7 +2149,7 @@
|
|||
"image.h"
|
||||
"paletteSwap.h"
|
||||
|
||||
1519981567 c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.h
|
||||
1522136762 c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.h
|
||||
"common.h"
|
||||
"mainForm.h"
|
||||
"colourDialogClient.h"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,71 @@
|
|||
<CodeBlocks_layout_file>
|
||||
<FileVersion major="1" minor="0" />
|
||||
<ActiveTarget name="Debug" />
|
||||
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="229" topLine="7" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditormainForm.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1077" topLine="24" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="common.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="171" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="paletteSwap.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="71" topLine="3" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="colourDialogClient.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="235" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="coreData.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="42" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameTile.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="322" topLine="7" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditornewProjectDialog.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="996" topLine="21" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorcolourSelectDialog.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="382" topLine="9" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainForm.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="53767" topLine="929" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="classList.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="202" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="tileReference.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="866" topLine="56" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainForm.h" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="6561" topLine="152" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="condition.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="128" topLine="3" />
|
||||
|
|
@ -26,19 +91,88 @@
|
|||
<Cursor1 position="444" topLine="9" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="paletteSwap.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="71" topLine="3" />
|
||||
<Cursor1 position="384" topLine="13" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameTile.cpp" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="coreData.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="902" topLine="51" />
|
||||
<Cursor1 position="11077" topLine="59" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="10" />
|
||||
<Collapse line="20" />
|
||||
<Collapse line="22" />
|
||||
<Collapse line="26" />
|
||||
<Collapse line="30" />
|
||||
<Collapse line="36" />
|
||||
<Collapse line="42" />
|
||||
<Collapse line="47" />
|
||||
<Collapse line="61" />
|
||||
<Collapse line="62" />
|
||||
<Collapse line="63" />
|
||||
<Collapse line="66" />
|
||||
<Collapse line="69" />
|
||||
<Collapse line="76" />
|
||||
<Collapse line="79" />
|
||||
<Collapse line="82" />
|
||||
<Collapse line="85" />
|
||||
<Collapse line="88" />
|
||||
<Collapse line="91" />
|
||||
<Collapse line="94" />
|
||||
<Collapse line="97" />
|
||||
<Collapse line="102" />
|
||||
<Collapse line="105" />
|
||||
<Collapse line="107" />
|
||||
<Collapse line="108" />
|
||||
<Collapse line="109" />
|
||||
<Collapse line="117" />
|
||||
<Collapse line="120" />
|
||||
<Collapse line="123" />
|
||||
<Collapse line="126" />
|
||||
<Collapse line="130" />
|
||||
<Collapse line="134" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="tileReference.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="241" topLine="6" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameObjNode.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="4351" topLine="114" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="main.h" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="482" topLine="10" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="image.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="303" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameObjNode.h" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1356" topLine="32" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="3921" topLine="66" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorreplacementDialog.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1177" topLine="27" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditormainForm.cpp" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="10682" topLine="241" />
|
||||
<Cursor1 position="46483" topLine="305" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="16" />
|
||||
|
|
@ -69,6 +203,8 @@
|
|||
<Collapse line="144" />
|
||||
<Collapse line="148" />
|
||||
<Collapse line="152" />
|
||||
<Collapse line="199" />
|
||||
<Collapse line="200" />
|
||||
<Collapse line="208" />
|
||||
<Collapse line="218" />
|
||||
<Collapse line="219" />
|
||||
|
|
@ -89,6 +225,12 @@
|
|||
<Collapse line="297" />
|
||||
<Collapse line="304" />
|
||||
<Collapse line="305" />
|
||||
<Collapse line="310" />
|
||||
<Collapse line="314" />
|
||||
<Collapse line="317" />
|
||||
<Collapse line="322" />
|
||||
<Collapse line="326" />
|
||||
<Collapse line="330" />
|
||||
<Collapse line="334" />
|
||||
<Collapse line="335" />
|
||||
<Collapse line="340" />
|
||||
|
|
@ -175,397 +317,279 @@
|
|||
<Collapse line="846" />
|
||||
<Collapse line="852" />
|
||||
<Collapse line="857" />
|
||||
<Collapse line="863" />
|
||||
<Collapse line="865" />
|
||||
<Collapse line="871" />
|
||||
<Collapse line="875" />
|
||||
<Collapse line="879" />
|
||||
<Collapse line="880" />
|
||||
<Collapse line="883" />
|
||||
<Collapse line="891" />
|
||||
<Collapse line="895" />
|
||||
<Collapse line="902" />
|
||||
<Collapse line="907" />
|
||||
<Collapse line="912" />
|
||||
<Collapse line="923" />
|
||||
<Collapse line="933" />
|
||||
<Collapse line="935" />
|
||||
<Collapse line="945" />
|
||||
<Collapse line="947" />
|
||||
<Collapse line="948" />
|
||||
<Collapse line="951" />
|
||||
<Collapse line="957" />
|
||||
<Collapse line="961" />
|
||||
<Collapse line="975" />
|
||||
<Collapse line="978" />
|
||||
<Collapse line="995" />
|
||||
<Collapse line="996" />
|
||||
<Collapse line="999" />
|
||||
<Collapse line="1002" />
|
||||
<Collapse line="1004" />
|
||||
<Collapse line="1018" />
|
||||
<Collapse line="1025" />
|
||||
<Collapse line="1030" />
|
||||
<Collapse line="1031" />
|
||||
<Collapse line="1034" />
|
||||
<Collapse line="1046" />
|
||||
<Collapse line="960" />
|
||||
<Collapse line="970" />
|
||||
<Collapse line="972" />
|
||||
<Collapse line="973" />
|
||||
<Collapse line="976" />
|
||||
<Collapse line="982" />
|
||||
<Collapse line="986" />
|
||||
<Collapse line="1000" />
|
||||
<Collapse line="1003" />
|
||||
<Collapse line="1020" />
|
||||
<Collapse line="1021" />
|
||||
<Collapse line="1024" />
|
||||
<Collapse line="1027" />
|
||||
<Collapse line="1029" />
|
||||
<Collapse line="1043" />
|
||||
<Collapse line="1050" />
|
||||
<Collapse line="1055" />
|
||||
<Collapse line="1066" />
|
||||
<Collapse line="1083" />
|
||||
<Collapse line="1084" />
|
||||
<Collapse line="1085" />
|
||||
<Collapse line="1098" />
|
||||
<Collapse line="1121" />
|
||||
<Collapse line="1122" />
|
||||
<Collapse line="1056" />
|
||||
<Collapse line="1059" />
|
||||
<Collapse line="1071" />
|
||||
<Collapse line="1080" />
|
||||
<Collapse line="1091" />
|
||||
<Collapse line="1107" />
|
||||
<Collapse line="1108" />
|
||||
<Collapse line="1109" />
|
||||
<Collapse line="1119" />
|
||||
<Collapse line="1128" />
|
||||
<Collapse line="1132" />
|
||||
<Collapse line="1133" />
|
||||
<Collapse line="1137" />
|
||||
<Collapse line="1139" />
|
||||
<Collapse line="1140" />
|
||||
<Collapse line="1157" />
|
||||
<Collapse line="1163" />
|
||||
<Collapse line="1176" />
|
||||
<Collapse line="1177" />
|
||||
<Collapse line="1180" />
|
||||
<Collapse line="1183" />
|
||||
<Collapse line="1185" />
|
||||
<Collapse line="1194" />
|
||||
<Collapse line="1205" />
|
||||
<Collapse line="1208" />
|
||||
<Collapse line="1223" />
|
||||
<Collapse line="1230" />
|
||||
<Collapse line="1241" />
|
||||
<Collapse line="1255" />
|
||||
<Collapse line="1270" />
|
||||
<Collapse line="1277" />
|
||||
<Collapse line="1282" />
|
||||
<Collapse line="1289" />
|
||||
<Collapse line="1297" />
|
||||
<Collapse line="1304" />
|
||||
<Collapse line="1307" />
|
||||
<Collapse line="1309" />
|
||||
<Collapse line="1212" />
|
||||
<Collapse line="1218" />
|
||||
<Collapse line="1232" />
|
||||
<Collapse line="1235" />
|
||||
<Collapse line="1238" />
|
||||
<Collapse line="1240" />
|
||||
<Collapse line="1249" />
|
||||
<Collapse line="1260" />
|
||||
<Collapse line="1263" />
|
||||
<Collapse line="1278" />
|
||||
<Collapse line="1285" />
|
||||
<Collapse line="1296" />
|
||||
<Collapse line="1310" />
|
||||
<Collapse line="1313" />
|
||||
<Collapse line="1316" />
|
||||
<Collapse line="1322" />
|
||||
<Collapse line="1334" />
|
||||
<Collapse line="1335" />
|
||||
<Collapse line="1338" />
|
||||
<Collapse line="1325" />
|
||||
<Collapse line="1332" />
|
||||
<Collapse line="1337" />
|
||||
<Collapse line="1344" />
|
||||
<Collapse line="1352" />
|
||||
<Collapse line="1359" />
|
||||
<Collapse line="1362" />
|
||||
<Collapse line="1364" />
|
||||
<Collapse line="1365" />
|
||||
<Collapse line="1368" />
|
||||
<Collapse line="1371" />
|
||||
<Collapse line="1374" />
|
||||
<Collapse line="1381" />
|
||||
<Collapse line="1398" />
|
||||
<Collapse line="1413" />
|
||||
<Collapse line="1424" />
|
||||
<Collapse line="1435" />
|
||||
<Collapse line="1451" />
|
||||
<Collapse line="1485" />
|
||||
<Collapse line="1377" />
|
||||
<Collapse line="1389" />
|
||||
<Collapse line="1390" />
|
||||
<Collapse line="1393" />
|
||||
<Collapse line="1399" />
|
||||
<Collapse line="1417" />
|
||||
<Collapse line="1426" />
|
||||
<Collapse line="1429" />
|
||||
<Collapse line="1436" />
|
||||
<Collapse line="1453" />
|
||||
<Collapse line="1468" />
|
||||
<Collapse line="1479" />
|
||||
<Collapse line="1490" />
|
||||
<Collapse line="1491" />
|
||||
<Collapse line="1514" />
|
||||
<Collapse line="1520" />
|
||||
<Collapse line="1527" />
|
||||
<Collapse line="1535" />
|
||||
<Collapse line="1543" />
|
||||
<Collapse line="1546" />
|
||||
<Collapse line="1549" />
|
||||
<Collapse line="1554" />
|
||||
<Collapse line="1555" />
|
||||
<Collapse line="1557" />
|
||||
<Collapse line="1560" />
|
||||
<Collapse line="1567" />
|
||||
<Collapse line="1579" />
|
||||
<Collapse line="1580" />
|
||||
<Collapse line="1586" />
|
||||
<Collapse line="1588" />
|
||||
<Collapse line="1598" />
|
||||
<Collapse line="1508" />
|
||||
<Collapse line="1542" />
|
||||
<Collapse line="1548" />
|
||||
<Collapse line="1571" />
|
||||
<Collapse line="1577" />
|
||||
<Collapse line="1584" />
|
||||
<Collapse line="1592" />
|
||||
<Collapse line="1600" />
|
||||
<Collapse line="1601" />
|
||||
<Collapse line="1603" />
|
||||
<Collapse line="1606" />
|
||||
<Collapse line="1611" />
|
||||
<Collapse line="1612" />
|
||||
<Collapse line="1618" />
|
||||
<Collapse line="1614" />
|
||||
<Collapse line="1617" />
|
||||
<Collapse line="1624" />
|
||||
<Collapse line="1628" />
|
||||
<Collapse line="1629" />
|
||||
<Collapse line="1634" />
|
||||
<Collapse line="1636" />
|
||||
<Collapse line="1637" />
|
||||
<Collapse line="1643" />
|
||||
<Collapse line="1645" />
|
||||
<Collapse line="1646" />
|
||||
<Collapse line="1656" />
|
||||
<Collapse line="1655" />
|
||||
<Collapse line="1657" />
|
||||
<Collapse line="1663" />
|
||||
<Collapse line="1664" />
|
||||
<Collapse line="1670" />
|
||||
<Collapse line="1673" />
|
||||
<Collapse line="1658" />
|
||||
<Collapse line="1669" />
|
||||
<Collapse line="1675" />
|
||||
<Collapse line="1681" />
|
||||
<Collapse line="1683" />
|
||||
<Collapse line="1689" />
|
||||
<Collapse line="1692" />
|
||||
<Collapse line="1695" />
|
||||
<Collapse line="1700" />
|
||||
<Collapse line="1685" />
|
||||
<Collapse line="1686" />
|
||||
<Collapse line="1691" />
|
||||
<Collapse line="1702" />
|
||||
<Collapse line="1703" />
|
||||
<Collapse line="1707" />
|
||||
<Collapse line="1712" />
|
||||
<Collapse line="1715" />
|
||||
<Collapse line="1713" />
|
||||
<Collapse line="1714" />
|
||||
<Collapse line="1720" />
|
||||
<Collapse line="1723" />
|
||||
<Collapse line="1729" />
|
||||
<Collapse line="1733" />
|
||||
<Collapse line="1721" />
|
||||
<Collapse line="1727" />
|
||||
<Collapse line="1730" />
|
||||
<Collapse line="1738" />
|
||||
<Collapse line="1741" />
|
||||
<Collapse line="1747" />
|
||||
<Collapse line="1740" />
|
||||
<Collapse line="1746" />
|
||||
<Collapse line="1749" />
|
||||
<Collapse line="1752" />
|
||||
<Collapse line="1755" />
|
||||
<Collapse line="1761" />
|
||||
<Collapse line="1763" />
|
||||
<Collapse line="1757" />
|
||||
<Collapse line="1760" />
|
||||
<Collapse line="1764" />
|
||||
<Collapse line="1771" />
|
||||
<Collapse line="1775" />
|
||||
<Collapse line="1778" />
|
||||
<Collapse line="1784" />
|
||||
<Collapse line="1769" />
|
||||
<Collapse line="1772" />
|
||||
<Collapse line="1777" />
|
||||
<Collapse line="1780" />
|
||||
<Collapse line="1786" />
|
||||
<Collapse line="1787" />
|
||||
<Collapse line="1788" />
|
||||
<Collapse line="1791" />
|
||||
<Collapse line="1799" />
|
||||
<Collapse line="1800" />
|
||||
<Collapse line="1790" />
|
||||
<Collapse line="1795" />
|
||||
<Collapse line="1798" />
|
||||
<Collapse line="1804" />
|
||||
<Collapse line="1813" />
|
||||
<Collapse line="1809" />
|
||||
<Collapse line="1812" />
|
||||
<Collapse line="1818" />
|
||||
<Collapse line="1820" />
|
||||
<Collapse line="1823" />
|
||||
<Collapse line="1829" />
|
||||
<Collapse line="1831" />
|
||||
<Collapse line="1821" />
|
||||
<Collapse line="1828" />
|
||||
<Collapse line="1832" />
|
||||
<Collapse line="1835" />
|
||||
<Collapse line="1846" />
|
||||
<Collapse line="1850" />
|
||||
<Collapse line="1853" />
|
||||
<Collapse line="1859" />
|
||||
<Collapse line="1862" />
|
||||
<Collapse line="1863" />
|
||||
<Collapse line="1867" />
|
||||
<Collapse line="1873" />
|
||||
<Collapse line="1841" />
|
||||
<Collapse line="1843" />
|
||||
<Collapse line="1844" />
|
||||
<Collapse line="1845" />
|
||||
<Collapse line="1848" />
|
||||
<Collapse line="1856" />
|
||||
<Collapse line="1857" />
|
||||
<Collapse line="1861" />
|
||||
<Collapse line="1870" />
|
||||
<Collapse line="1877" />
|
||||
<Collapse line="1880" />
|
||||
<Collapse line="1884" />
|
||||
<Collapse line="1886" />
|
||||
<Collapse line="1891" />
|
||||
<Collapse line="1894" />
|
||||
<Collapse line="1902" />
|
||||
<Collapse line="1905" />
|
||||
<Collapse line="1908" />
|
||||
<Collapse line="1911" />
|
||||
<Collapse line="1912" />
|
||||
<Collapse line="1913" />
|
||||
<Collapse line="1926" />
|
||||
<Collapse line="1927" />
|
||||
<Collapse line="1939" />
|
||||
<Collapse line="1942" />
|
||||
<Collapse line="1950" />
|
||||
<Collapse line="1955" />
|
||||
<Collapse line="1957" />
|
||||
<Collapse line="1960" />
|
||||
<Collapse line="1961" />
|
||||
<Collapse line="1888" />
|
||||
<Collapse line="1889" />
|
||||
<Collapse line="1892" />
|
||||
<Collapse line="1903" />
|
||||
<Collapse line="1907" />
|
||||
<Collapse line="1910" />
|
||||
<Collapse line="1916" />
|
||||
<Collapse line="1919" />
|
||||
<Collapse line="1920" />
|
||||
<Collapse line="1924" />
|
||||
<Collapse line="1930" />
|
||||
<Collapse line="1937" />
|
||||
<Collapse line="1941" />
|
||||
<Collapse line="1943" />
|
||||
<Collapse line="1948" />
|
||||
<Collapse line="1951" />
|
||||
<Collapse line="1959" />
|
||||
<Collapse line="1962" />
|
||||
<Collapse line="1963" />
|
||||
<Collapse line="1964" />
|
||||
<Collapse line="1974" />
|
||||
<Collapse line="1977" />
|
||||
<Collapse line="1982" />
|
||||
<Collapse line="1986" />
|
||||
<Collapse line="1997" />
|
||||
<Collapse line="2008" />
|
||||
<Collapse line="2009" />
|
||||
<Collapse line="2021" />
|
||||
<Collapse line="2026" />
|
||||
<Collapse line="2031" />
|
||||
<Collapse line="2036" />
|
||||
<Collapse line="2040" />
|
||||
<Collapse line="2043" />
|
||||
<Collapse line="2057" />
|
||||
<Collapse line="2062" />
|
||||
<Collapse line="2066" />
|
||||
<Collapse line="2070" />
|
||||
<Collapse line="2074" />
|
||||
<Collapse line="2078" />
|
||||
<Collapse line="2089" />
|
||||
<Collapse line="2092" />
|
||||
<Collapse line="2099" />
|
||||
<Collapse line="2102" />
|
||||
<Collapse line="2109" />
|
||||
<Collapse line="2111" />
|
||||
<Collapse line="2113" />
|
||||
<Collapse line="2116" />
|
||||
<Collapse line="2120" />
|
||||
<Collapse line="2126" />
|
||||
<Collapse line="1965" />
|
||||
<Collapse line="1968" />
|
||||
<Collapse line="1969" />
|
||||
<Collapse line="1970" />
|
||||
<Collapse line="1983" />
|
||||
<Collapse line="1984" />
|
||||
<Collapse line="1996" />
|
||||
<Collapse line="1999" />
|
||||
<Collapse line="2007" />
|
||||
<Collapse line="2012" />
|
||||
<Collapse line="2014" />
|
||||
<Collapse line="2017" />
|
||||
<Collapse line="2018" />
|
||||
<Collapse line="2019" />
|
||||
<Collapse line="2020" />
|
||||
<Collapse line="2029" />
|
||||
<Collapse line="2032" />
|
||||
<Collapse line="2086" />
|
||||
<Collapse line="2091" />
|
||||
<Collapse line="2095" />
|
||||
<Collapse line="2098" />
|
||||
<Collapse line="2112" />
|
||||
<Collapse line="2117" />
|
||||
<Collapse line="2121" />
|
||||
<Collapse line="2125" />
|
||||
<Collapse line="2129" />
|
||||
<Collapse line="2133" />
|
||||
<Collapse line="2136" />
|
||||
<Collapse line="2140" />
|
||||
<Collapse line="2143" />
|
||||
<Collapse line="2148" />
|
||||
<Collapse line="2159" />
|
||||
<Collapse line="2170" />
|
||||
<Collapse line="2172" />
|
||||
<Collapse line="2177" />
|
||||
<Collapse line="2185" />
|
||||
<Collapse line="2144" />
|
||||
<Collapse line="2147" />
|
||||
<Collapse line="2154" />
|
||||
<Collapse line="2157" />
|
||||
<Collapse line="2164" />
|
||||
<Collapse line="2166" />
|
||||
<Collapse line="2168" />
|
||||
<Collapse line="2171" />
|
||||
<Collapse line="2175" />
|
||||
<Collapse line="2181" />
|
||||
<Collapse line="2184" />
|
||||
<Collapse line="2188" />
|
||||
<Collapse line="2191" />
|
||||
<Collapse line="2195" />
|
||||
<Collapse line="2198" />
|
||||
<Collapse line="2213" />
|
||||
<Collapse line="2203" />
|
||||
<Collapse line="2214" />
|
||||
<Collapse line="2235" />
|
||||
<Collapse line="2256" />
|
||||
<Collapse line="2264" />
|
||||
<Collapse line="2266" />
|
||||
<Collapse line="2225" />
|
||||
<Collapse line="2227" />
|
||||
<Collapse line="2232" />
|
||||
<Collapse line="2240" />
|
||||
<Collapse line="2253" />
|
||||
<Collapse line="2268" />
|
||||
<Collapse line="2276" />
|
||||
<Collapse line="2282" />
|
||||
<Collapse line="2283" />
|
||||
<Collapse line="2288" />
|
||||
<Collapse line="2291" />
|
||||
<Collapse line="2293" />
|
||||
<Collapse line="2294" />
|
||||
<Collapse line="2295" />
|
||||
<Collapse line="2298" />
|
||||
<Collapse line="2300" />
|
||||
<Collapse line="2318" />
|
||||
<Collapse line="2322" />
|
||||
<Collapse line="2325" />
|
||||
<Collapse line="2327" />
|
||||
<Collapse line="2269" />
|
||||
<Collapse line="2290" />
|
||||
<Collapse line="2311" />
|
||||
<Collapse line="2319" />
|
||||
<Collapse line="2321" />
|
||||
<Collapse line="2323" />
|
||||
<Collapse line="2331" />
|
||||
<Collapse line="2337" />
|
||||
<Collapse line="2338" />
|
||||
<Collapse line="2339" />
|
||||
<Collapse line="2340" />
|
||||
<Collapse line="2356" />
|
||||
<Collapse line="2361" />
|
||||
<Collapse line="2362" />
|
||||
<Collapse line="2365" />
|
||||
<Collapse line="2378" />
|
||||
<Collapse line="2390" />
|
||||
<Collapse line="2391" />
|
||||
<Collapse line="2343" />
|
||||
<Collapse line="2346" />
|
||||
<Collapse line="2348" />
|
||||
<Collapse line="2349" />
|
||||
<Collapse line="2350" />
|
||||
<Collapse line="2353" />
|
||||
<Collapse line="2355" />
|
||||
<Collapse line="2373" />
|
||||
<Collapse line="2377" />
|
||||
<Collapse line="2380" />
|
||||
<Collapse line="2382" />
|
||||
<Collapse line="2393" />
|
||||
<Collapse line="2400" />
|
||||
<Collapse line="2401" />
|
||||
<Collapse line="2407" />
|
||||
<Collapse line="2408" />
|
||||
<Collapse line="2418" />
|
||||
<Collapse line="2423" />
|
||||
<Collapse line="2424" />
|
||||
<Collapse line="2432" />
|
||||
<Collapse line="2440" />
|
||||
<Collapse line="2443" />
|
||||
<Collapse line="2394" />
|
||||
<Collapse line="2395" />
|
||||
<Collapse line="2411" />
|
||||
<Collapse line="2416" />
|
||||
<Collapse line="2417" />
|
||||
<Collapse line="2420" />
|
||||
<Collapse line="2433" />
|
||||
<Collapse line="2445" />
|
||||
<Collapse line="2446" />
|
||||
<Collapse line="2448" />
|
||||
<Collapse line="2455" />
|
||||
<Collapse line="2456" />
|
||||
<Collapse line="2462" />
|
||||
<Collapse line="2480" />
|
||||
<Collapse line="2482" />
|
||||
<Collapse line="2483" />
|
||||
<Collapse line="2489" />
|
||||
<Collapse line="2490" />
|
||||
<Collapse line="2463" />
|
||||
<Collapse line="2473" />
|
||||
<Collapse line="2478" />
|
||||
<Collapse line="2479" />
|
||||
<Collapse line="2487" />
|
||||
<Collapse line="2495" />
|
||||
<Collapse line="2498" />
|
||||
<Collapse line="2500" />
|
||||
<Collapse line="2504" />
|
||||
<Collapse line="2501" />
|
||||
<Collapse line="2511" />
|
||||
<Collapse line="2512" />
|
||||
<Collapse line="2517" />
|
||||
<Collapse line="2535" />
|
||||
<Collapse line="2537" />
|
||||
<Collapse line="2538" />
|
||||
<Collapse line="2544" />
|
||||
<Collapse line="2545" />
|
||||
<Collapse line="2555" />
|
||||
<Collapse line="2559" />
|
||||
<Collapse line="2566" />
|
||||
<Collapse line="2567" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="229" topLine="7" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="tileReference.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="247" topLine="6" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditormainForm.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="9496" topLine="237" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorreplacementDialog.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1177" topLine="27" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="classList.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="202" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="image.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="303" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditornewProjectDialog.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="996" topLine="21" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="image.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="249" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="colourDialogClient.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="gameTile.cpp" 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="main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="384" topLine="13" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="main.h" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="482" topLine="10" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="coreData.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="11077" topLine="59" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="10" />
|
||||
<Collapse line="20" />
|
||||
<Collapse line="22" />
|
||||
<Collapse line="26" />
|
||||
<Collapse line="30" />
|
||||
<Collapse line="36" />
|
||||
<Collapse line="42" />
|
||||
<Collapse line="47" />
|
||||
<Collapse line="61" />
|
||||
<Collapse line="62" />
|
||||
<Collapse line="63" />
|
||||
<Collapse line="66" />
|
||||
<Collapse line="69" />
|
||||
<Collapse line="76" />
|
||||
<Collapse line="79" />
|
||||
<Collapse line="82" />
|
||||
<Collapse line="85" />
|
||||
<Collapse line="88" />
|
||||
<Collapse line="91" />
|
||||
<Collapse line="94" />
|
||||
<Collapse line="97" />
|
||||
<Collapse line="102" />
|
||||
<Collapse line="105" />
|
||||
<Collapse line="107" />
|
||||
<Collapse line="108" />
|
||||
<Collapse line="109" />
|
||||
<Collapse line="117" />
|
||||
<Collapse line="120" />
|
||||
<Collapse line="123" />
|
||||
<Collapse line="126" />
|
||||
<Collapse line="130" />
|
||||
<Collapse line="134" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="common.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="171" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="coreData.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="42" topLine="0" />
|
||||
<Cursor1 position="902" topLine="51" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="paletteSwap.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
|
|
@ -573,44 +597,4 @@
|
|||
<Cursor1 position="1902" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameObjNode.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="2328" topLine="84" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="tileReference.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="866" topLine="56" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameObjNode.h" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1356" topLine="32" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameTile.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="572" topLine="7" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="3939" topLine="99" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorcolourSelectDialog.h" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="382" topLine="9" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainForm.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="53767" topLine="929" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainForm.h" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="6561" topLine="152" />
|
||||
</Cursor>
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
|
|
|
|||
|
|
@ -887,6 +887,23 @@ void hdnesPackEditormainForm::gameObjsRawRUp( wxMouseEvent& event ){
|
|||
}
|
||||
menu.Append(GAME_OBJ_PNL_SHOW_NOT_UNIQUE, wxT("Select untreated tiles"));
|
||||
menu.Append(GAME_OBJ_PNL_AUTO_CONDITION, wxT("Add condition to untreated tiles"));
|
||||
|
||||
if(data->palettes.size() > 0){
|
||||
wxMenu submenu(wxT(""));
|
||||
stringstream s;
|
||||
for(int i = 0; i < data->palettes.size(); ++i){
|
||||
s.str(std::string());
|
||||
s.clear();
|
||||
s << main::intToHex(data->palettes[i][0]);
|
||||
s << main::intToHex(data->palettes[i][1]);
|
||||
s << main::intToHex(data->palettes[i][2]);
|
||||
s << main::intToHex(data->palettes[i][3]);
|
||||
|
||||
submenu.Append(i + 100, wxString(s.str().c_str()));
|
||||
}
|
||||
menu.AppendSubMenu(&submenu, wxT("Select tiles with palette"));
|
||||
}
|
||||
|
||||
//check right click on a selected tile
|
||||
bool tileFound = false;
|
||||
for(Uint32 k = 0; k < gameObjSelectedTiles.size(); ++k){
|
||||
|
|
@ -904,7 +921,12 @@ void hdnesPackEditormainForm::gameObjsRawRUp( wxMouseEvent& event ){
|
|||
menu.Append(GAME_OBJ_PNL_COPY, wxT("Copy"));
|
||||
menu.Append(GAME_OBJ_PNL_DELETE, wxT("Delete"));
|
||||
menu.Append(GAME_OBJ_PNL_REPLACE, wxT("Set replacement"));
|
||||
menu.Append(GAME_OBJ_PNL_CONDITION, wxT("Set conditions"));
|
||||
if(gameObjSelectedTiles.size() == 1){
|
||||
menu.Append(GAME_OBJ_PNL_CONDITION, wxT("Set conditions"));
|
||||
}
|
||||
else{
|
||||
menu.Append(GAME_OBJ_PNL_GROUP_CONDITION, wxT("Set conditions for tiles"));
|
||||
}
|
||||
if(data->isSprite){
|
||||
menu.Append(GAME_OBJ_PNL_HFLIP, wxT("Flip horizontally"));
|
||||
menu.Append(GAME_OBJ_PNL_VFLIP, wxT("Flip vertically"));
|
||||
|
|
@ -921,6 +943,7 @@ void hdnesPackEditormainForm::gameObjsRawRUp( wxMouseEvent& event ){
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
|
||||
string copyContent = "";
|
||||
gameObjNode* ndata;
|
||||
|
|
@ -930,6 +953,8 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
|
|||
int clickedY;
|
||||
hdnesPackEditorreplacementDialog* fp;
|
||||
vector<gameTile> selectedTiles;
|
||||
int offset;
|
||||
int uniqueTileID;
|
||||
|
||||
switch(event.GetId()){
|
||||
case GAME_OBJ_PNL_PASTE:
|
||||
|
|
@ -1074,12 +1099,11 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
|
|||
break;
|
||||
case GAME_OBJ_PNL_CONDITION:
|
||||
editCondition = true;
|
||||
conditionGameObjID = rightClickedgameObjID;
|
||||
conditionGameObjTileX = rightClickedGameObjTileX;
|
||||
conditionGameObjTileY = rightClickedGameObjTileY;
|
||||
gameObjconditionTiles.clear();
|
||||
gameObjconditionTiles.push_back(rightClickedgameObjID);
|
||||
//set condition tiles to selected tiles
|
||||
ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
t = ndata->tiles[conditionGameObjID];
|
||||
t = ndata->tiles[rightClickedgameObjID];
|
||||
gameObjSelectedTiles.clear();
|
||||
for(int k = 0; k < t.conditions.size(); ++k){
|
||||
for(int i = 0; i < ndata->tiles.size(); ++i){
|
||||
|
|
@ -1090,22 +1114,34 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
|
|||
}
|
||||
drawGameObjEdits();
|
||||
break;
|
||||
case GAME_OBJ_PNL_GROUP_CONDITION:
|
||||
editCondition = true;
|
||||
gameObjconditionTiles.clear();
|
||||
for(int k = 0; k < gameObjSelectedTiles.size(); ++k){
|
||||
gameObjconditionTiles.push_back(gameObjSelectedTiles[k]);
|
||||
}
|
||||
gameObjSelectedTiles.clear();
|
||||
drawGameObjEdits();
|
||||
break;
|
||||
case GAME_OBJ_PNL_CONFIRM_CONDITION:
|
||||
editCondition = false;
|
||||
ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
t = ndata->tiles[conditionGameObjID];
|
||||
t.conditions.clear();
|
||||
//add selected tiles to condition
|
||||
for(int k = 0; k < gameObjSelectedTiles.size(); ++k){
|
||||
c.id = ndata->tiles[gameObjSelectedTiles[k]].id;
|
||||
c.objCoordX = ndata->tiles[gameObjSelectedTiles[k]].objCoordX - t.objCoordX;
|
||||
c.objCoordY = ndata->tiles[gameObjSelectedTiles[k]].objCoordY - t.objCoordY;
|
||||
c.hFlip = (ndata->tiles[gameObjSelectedTiles[k]].hFlip != t.hFlip);
|
||||
c.vFlip = (ndata->tiles[gameObjSelectedTiles[k]].vFlip != t.vFlip);
|
||||
c.name = main::intToStr(conditionCounter++);
|
||||
t.conditions.push_back(c);
|
||||
for(int i = 0; i < gameObjconditionTiles.size(); ++i){
|
||||
t = ndata->tiles[gameObjconditionTiles[i]];
|
||||
t.conditions.clear();
|
||||
//add selected tiles to condition
|
||||
for(int k = 0; k < gameObjSelectedTiles.size(); ++k){
|
||||
c.id = ndata->tiles[gameObjSelectedTiles[k]].id;
|
||||
c.objCoordX = ndata->tiles[gameObjSelectedTiles[k]].objCoordX - t.objCoordX;
|
||||
c.objCoordY = ndata->tiles[gameObjSelectedTiles[k]].objCoordY - t.objCoordY;
|
||||
c.hFlip = (ndata->tiles[gameObjSelectedTiles[k]].hFlip != t.hFlip);
|
||||
c.vFlip = (ndata->tiles[gameObjSelectedTiles[k]].vFlip != t.vFlip);
|
||||
c.name = main::intToStr(conditionCounter++);
|
||||
t.conditions.push_back(c);
|
||||
}
|
||||
ndata->tiles[gameObjconditionTiles[i]] = t;
|
||||
}
|
||||
ndata->tiles[conditionGameObjID] = t;
|
||||
|
||||
gameObjSelectedTiles.clear();
|
||||
drawGameObjEdits();
|
||||
coreData::cData->dataChanged();
|
||||
|
|
@ -1127,9 +1163,10 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
|
|||
drawGameObjEdits();
|
||||
break;
|
||||
case GAME_OBJ_PNL_AUTO_CONDITION:
|
||||
findGameObjNotUniqueTile();
|
||||
ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
//find an unique tile
|
||||
int uniqueTileID = -1;
|
||||
uniqueTileID = -1;
|
||||
for(int i = 0; i < ndata->tiles.size(); ++i){
|
||||
if(ndata->tiles[i].isUnique){
|
||||
uniqueTileID = i;
|
||||
|
|
@ -1151,10 +1188,28 @@ 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();
|
||||
ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
for(int i = 0; i < ndata->tiles.size(); ++i){
|
||||
if(ndata->tiles[i].id.palette[0] == ndata->palettes[offset][0]
|
||||
&& ndata->tiles[i].id.palette[1] == ndata->palettes[offset][1]
|
||||
&& ndata->tiles[i].id.palette[2] == ndata->palettes[offset][2]
|
||||
&& ndata->tiles[i].id.palette[3] == ndata->palettes[offset][3]
|
||||
){
|
||||
gameObjSelectedTiles.push_back(i);
|
||||
}
|
||||
}
|
||||
drawGameObjEdits();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void hdnesPackEditormainForm::setReplacement(int imageID, int x, int y){
|
||||
gameObjNode* ndata;
|
||||
ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
|
|
@ -1434,15 +1489,17 @@ void hdnesPackEditormainForm::drawGameObjSelection(){
|
|||
main::drawRect(gameObjNewImage2, pt, tileBoxSize, wxColour(255, 255, 255));
|
||||
}
|
||||
if(editCondition){
|
||||
pt.x = (ndata->tiles[conditionGameObjID].objCoordX - ndata->x1) * gameObjZoom;
|
||||
pt.y = (ndata->tiles[conditionGameObjID].objCoordY - ndata->y1) * gameObjZoom;
|
||||
pt2 = pt;
|
||||
++(pt2.x);
|
||||
++(pt2.y);
|
||||
main::drawRect(gameObjRawImage2, pt2, tileBoxSize, wxColour(0, 100, 100));
|
||||
main::drawRect(gameObjRawImage2, pt, tileBoxSize, wxColour(0, 255, 255));
|
||||
main::drawRect(gameObjNewImage2, pt2, tileBoxSize, wxColour(0, 100, 100));
|
||||
main::drawRect(gameObjNewImage2, pt, tileBoxSize, wxColour(0, 255, 255));
|
||||
for(int i = 0; i < gameObjconditionTiles.size(); ++i){
|
||||
pt.x = (ndata->tiles[gameObjconditionTiles[i]].objCoordX - ndata->x1) * gameObjZoom;
|
||||
pt.y = (ndata->tiles[gameObjconditionTiles[i]].objCoordY - ndata->y1) * gameObjZoom;
|
||||
pt2 = pt;
|
||||
++(pt2.x);
|
||||
++(pt2.y);
|
||||
main::drawRect(gameObjRawImage2, pt2, tileBoxSize, wxColour(0, 100, 100));
|
||||
main::drawRect(gameObjRawImage2, pt, tileBoxSize, wxColour(0, 255, 255));
|
||||
main::drawRect(gameObjNewImage2, pt2, tileBoxSize, wxColour(0, 100, 100));
|
||||
main::drawRect(gameObjNewImage2, pt, tileBoxSize, wxColour(0, 255, 255));
|
||||
}
|
||||
}
|
||||
|
||||
gameObjRawPasteX = ndata->x1 * gameObjZoom + (pnlGameObjRaw->GetSize().GetWidth() / 2) - gameObjViewCentreX;
|
||||
|
|
@ -1961,11 +2018,9 @@ void hdnesPackEditormainForm::findGameObjNotUniqueTile(){
|
|||
for(int i = 0; i < ndata->tiles.size(); ++i){
|
||||
if(ndata->tiles[i].isUnique){
|
||||
for(int j = i + 1; j < ndata->tiles.size(); ++j){
|
||||
if(ndata->tiles[j].isUnique){
|
||||
if(ndata->tiles[j].id.compareEqual(ndata->tiles[i].id)){
|
||||
ndata->tiles[j].isUnique = false;
|
||||
ndata->tiles[i].isUnique = false;
|
||||
}
|
||||
if(ndata->tiles[j].id.compareEqual(ndata->tiles[i].id)){
|
||||
ndata->tiles[j].isUnique = false;
|
||||
ndata->tiles[i].isUnique = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
#define GAME_OBJ_PNL_CANCEL_CONDITION 10
|
||||
#define GAME_OBJ_PNL_SHOW_NOT_UNIQUE 11
|
||||
#define GAME_OBJ_PNL_AUTO_CONDITION 12
|
||||
#define GAME_OBJ_PNL_GROUP_CONDITION 13
|
||||
#define GAME_OBJ_PNL_PALETTE_SELECT_OFFSET 100
|
||||
|
||||
/**
|
||||
@file
|
||||
|
|
@ -211,6 +213,7 @@ class hdnesPackEditormainForm : public mainForm, public colourDialogClient
|
|||
Uint32 rightClickedgameObjID;
|
||||
int rightClickedGameObjTileX;
|
||||
int rightClickedGameObjTileY;
|
||||
vector<Uint32> gameObjconditionTiles;
|
||||
Uint32 conditionGameObjID;
|
||||
int conditionGameObjTileX;
|
||||
int conditionGameObjTileY;
|
||||
|
|
|
|||
Loading…
Reference in a new issue