mirror of
https://github.com/mkwong98/HDNes.git
synced 2024-05-20 13:07:54 -04:00
Fix generating conditions for sprites
This commit is contained in:
mkwong98
parent
8eebce4eff
commit
4143c9bb51
|
|
@ -162,6 +162,9 @@ void condition::readLine(string s){
|
|||
string condition::writeLine(){
|
||||
stringstream stream;
|
||||
if(getType() == 1){
|
||||
if(conditionType == "spriteNearby"){
|
||||
id.palette[0] = 0xff;
|
||||
}
|
||||
stream << objCoordX << "," << objCoordY << "," << id.writeID(coreData::cData->verNo >= 103) << "," << id.writePalette();
|
||||
}
|
||||
else if(getType() == 2){
|
||||
|
|
|
|||
|
|
@ -7572,7 +7572,7 @@
|
|||
"wx/gdicmn.h"
|
||||
"wx/dialog.h"
|
||||
|
||||
1562378178 source:d:\work\hdnes\trunk\hdnespackeditor\hdnespackeditormainform.cpp
|
||||
1564551747 source:d:\work\hdnes\trunk\hdnespackeditor\hdnespackeditormainform.cpp
|
||||
"hdnesPackEditormainForm.h"
|
||||
"hdnesPackEditornewProjectDialog.h"
|
||||
"hdnesPackEditorcolourSelectDialog.h"
|
||||
|
|
|
|||
|
|
@ -2,42 +2,22 @@
|
|||
<CodeBlocks_layout_file>
|
||||
<FileVersion major="1" minor="0" />
|
||||
<ActiveTarget name="Debug" />
|
||||
<File name="gameObjNode.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<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="721" topLine="10" />
|
||||
<Cursor1 position="177" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditornewProjectDialog.cpp" open="0" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<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="742" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameTile.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="6053" topLine="10" />
|
||||
<Cursor1 position="10359" topLine="256" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="7" />
|
||||
<Collapse line="22" />
|
||||
<Collapse line="26" />
|
||||
<Collapse line="56" />
|
||||
<Collapse line="65" />
|
||||
<Collapse line="135" />
|
||||
<Collapse line="32" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="image.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="classList.h" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="359" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="main.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="380" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainForm.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="7723" topLine="221" />
|
||||
<Cursor1 position="256" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorreplacementDialog.cpp" open="0" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
|
||||
|
|
@ -49,62 +29,74 @@
|
|||
<Collapse line="47" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="colourDialogClient.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="235" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="common.h" open="0" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="171" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="coreData.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="776" topLine="28" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorreplacementDialog.h" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1177" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="condition.cpp" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="5395" topLine="147" />
|
||||
</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="colourDialogClient.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="235" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="condition.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="gameTile.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="804" topLine="31" />
|
||||
</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="hdnesPackEditorcolourSelectDialog.h" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="382" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="main.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="380" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="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="condition.cpp" open="0" top="0" tabpos="2" 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="5196" topLine="143" />
|
||||
<Cursor1 position="359" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="condition.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="312" topLine="0" />
|
||||
<Cursor1 position="229" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameObjNode.cpp" open="0" top="0" tabpos="25" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="hdnesPackEditormainForm.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="3162" topLine="106" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameTile.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="804" topLine="0" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="8" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="classList.h" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="256" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditormainForm.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="51174" topLine="376" />
|
||||
<Cursor1 position="91692" topLine="542" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="16" />
|
||||
|
|
@ -226,11 +218,8 @@
|
|||
<Collapse line="2194" />
|
||||
<Collapse line="2208" />
|
||||
<Collapse line="2215" />
|
||||
<Collapse line="2224" />
|
||||
<Collapse line="2256" />
|
||||
<Collapse line="2260" />
|
||||
<Collapse line="2269" />
|
||||
<Collapse line="2302" />
|
||||
<Collapse line="2420" />
|
||||
<Collapse line="2437" />
|
||||
<Collapse line="2440" />
|
||||
|
|
@ -249,7 +238,6 @@
|
|||
<Collapse line="2611" />
|
||||
<Collapse line="2622" />
|
||||
<Collapse line="2647" />
|
||||
<Collapse line="2652" />
|
||||
<Collapse line="2681" />
|
||||
<Collapse line="2685" />
|
||||
<Collapse line="2696" />
|
||||
|
|
@ -278,9 +266,36 @@
|
|||
<Collapse line="3161" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="tileReference.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="mainForm.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="412" topLine="0" />
|
||||
<Cursor1 position="7723" topLine="221" />
|
||||
</Cursor>
|
||||
</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="13" />
|
||||
</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="paletteSwap.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="293" topLine="0" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="6" />
|
||||
</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="1246" topLine="29" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorcolourSelectDialog.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
|
|
@ -290,73 +305,57 @@
|
|||
</File>
|
||||
<File name="main.cpp" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1118" topLine="32" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="tileReference.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="893" topLine="34" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="paletteSwap.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="279" topLine="0" />
|
||||
<Cursor1 position="1118" topLine="2" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="4" />
|
||||
<Collapse line="11" />
|
||||
<Collapse line="15" />
|
||||
<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="hdnesPackEditormainForm.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="hdnesPackEditornewProjectDialog.cpp" open="0" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="6475" topLine="150" />
|
||||
<Cursor1 position="742" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="coreData.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<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="13427" topLine="65" />
|
||||
<Cursor1 position="771" topLine="41" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="21" />
|
||||
</Folding>
|
||||
</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="coreData.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="13620" topLine="417" />
|
||||
</Cursor>
|
||||
<Folding>
|
||||
<Collapse line="11" />
|
||||
<Collapse line="22" />
|
||||
<Collapse line="24" />
|
||||
<Collapse line="28" />
|
||||
<Collapse line="32" />
|
||||
<Collapse line="38" />
|
||||
<Collapse line="53" />
|
||||
<Collapse line="81" />
|
||||
<Collapse line="198" />
|
||||
<Collapse line="238" />
|
||||
<Collapse line="258" />
|
||||
<Collapse line="287" />
|
||||
<Collapse line="325" />
|
||||
<Collapse line="361" />
|
||||
<Collapse line="366" />
|
||||
<Collapse line="371" />
|
||||
<Collapse line="385" />
|
||||
<Collapse line="392" />
|
||||
<Collapse line="475" />
|
||||
<Collapse line="481" />
|
||||
</Folding>
|
||||
</File>
|
||||
<File name="image.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="coreData.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="189" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="paletteSwap.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="293" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditorcolourSelectDialog.h" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="382" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="hdnesPackEditornewProjectDialog.h" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="229" topLine="0" />
|
||||
<Cursor1 position="776" topLine="28" />
|
||||
</Cursor>
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
|
|
|
|||
|
|
@ -1233,8 +1233,8 @@ void hdnesPackEditormainForm::gameObjsRawMenu( wxCommandEvent& event ){
|
|||
//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.objCoordX = (t.hFlip ? -1 : 1) * (ndata->tiles[gameObjSelectedTiles[k]].objCoordX - t.objCoordX);
|
||||
c.objCoordY = (t.vFlip ? -1 : 1) * (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++);
|
||||
|
|
|
|||
Loading…
Reference in a new issue