From f0ead9562ce3a5daa58d26331b3e08abb8dce640 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sat, 29 May 2021 23:18:00 +0100 Subject: [PATCH] Support event names in mapedit --- !TheEsc/!MapEdit,ff8 | Bin 10096 -> 10364 bytes !TheEsc/c/MapEdit | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8 index 2c42d8f2aa24b43852118cb4f7f7077f7151b6ca..d3c16ea50076e8bcc0f5a38ee974e4f69f691738 100644 GIT binary patch delta 2054 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 sizeof(Events)) + { + screen_nobuffer(); + while (1) + printf("Events exceeds %d bytes (%d bytes) object type is %d\n",sizeof(Events),length,outreg.r[0]); + } + + // Attempt to get file info + inreg.r[0] = 16; + inreg.r[1] = (int) filename; + inreg.r[2] = (int) Events; + inreg.r[3] = 0; + + _kernel_swi(OS_File,&inreg,&outreg); +} + void game2_loadsmarttiles(char* filename) { int length; @@ -250,6 +288,7 @@ void game2_setup() game2_loadmap("m2_map"); game2_loadsmarttiles("m2_smart"); game2_loadareanames("m2_areas"); + game2_loadevents("m2_evt"); game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y); } @@ -588,7 +627,7 @@ int game2_tick() if(SmartTiles[i].Action == 2) { - sprintf(textbuffer,"Event %d",SmartTiles[i].ActionValue); + sprintf(textbuffer,"Event %d: %s",SmartTiles[i].ActionValue,Events[SmartTiles[i].ActionValue].Name); draw_spritetext(textbuffer,600,1000 - (smarty*120)); } }