stevenhowes/CTheEscape
1
0
Fork 0
mirror of https://github.com/stevenhowes/CTheEscape.git synced 2026-05-26 15:53:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove old smart tile bits (all but event triggering)

Browse Source
This commit is contained in:
stevenhowes
2021-05-29 21:37:15 +01:00
parent 1b82cfcb45
commit c57e5ec38e
4 changed files with 12 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
!TheEsc/!MapEdit,ff8
BIN
View File
Binary file not shown.
!TheEsc/!RunImage,ff8
BIN
View File
Binary file not shown.
!TheEsc/c/MapEdit
+11 -47
View File
@@ -165,7 +165,7 @@ int game2_getnewsmarttile()
if(SmartTiles[i].Tile == -1) if(SmartTiles[i].Tile == -1)
{ {
SmartTiles[i].Tile = TilePlayer.rawtile; SmartTiles[i].Tile = TilePlayer.rawtile;
SmartTiles[i].Action = 0; SmartTiles[i].Action = 2;
SmartTiles[i].ActionValue = 0; SmartTiles[i].ActionValue = 0;
return i; return i;
} }
@@ -262,31 +262,6 @@ void game2_tick_input()
oldselectedsmart = selectedsmart; oldselectedsmart = selectedsmart;
if(editsmart == 1) if(editsmart == 1)
{ {
// Right arrow
if(input_readkey(121))
{
if(tick > readmodkey)
{
SmartTiles[selectedsmart].Action++;
if(SmartTiles[selectedsmart].Action > 1)
SmartTiles[selectedsmart].Action = 1;
readmodkey = tick + 20;
}
}
// Left arrow
if(input_readkey(25))
{
if(tick > readmodkey)
{
SmartTiles[selectedsmart].Action--;
// Looks weird, but unsigned so -1 is 255
if(SmartTiles[selectedsmart].Action > 1)
SmartTiles[selectedsmart].Action = 0;
readmodkey = tick + 20;
}
}
// Up arrow // Up arrow
if(input_readkey(57)) if(input_readkey(57))
{ {
@@ -321,27 +296,23 @@ void game2_tick_input()
} }
} }
// > - next tile // Right arrow
if(input_readkey(103)) if(input_readkey(121))
{ {
if(tick > readmodkey) if(tick > readmodkey)
{ {
if(SmartTiles[selectedsmart].Action == 0) if(SmartTiles[selectedsmart].Action == 2)
SmartTiles[selectedsmart].ActionValue++;
if(SmartTiles[selectedsmart].Action == 1)
SmartTiles[selectedsmart].ActionValue++; SmartTiles[selectedsmart].ActionValue++;
readmodkey = tick + 10; readmodkey = tick + 10;
} }
} }
// < - previous tile // Left arrow
if(input_readkey(102)) if(input_readkey(25))
{ {
if(tick > readmodkey) if(tick > readmodkey)
{ {
if(SmartTiles[selectedsmart].Action == 0) if(SmartTiles[selectedsmart].Action == 2)
SmartTiles[selectedsmart].ActionValue--;
if(SmartTiles[selectedsmart].Action == 1)
SmartTiles[selectedsmart].ActionValue--; SmartTiles[selectedsmart].ActionValue--;
readmodkey = tick + 10; readmodkey = tick + 10;
} }
@@ -606,25 +577,18 @@ int game2_tick()
if(selectedsmart == i) if(selectedsmart == i)
{ {
sprintf(textbuffer,"} %i",SmartTiles[i].ActionTarget); sprintf(textbuffer,"} ");
draw_spritetext(textbuffer, 150, 1000 - (smarty*120)); draw_spritetext(textbuffer, 150, 1000 - (smarty*120));
} }
else else
{ {
sprintf(textbuffer,"] %i",SmartTiles[i].ActionTarget); sprintf(textbuffer,"] ");
draw_spritetext(textbuffer, 150, 1000 - (smarty*120)); draw_spritetext(textbuffer, 150, 1000 - (smarty*120));
} }
sprintf(textbuffer,"%s",actionnames[SmartTiles[i].Action]); if(SmartTiles[i].Action == 2)
draw_spritetext(textbuffer, 300, 1000 - (smarty*120));
if(SmartTiles[i].Action == 0)
{ {
sprintf(tilenamebuffer,"%i",SmartTiles[i].ActionValue); sprintf(textbuffer,"Event %d",SmartTiles[i].ActionValue);
draw_tile(tilenamebuffer,600,1000 - (smarty*120) - 25);
}else if(SmartTiles[i].Action == 1)
{
sprintf(textbuffer,"%s",Areas[SmartTiles[i].ActionValue].name);
draw_spritetext(textbuffer,600,1000 - (smarty*120)); draw_spritetext(textbuffer,600,1000 - (smarty*120));
} }
} }
!TheEsc/c/Mission2
+1 -5
View File
@@ -683,11 +683,7 @@ int game2_tick()
{ {
if(SmartTiles[i].Tile == TilePlayer.rawtile) if(SmartTiles[i].Tile == TilePlayer.rawtile)
{ {
if(SmartTiles[i].Action == 0) // Change tile sprite if(SmartTiles[i].Action == 2) // Trigger event
fullmap[SmartTiles[i].ActionTarget] = SmartTiles[i].ActionValue;
else if(SmartTiles[i].Action == 1) // Change area name
sprintf(areaname,"%s",Areas[SmartTiles[i].ActionValue].name);
else if(SmartTiles[i].Action == 2) // Trigger event
game2_triggerevent(SmartTiles[i].ActionValue); game2_triggerevent(SmartTiles[i].ActionValue);
} }
} }