mirror of
https://github.com/mkwong98/HDNes.git
synced 2024-05-20 13:07:54 -04:00
This commit is contained in:
mkwong98
parent
e4f09ad93d
commit
b5a407c715
|
|
@ -11,6 +11,7 @@ gameTile::gameTile()
|
|||
x = 0;
|
||||
y = 0;
|
||||
brightness = 0;
|
||||
markForDelete = false;
|
||||
}
|
||||
|
||||
gameTile::~gameTile()
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ class gameTile
|
|||
bool hFlip;
|
||||
bool vFlip;
|
||||
bool markForDelete;
|
||||
bool isUnique;
|
||||
|
||||
bool hasReplacement;
|
||||
bool isDefault;
|
||||
|
|
|
|||
|
|
@ -2135,7 +2135,7 @@
|
|||
"begin_code.h"
|
||||
"close_code.h"
|
||||
|
||||
1519100448 source:c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.cpp
|
||||
1519122997 source:c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.cpp
|
||||
"hdnesPackEditormainForm.h"
|
||||
"hdnesPackEditornewProjectDialog.h"
|
||||
"hdnesPackEditorcolourSelectDialog.h"
|
||||
|
|
@ -2148,7 +2148,7 @@
|
|||
"gameObjNode.h"
|
||||
"image.h"
|
||||
|
||||
1519100186 c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.h
|
||||
1519142383 c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditormainform.h
|
||||
"common.h"
|
||||
"mainForm.h"
|
||||
"colourDialogClient.h"
|
||||
|
|
@ -3821,13 +3821,13 @@
|
|||
"gameTile.h"
|
||||
<wx/treebase.h>
|
||||
|
||||
1519096893 source:c:\work\hdnesr\trunk\hdnespackeditor\gametile.cpp
|
||||
1519112925 source:c:\work\hdnesr\trunk\hdnespackeditor\gametile.cpp
|
||||
"common.h"
|
||||
"coreData.h"
|
||||
"gameTile.h"
|
||||
"main.h"
|
||||
|
||||
1519019155 c:\work\hdnesr\trunk\hdnespackeditor\gametile.h
|
||||
1519131296 c:\work\hdnesr\trunk\hdnespackeditor\gametile.h
|
||||
"common.h"
|
||||
"classList.h"
|
||||
"condition.h"
|
||||
|
|
@ -3887,7 +3887,7 @@
|
|||
"coreData.h"
|
||||
"main.h"
|
||||
|
||||
1517543293 source:c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditorreplacementdialog.cpp
|
||||
1519130717 source:c:\work\hdnesr\trunk\hdnespackeditor\hdnespackeditorreplacementdialog.cpp
|
||||
"hdnesPackEditorreplacementDialog.h"
|
||||
"hdnesPackEditormainForm.h"
|
||||
"coreData.h"
|
||||
|
|
|
|||
|
|
@ -2,24 +2,9 @@
|
|||
<CodeBlocks_layout_file>
|
||||
<FileVersion major="1" minor="0" />
|
||||
<ActiveTarget name="Debug" />
|
||||
<File name="classList.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="hdnesPackEditormainForm.h" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="174" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="condition.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="448" topLine="15" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameTile.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="3492" topLine="109" />
|
||||
</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" />
|
||||
<Cursor1 position="7993" topLine="207" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="common.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
|
|
@ -27,14 +12,58 @@
|
|||
<Cursor1 position="226" 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">
|
||||
<File name="gameObjNode.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="996" topLine="21" />
|
||||
<Cursor1 position="2031" topLine="65" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameTile.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="coreData.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="724" topLine="17" />
|
||||
<Cursor1 position="9636" topLine="32" />
|
||||
</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="classList.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="174" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="image.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="158" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="image.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
|
|
@ -42,9 +71,14 @@
|
|||
<Cursor1 position="249" topLine="1" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameObjNode.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="condition.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="2870" topLine="90" />
|
||||
<Cursor1 position="2527" topLine="68" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="tileReference.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="397" topLine="4" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
|
|
@ -52,39 +86,54 @@
|
|||
<Cursor1 position="229" topLine="7" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorreplacementDialog.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
|
||||
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="608" topLine="54" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="35" />
|
||||
<Collapse line="43" />
|
||||
<Collapse line="47" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="hdnesPackEditormainForm.h" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="8016" topLine="198" />
|
||||
<Cursor1 position="3777" topLine="97" />
|
||||
</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="main.h" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="338" topLine="12" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainForm.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="mainForm.h" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="11939" topLine="283" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="tileReference.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="548" topLine="39" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="condition.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="444" topLine="9" />
|
||||
</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="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="gameObjNode.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1160" topLine="33" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameTile.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="239" topLine="111" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameTile.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="706" topLine="18" />
|
||||
</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="67807" topLine="385" />
|
||||
<Cursor1 position="70206" topLine="468" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="15" />
|
||||
|
|
@ -111,19 +160,13 @@
|
|||
<Collapse line="125" />
|
||||
<Collapse line="130" />
|
||||
<Collapse line="134" />
|
||||
<Collapse line="139" />
|
||||
<Collapse line="143" />
|
||||
<Collapse line="147" />
|
||||
<Collapse line="148" />
|
||||
<Collapse line="179" />
|
||||
<Collapse line="180" />
|
||||
<Collapse line="188" />
|
||||
<Collapse line="198" />
|
||||
<Collapse line="199" />
|
||||
<Collapse line="203" />
|
||||
<Collapse line="207" />
|
||||
<Collapse line="208" />
|
||||
<Collapse line="211" />
|
||||
<Collapse line="216" />
|
||||
<Collapse line="224" />
|
||||
<Collapse line="233" />
|
||||
<Collapse line="238" />
|
||||
|
|
@ -204,6 +247,8 @@
|
|||
<Collapse line="639" />
|
||||
<Collapse line="646" />
|
||||
<Collapse line="667" />
|
||||
<Collapse line="682" />
|
||||
<Collapse line="683" />
|
||||
<Collapse line="690" />
|
||||
<Collapse line="693" />
|
||||
<Collapse line="703" />
|
||||
|
|
@ -237,6 +282,8 @@
|
|||
<Collapse line="886" />
|
||||
<Collapse line="891" />
|
||||
<Collapse line="896" />
|
||||
<Collapse line="907" />
|
||||
<Collapse line="917" />
|
||||
<Collapse line="919" />
|
||||
<Collapse line="929" />
|
||||
<Collapse line="931" />
|
||||
|
|
@ -244,162 +291,177 @@
|
|||
<Collapse line="935" />
|
||||
<Collapse line="941" />
|
||||
<Collapse line="945" />
|
||||
<Collapse line="958" />
|
||||
<Collapse line="974" />
|
||||
<Collapse line="975" />
|
||||
<Collapse line="978" />
|
||||
<Collapse line="981" />
|
||||
<Collapse line="959" />
|
||||
<Collapse line="963" />
|
||||
<Collapse line="979" />
|
||||
<Collapse line="980" />
|
||||
<Collapse line="983" />
|
||||
<Collapse line="997" />
|
||||
<Collapse line="1005" />
|
||||
<Collapse line="1010" />
|
||||
<Collapse line="1011" />
|
||||
<Collapse line="986" />
|
||||
<Collapse line="988" />
|
||||
<Collapse line="1002" />
|
||||
<Collapse line="1009" />
|
||||
<Collapse line="1014" />
|
||||
<Collapse line="1025" />
|
||||
<Collapse line="1034" />
|
||||
<Collapse line="1045" />
|
||||
<Collapse line="1118" />
|
||||
<Collapse line="1121" />
|
||||
<Collapse line="1124" />
|
||||
<Collapse line="1015" />
|
||||
<Collapse line="1018" />
|
||||
<Collapse line="1029" />
|
||||
<Collapse line="1038" />
|
||||
<Collapse line="1049" />
|
||||
<Collapse line="1066" />
|
||||
<Collapse line="1067" />
|
||||
<Collapse line="1068" />
|
||||
<Collapse line="1081" />
|
||||
<Collapse line="1103" />
|
||||
<Collapse line="1109" />
|
||||
<Collapse line="1123" />
|
||||
<Collapse line="1126" />
|
||||
<Collapse line="1135" />
|
||||
<Collapse line="1145" />
|
||||
<Collapse line="1148" />
|
||||
<Collapse line="1161" />
|
||||
<Collapse line="1171" />
|
||||
<Collapse line="1187" />
|
||||
<Collapse line="1194" />
|
||||
<Collapse line="1199" />
|
||||
<Collapse line="1206" />
|
||||
<Collapse line="1215" />
|
||||
<Collapse line="1219" />
|
||||
<Collapse line="1222" />
|
||||
<Collapse line="1224" />
|
||||
<Collapse line="1225" />
|
||||
<Collapse line="1228" />
|
||||
<Collapse line="1231" />
|
||||
<Collapse line="1237" />
|
||||
<Collapse line="1245" />
|
||||
<Collapse line="1246" />
|
||||
<Collapse line="1249" />
|
||||
<Collapse line="1255" />
|
||||
<Collapse line="1273" />
|
||||
<Collapse line="1282" />
|
||||
<Collapse line="1285" />
|
||||
<Collapse line="1292" />
|
||||
<Collapse line="1309" />
|
||||
<Collapse line="1324" />
|
||||
<Collapse line="1335" />
|
||||
<Collapse line="1344" />
|
||||
<Collapse line="1358" />
|
||||
<Collapse line="1392" />
|
||||
<Collapse line="1398" />
|
||||
<Collapse line="1421" />
|
||||
<Collapse line="1427" />
|
||||
<Collapse line="1434" />
|
||||
<Collapse line="1442" />
|
||||
<Collapse line="1450" />
|
||||
<Collapse line="1451" />
|
||||
<Collapse line="1129" />
|
||||
<Collapse line="1131" />
|
||||
<Collapse line="1166" />
|
||||
<Collapse line="1354" />
|
||||
<Collapse line="1435" />
|
||||
<Collapse line="1448" />
|
||||
<Collapse line="1456" />
|
||||
<Collapse line="1457" />
|
||||
<Collapse line="1459" />
|
||||
<Collapse line="1462" />
|
||||
<Collapse line="1469" />
|
||||
<Collapse line="1488" />
|
||||
<Collapse line="1490" />
|
||||
<Collapse line="1500" />
|
||||
<Collapse line="1464" />
|
||||
<Collapse line="1465" />
|
||||
<Collapse line="1470" />
|
||||
<Collapse line="1471" />
|
||||
<Collapse line="1473" />
|
||||
<Collapse line="1476" />
|
||||
<Collapse line="1483" />
|
||||
<Collapse line="1495" />
|
||||
<Collapse line="1496" />
|
||||
<Collapse line="1502" />
|
||||
<Collapse line="1503" />
|
||||
<Collapse line="1504" />
|
||||
<Collapse line="1514" />
|
||||
<Collapse line="1519" />
|
||||
<Collapse line="1523" />
|
||||
<Collapse line="1524" />
|
||||
<Collapse line="1529" />
|
||||
<Collapse line="1540" />
|
||||
<Collapse line="1541" />
|
||||
<Collapse line="1551" />
|
||||
<Collapse line="1552" />
|
||||
<Collapse line="1558" />
|
||||
<Collapse line="1559" />
|
||||
<Collapse line="1516" />
|
||||
<Collapse line="1517" />
|
||||
<Collapse line="1528" />
|
||||
<Collapse line="1533" />
|
||||
<Collapse line="1537" />
|
||||
<Collapse line="1538" />
|
||||
<Collapse line="1543" />
|
||||
<Collapse line="1554" />
|
||||
<Collapse line="1555" />
|
||||
<Collapse line="1565" />
|
||||
<Collapse line="1568" />
|
||||
<Collapse line="1576" />
|
||||
<Collapse line="1566" />
|
||||
<Collapse line="1572" />
|
||||
<Collapse line="1573" />
|
||||
<Collapse line="1579" />
|
||||
<Collapse line="1582" />
|
||||
<Collapse line="1587" />
|
||||
<Collapse line="1590" />
|
||||
<Collapse line="1594" />
|
||||
<Collapse line="1599" />
|
||||
<Collapse line="1602" />
|
||||
<Collapse line="1607" />
|
||||
<Collapse line="1610" />
|
||||
<Collapse line="1702" />
|
||||
<Collapse line="1593" />
|
||||
<Collapse line="1596" />
|
||||
<Collapse line="1601" />
|
||||
<Collapse line="1604" />
|
||||
<Collapse line="1608" />
|
||||
<Collapse line="1613" />
|
||||
<Collapse line="1616" />
|
||||
<Collapse line="1621" />
|
||||
<Collapse line="1624" />
|
||||
<Collapse line="1630" />
|
||||
<Collapse line="1634" />
|
||||
<Collapse line="1639" />
|
||||
<Collapse line="1642" />
|
||||
<Collapse line="1648" />
|
||||
<Collapse line="1653" />
|
||||
<Collapse line="1656" />
|
||||
<Collapse line="1662" />
|
||||
<Collapse line="1664" />
|
||||
<Collapse line="1665" />
|
||||
<Collapse line="1672" />
|
||||
<Collapse line="1676" />
|
||||
<Collapse line="1679" />
|
||||
<Collapse line="1685" />
|
||||
<Collapse line="1687" />
|
||||
<Collapse line="1688" />
|
||||
<Collapse line="1689" />
|
||||
<Collapse line="1692" />
|
||||
<Collapse line="1700" />
|
||||
<Collapse line="1704" />
|
||||
<Collapse line="1707" />
|
||||
<Collapse line="1713" />
|
||||
<Collapse line="1715" />
|
||||
<Collapse line="1730" />
|
||||
<Collapse line="1716" />
|
||||
<Collapse line="1724" />
|
||||
<Collapse line="1728" />
|
||||
<Collapse line="1731" />
|
||||
<Collapse line="1749" />
|
||||
<Collapse line="1770" />
|
||||
<Collapse line="1778" />
|
||||
<Collapse line="1780" />
|
||||
<Collapse line="1782" />
|
||||
<Collapse line="1790" />
|
||||
<Collapse line="1796" />
|
||||
<Collapse line="1797" />
|
||||
<Collapse line="1802" />
|
||||
<Collapse line="1805" />
|
||||
<Collapse line="1807" />
|
||||
<Collapse line="1808" />
|
||||
<Collapse line="1809" />
|
||||
<Collapse line="1812" />
|
||||
<Collapse line="1814" />
|
||||
<Collapse line="1832" />
|
||||
<Collapse line="1836" />
|
||||
<Collapse line="1839" />
|
||||
<Collapse line="1747" />
|
||||
<Collapse line="1760" />
|
||||
<Collapse line="1775" />
|
||||
<Collapse line="1776" />
|
||||
<Collapse line="1794" />
|
||||
<Collapse line="1815" />
|
||||
<Collapse line="1823" />
|
||||
<Collapse line="1825" />
|
||||
<Collapse line="1827" />
|
||||
<Collapse line="1835" />
|
||||
<Collapse line="1841" />
|
||||
<Collapse line="1842" />
|
||||
<Collapse line="1847" />
|
||||
<Collapse line="1850" />
|
||||
<Collapse line="1852" />
|
||||
<Collapse line="1853" />
|
||||
<Collapse line="1854" />
|
||||
<Collapse line="1870" />
|
||||
<Collapse line="1875" />
|
||||
<Collapse line="1876" />
|
||||
<Collapse line="1879" />
|
||||
<Collapse line="1892" />
|
||||
<Collapse line="1904" />
|
||||
<Collapse line="1905" />
|
||||
<Collapse line="1907" />
|
||||
<Collapse line="1914" />
|
||||
<Collapse line="1857" />
|
||||
<Collapse line="1859" />
|
||||
<Collapse line="1877" />
|
||||
<Collapse line="1881" />
|
||||
<Collapse line="1884" />
|
||||
<Collapse line="1886" />
|
||||
<Collapse line="1897" />
|
||||
<Collapse line="1898" />
|
||||
<Collapse line="1899" />
|
||||
<Collapse line="1915" />
|
||||
<Collapse line="1920" />
|
||||
<Collapse line="1921" />
|
||||
<Collapse line="1922" />
|
||||
<Collapse line="1932" />
|
||||
<Collapse line="1924" />
|
||||
<Collapse line="1937" />
|
||||
<Collapse line="1938" />
|
||||
<Collapse line="1946" />
|
||||
<Collapse line="1954" />
|
||||
<Collapse line="1957" />
|
||||
<Collapse line="1949" />
|
||||
<Collapse line="1950" />
|
||||
<Collapse line="1952" />
|
||||
<Collapse line="1959" />
|
||||
<Collapse line="1960" />
|
||||
<Collapse line="1970" />
|
||||
<Collapse line="1976" />
|
||||
<Collapse line="1994" />
|
||||
<Collapse line="1996" />
|
||||
<Collapse line="1997" />
|
||||
<Collapse line="2003" />
|
||||
<Collapse line="1966" />
|
||||
<Collapse line="1967" />
|
||||
<Collapse line="1977" />
|
||||
<Collapse line="1982" />
|
||||
<Collapse line="1983" />
|
||||
<Collapse line="1991" />
|
||||
<Collapse line="1999" />
|
||||
<Collapse line="2002" />
|
||||
<Collapse line="2004" />
|
||||
<Collapse line="2014" />
|
||||
<Collapse line="2018" />
|
||||
<Collapse line="2027" />
|
||||
<Collapse line="2028" />
|
||||
<Collapse line="2005" />
|
||||
<Collapse line="2015" />
|
||||
<Collapse line="2021" />
|
||||
<Collapse line="2039" />
|
||||
<Collapse line="2041" />
|
||||
<Collapse line="2042" />
|
||||
<Collapse line="2048" />
|
||||
<Collapse line="2049" />
|
||||
<Collapse line="2059" />
|
||||
<Collapse line="2063" />
|
||||
<Collapse line="2070" />
|
||||
<Collapse line="2071" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="mainForm.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="hdnesPackEditorreplacementDialog.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="34741" topLine="537" />
|
||||
<Cursor1 position="608" topLine="54" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="35" />
|
||||
<Collapse line="43" />
|
||||
<Collapse line="47" />
|
||||
</Folding>
|
||||
</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="tileReference.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<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="397" topLine="4" />
|
||||
<Cursor1 position="1177" topLine="27" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="main.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
|
|
@ -407,70 +469,19 @@
|
|||
<Cursor1 position="473" topLine="6" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="condition.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="2230" topLine="55" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="coreData.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="10996" topLine="289" />
|
||||
</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="79" />
|
||||
<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="hdnesPackEditorcolourSelectDialog.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="3777" topLine="97" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="coreData.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1106" topLine="42" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="image.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="main.h" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="158" topLine="0" />
|
||||
<Cursor1 position="338" topLine="12" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="tileReference.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="mainForm.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="548" topLine="11" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameObjNode.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1160" topLine="33" />
|
||||
</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" />
|
||||
<Cursor1 position="34741" topLine="537" />
|
||||
</Cursor>
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
|
|
|
|||
|
|
@ -871,6 +871,8 @@ void hdnesPackEditormainForm::gameObjsRawRUp( wxMouseEvent& event ){
|
|||
menu.Append(GAME_OBJ_PNL_PASTE, wxT("Paste"));
|
||||
}
|
||||
}
|
||||
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"));
|
||||
//check right click on a selected tile
|
||||
bool tileFound = false;
|
||||
for(Uint32 k = 0; k < gameObjSelectedTiles.size(); ++k){
|
||||
|
|
@ -956,6 +958,11 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
|
|||
break;
|
||||
case GAME_OBJ_PNL_CONFIRM_PASTE:
|
||||
ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
//set bg colour this is the first tiles to be added
|
||||
if(ndata->tiles.size() == 0){
|
||||
ndata->bgColour = gameObjPasteData.tiles[0].id.palette[0];
|
||||
|
||||
}
|
||||
for(int i = 0; i < gameObjPasteData.tiles.size(); ++i){
|
||||
gameObjPasteData.tiles[i].objCoordX += gameObjRawCurrPos.x;
|
||||
gameObjPasteData.tiles[i].objCoordY += gameObjRawCurrPos.y;
|
||||
|
|
@ -1002,7 +1009,6 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
|
|||
break;
|
||||
case GAME_OBJ_PNL_DELETE:
|
||||
ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
|
||||
for(int k = 0; k < gameObjSelectedTiles.size(); ++k){
|
||||
ndata->tiles[gameObjSelectedTiles[k]].markForDelete = true;
|
||||
}
|
||||
|
|
@ -1094,6 +1100,43 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
|
|||
gameObjSelectedTiles.clear();
|
||||
drawGameObjEdits();
|
||||
break;
|
||||
case GAME_OBJ_PNL_SHOW_NOT_UNIQUE:
|
||||
gameObjSelectedTiles.clear();
|
||||
findGameObjNotUniqueTile();
|
||||
ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
for(int i = 0; i < ndata->tiles.size(); ++i){
|
||||
if(ndata->tiles[i].conditions.size() == 0 && !ndata->tiles[i].isUnique){
|
||||
gameObjSelectedTiles.push_back(i);
|
||||
}
|
||||
}
|
||||
drawGameObjEdits();
|
||||
break;
|
||||
case GAME_OBJ_PNL_AUTO_CONDITION:
|
||||
ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
//find an unique tile
|
||||
int uniqueTileID = -1;
|
||||
for(int i = 0; i < ndata->tiles.size(); ++i){
|
||||
if(ndata->tiles[i].isUnique){
|
||||
uniqueTileID = i;
|
||||
}
|
||||
}
|
||||
if(uniqueTileID != -1){
|
||||
t = ndata->tiles[uniqueTileID];
|
||||
for(int i = 0; i < ndata->tiles.size(); ++i){
|
||||
if(ndata->tiles[i].conditions.size() == 0 && !ndata->tiles[i].isUnique){
|
||||
c.id = t.id;
|
||||
c.objCoordX = t.objCoordX - ndata->tiles[i].objCoordX;
|
||||
c.objCoordY = t.objCoordY - ndata->tiles[i].objCoordY;
|
||||
c.hFlip = (ndata->tiles[i].hFlip != t.hFlip);
|
||||
c.vFlip = (ndata->tiles[i].vFlip != t.vFlip);
|
||||
c.name = main::intToStr(conditionCounter++);
|
||||
ndata->tiles[i].conditions.push_back(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
coreData::cData->dataChanged();
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1168,6 +1211,10 @@ void hdnesPackEditormainForm::clearGameObj(){
|
|||
objDC->SetBackground(*wxBLACK_BRUSH);
|
||||
objDC->Clear();
|
||||
delete objDC;
|
||||
objDC = new wxClientDC(pnlGameObjNew);
|
||||
objDC->SetBackground(*wxBLACK_BRUSH);
|
||||
objDC->Clear();
|
||||
delete objDC;
|
||||
}
|
||||
|
||||
void hdnesPackEditormainForm::drawGameObj(){
|
||||
|
|
@ -1177,7 +1224,6 @@ void hdnesPackEditormainForm::drawGameObj(){
|
|||
//clear image with blank colour
|
||||
gameObjRawImage.SetRGB(wxRect(gameObjRawImage.GetSize()), gameObjBlankColour.Red(), gameObjBlankColour.Green(), gameObjBlankColour.Blue());
|
||||
gameObjNewImage.SetRGB(wxRect(gameObjNewImage.GetSize()), gameObjBlankColour.Red(), gameObjBlankColour.Green(), gameObjBlankColour.Blue());
|
||||
|
||||
Uint32 memAddress;
|
||||
Uint16 drawX;
|
||||
Uint16 drawY;
|
||||
|
|
@ -1211,12 +1257,14 @@ void hdnesPackEditormainForm::drawGameObj(){
|
|||
coreData::cData->palette[ndata->tiles[i].id.palette[2]],
|
||||
coreData::cData->palette[ndata->tiles[i].id.palette[3]]);
|
||||
}
|
||||
gameObjBaseTile.ConvertAlphaToMask(255);
|
||||
gameObjBaseTile.ConvertAlphaToMask(64);
|
||||
gameObjRawImage.Paste(gameObjBaseTile, drawX, drawY);
|
||||
|
||||
if(ndata->tiles[i].hasReplacement){
|
||||
gameObjBaseTileNew = coreData::cData->images[ndata->tiles[i].img]->imageData.GetSubImage(wxRect(ndata->tiles[i].x, ndata->tiles[i].y, replaceSize, replaceSize));
|
||||
gameObjBaseTileNew.ConvertAlphaToMask(64);
|
||||
gameObjNewImage.Paste(gameObjBaseTileNew, drawX * coreData::cData->scale, drawY * coreData::cData->scale);
|
||||
gameObjNewImage.ConvertAlphaToMask(64);
|
||||
gameObjNewImage.SetMask(false);
|
||||
}
|
||||
else{
|
||||
//look for replacement tiles
|
||||
|
|
@ -1239,7 +1287,11 @@ void hdnesPackEditormainForm::drawGameObj(){
|
|||
if(!hasHD){
|
||||
gameObjBaseTileNew = gameObjBaseTile.Scale(replaceSize, replaceSize);
|
||||
}
|
||||
gameObjBaseTileNew.ConvertAlphaToMask(64);
|
||||
gameObjNewImage.Paste(gameObjBaseTileNew, drawX * coreData::cData->scale, drawY * coreData::cData->scale);
|
||||
gameObjNewImage.ConvertAlphaToMask(64);
|
||||
gameObjNewImage.SetMask(false);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1342,6 +1394,8 @@ void hdnesPackEditormainForm::drawGameObjSelection(){
|
|||
++(pt2.y);
|
||||
main::drawRect(gameObjRawImage2, pt2, tileBoxSize, wxColour(0, 0, 0));
|
||||
main::drawRect(gameObjRawImage2, pt, tileBoxSize, wxColour(255, 255, 255));
|
||||
main::drawRect(gameObjNewImage2, pt2, tileBoxSize, wxColour(0, 0, 0));
|
||||
main::drawRect(gameObjNewImage2, pt, tileBoxSize, wxColour(255, 255, 255));
|
||||
}
|
||||
if(editCondition){
|
||||
pt.x = (ndata->tiles[conditionGameObjID].objCoordX - ndata->x1) * gameObjZoom;
|
||||
|
|
@ -1351,6 +1405,8 @@ void hdnesPackEditormainForm::drawGameObjSelection(){
|
|||
++(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;
|
||||
|
|
@ -1725,13 +1781,35 @@ void hdnesPackEditormainForm::genChildGameObjsTilePack(fstream& file, wxTreeItem
|
|||
void hdnesPackEditormainForm::genGameObjItemTilePack(fstream& file, wxTreeItemId item, bool withCondition){
|
||||
gameObjNode* node = (gameObjNode*)(treeGameObjs->GetItemData(item));
|
||||
for(int i = 0; i < node->tiles.size(); ++i){
|
||||
if(withCondition == (node->tiles[i].conditions.size() > 0)){
|
||||
if(node->tiles[i].hasReplacement && (withCondition == (node->tiles[i].conditions.size() > 0))){
|
||||
file << node->tiles[i].writeConditionNames() << "<tile>" << node->tiles[i].writeLine() << "\n";
|
||||
}
|
||||
}
|
||||
genChildGameObjsTilePack(file, item, withCondition);
|
||||
}
|
||||
|
||||
void hdnesPackEditormainForm::findGameObjNotUniqueTile(){
|
||||
gameObjNode* ndata = (gameObjNode*)(treeGameObjs->GetItemData(tItmGameObjMenu));
|
||||
for(int i = 0; i < ndata->tiles.size(); ++i){
|
||||
ndata->tiles[i].isUnique = true;
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void hdnesPackEditormainForm::addGameObjNotUniqueTileCondition(){
|
||||
}
|
||||
|
||||
void hdnesPackEditormainForm::initHDImg(){
|
||||
lstHDImg->AppendColumn(wxString("Name"));
|
||||
lstHDImg->AppendColumn(wxString("Width"));
|
||||
|
|
@ -1777,7 +1855,10 @@ void hdnesPackEditormainForm::showHDImgImage(){
|
|||
wxImage displayImg;
|
||||
displayImg = wxImage(pnlHDImg->GetSize(), true);
|
||||
displayImg.SetRGB(displayImg.GetSize(), 128, 0, 128);
|
||||
scaledImg.ConvertAlphaToMask(64);
|
||||
displayImg.Paste(scaledImg, (pnlHDImg->GetSize().x - scaledImg.GetWidth()) / 2, (pnlHDImg->GetSize().y - scaledImg.GetHeight()) / 2);
|
||||
displayImg.ConvertAlphaToMask(64);
|
||||
displayImg.SetMask(false);
|
||||
|
||||
if(hdImgClicked){
|
||||
wxPoint p1;
|
||||
|
|
@ -2021,7 +2102,7 @@ void hdnesPackEditormainForm::HDImgAdd( wxCommandEvent& event ){
|
|||
string imgName;
|
||||
|
||||
fullPath = openFileDialog.GetPath().ToStdString();
|
||||
imgPath = fullPath.substr(0, fullPath.find_last_of("/\\") - 1);
|
||||
imgPath = fullPath.substr(0, fullPath.find_last_of("/\\"));
|
||||
imgName = fullPath.substr(fullPath.find_last_of("/\\") + 1);
|
||||
|
||||
if(coreData::cData){
|
||||
|
|
@ -2053,8 +2134,6 @@ void hdnesPackEditormainForm::HDImgAdd( wxCommandEvent& event ){
|
|||
}
|
||||
coreData::cData->dataChanged();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
void hdnesPackEditormainForm::HDImgRemove( wxCommandEvent& event ){
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@
|
|||
#define GAME_OBJ_PNL_CONDITION 8
|
||||
#define GAME_OBJ_PNL_CONFIRM_CONDITION 9
|
||||
#define GAME_OBJ_PNL_CANCEL_CONDITION 10
|
||||
|
||||
#define GAME_OBJ_PNL_SHOW_NOT_UNIQUE 11
|
||||
#define GAME_OBJ_PNL_AUTO_CONDITION 12
|
||||
|
||||
/**
|
||||
@file
|
||||
|
|
@ -240,6 +241,9 @@ class hdnesPackEditormainForm : public mainForm, public colourDialogClient
|
|||
void drawGameObjSelection();
|
||||
void showGameObj(wxImage& displayImg, wxImage& displayImg2, int x, int y);
|
||||
void setReplacement(int imageID, int x, int y);
|
||||
void findGameObjNotUniqueTile();
|
||||
void addGameObjNotUniqueTileCondition();
|
||||
|
||||
|
||||
//--end game objs session
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,10 @@ void hdnesPackEditorreplacementDialog::showImage(){
|
|||
wxImage displayImg;
|
||||
displayImg = wxImage(pnlImage->GetSize(), true);
|
||||
displayImg.SetRGB(displayImg.GetSize(), 128, 0, 128);
|
||||
scaledImg.ConvertAlphaToMask(64);
|
||||
displayImg.Paste(scaledImg, imgOffsetX, imgOffsetY);
|
||||
displayImg.ConvertAlphaToMask(64);
|
||||
displayImg.SetMask(false);
|
||||
|
||||
wxPoint pt;
|
||||
wxPoint pt2;
|
||||
|
|
|
|||
Loading…
Reference in a new issue