From 2c1288b910f1c63f6d417e602a847ca23582c65c Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sun, 25 Apr 2021 18:08:29 +0100 Subject: [PATCH] Map extension, areanames (by smart tile) --- !TheEsc/!RunImage,ff8 | Bin 20836 -> 21276 bytes !TheEsc/Font,ff9 | Bin 29016 -> 29740 bytes !TheEsc/Tiles,ff9 | Bin 71244 -> 91404 bytes !TheEsc/c/CTheEscape | 1 - !TheEsc/c/Mission2 | 37 +++++++++++++++++++++++++++++++++++++ !TheEsc/m2_areas,ffd | Bin 0 -> 320 bytes !TheEsc/m2_map,ffd | Bin 10000 -> 10000 bytes !TheEsc/m2_smart,ffd | Bin 1200 -> 1200 bytes 8 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 !TheEsc/m2_areas,ffd diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index fedce47cd1d8acb65fb4d1d9c17984bddbdfd43e..923708c794f74e8549315cc39028c665435b9cb9 100644 GIT binary patch delta 3626 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 diff --git a/!TheEsc/c/CTheEscape b/!TheEsc/c/CTheEscape index ed8e519..705dcb0 100644 --- a/!TheEsc/c/CTheEscape +++ b/!TheEsc/c/CTheEscape @@ -8,7 +8,6 @@ //#define SKIP_INTRO //#define SKIP_MISSION1 //#define SKIP_MISSION2 -//#define M2_DEBUG_HITBOXES // SWI Registers _kernel_swi_regs inreg; diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index 0c67a6a..e97e6fe 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -13,6 +13,7 @@ extern _kernel_swi_regs outreg; #define TILESX 10 #define TILESY 10 #define SMARTTILES 100 +#define AREAS 20 // map[0] is the 'master', [1] and [2] represents what is currently // believed to be displayed in the corresponding (+1) screen buffer @@ -21,6 +22,8 @@ extern _kernel_swi_regs outreg; unsigned char map[3][TILESX][TILESY]; unsigned char fullmap[10000]; +unsigned char areaname[13]; + char tilenamebuffer[4]; char textbuffer[63]; @@ -28,6 +31,12 @@ struct EntityLocation_s { short signed int X,Y; }; +struct Area_s { + unsigned char name[16]; +}; + +struct Area_s Areas[AREAS]; + struct TilePlayer_s { struct EntityLocation_s location; struct EntityLocation_s lastlocation; @@ -52,6 +61,7 @@ struct SmartTile_s { struct SmartTile_s SmartTiles[SMARTTILES]; +/************VVV TO BE REMOVED/MOVED TO MAPEDIT VVV***********/ void game2_savesmarttiles(char* filename) { // Attempt to get file info @@ -64,7 +74,19 @@ void game2_savesmarttiles(char* filename) _kernel_swi(OS_File,&inreg,&outreg); } +void game2_saveareanames(char* filename) +{ + // Attempt to get file info + inreg.r[0] = 10; + inreg.r[1] = (int) filename; + inreg.r[2] = 0xffd; + inreg.r[4] = (int) Areas; + inreg.r[5] = (int) Areas + (sizeof(Areas)); + _kernel_swi(OS_File,&inreg,&outreg); + +} +/************^^^ TO BE REMOVED/MOVED TO MAPEDIT ^^^***********/ void game2_loadsmarttiles(char* filename) { int length; @@ -224,6 +246,16 @@ void game2_setup() game2_loadmap("m2_map"); game2_loadsmarttiles("m2_smart"); + sprintf(areaname,"null"); + sprintf(Areas[0].name,"corridor"); + sprintf(Areas[1].name,"shuttle bay"); + sprintf(Areas[2].name,"briefing room"); + sprintf(Areas[3].name,"cargo bay"); + sprintf(Areas[4].name,"arboretum"); + sprintf(Areas[5].name,"torpedo room 1"); + sprintf(Areas[6].name,"torpedo room 2"); + sprintf(Areas[7].name,"sensor control"); + game2_saveareanames("m2_areas"); game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y); } @@ -357,6 +389,9 @@ int game2_tick() { // Fill the map0 with our chunk of the full map game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y); + + draw_spritetext("#############", 1020, 950); + draw_spritetext(areaname, 1020, 950); for(x = 0; x < TILESX; x++) { @@ -410,6 +445,8 @@ int game2_tick() // Change tile sprite if(SmartTiles[i].Action == 0) fullmap[SmartTiles[i].ActionTarget] = SmartTiles[i].ActionValue; + else if(SmartTiles[i].Action == 1) + sprintf(areaname,"%s",Areas[SmartTiles[i].ActionValue].name); } } diff --git a/!TheEsc/m2_areas,ffd b/!TheEsc/m2_areas,ffd new file mode 100644 index 0000000000000000000000000000000000000000..ae69f9e73b0c574d8aa1baa6955c9336452d54fc GIT binary patch literal 320 zcmdUm(G7qg5JPViR?v+APb5)l%K72;iW)!Mz(w$>PCeP_;xblmsz)Z21s1E zsdja5m|-%DKGf+hDs7h;^xNIE9qz@uZp9?t6}gx1j;~5OJ}J^MK~%iEIXODmt${Rr z@YUBRFs8^?V#H{<+trojJuPPR=&NtfVB}ezW#4v;yVK*t{klTLRbXU@AwySpuGo+F zm#`n(S#Hk&>g;;H=dl=W4U7*xSC+1pilC0qi@?A$Vs@^=a$(J#b4hR3Gf^1npfA0C zCDjO1y3wWwTMK1qpNC%m2Sx!lt7F5}94-mYuGZm_1Ro>DY=8Bq%h`?1z}bz>!1_@b z>#pu_Nun`yBf>2bLpvMYjr8KUO3QJslROT?H=CQoQdcBbV2nxzdQfMGaSt{cTP4Ej z{J;z`X3PQdg!Lmc(C3$!Q^s{nCSxsSEQz(}Glo3O8Ns0S|L%B^A-WJF#_v8~c+<0) wwOoY;Xn+Q2fCgxQ255i=Xn+Q2fCgxQ255i=Xn+Q2fCgxQ255i=Xy9)HKchh3U;qFB literal 10000 zcmeH}O-sX25JgiMHwD3kbmz9!mA3T<3WcgDifv*)2tsSSskWQs2RbwMMY4Z43%M7P zkj*>1Gc$R~ry=Xrbe`MGJc*o4j@jum&03l?G9t<3^Y!_0+%?kv3&R-6=Ipe6@0&S% zqZr$_m#2rGLqM)ZzPR3i^{5!entVWNUSr4whH-L??PD>+Fl_CR^zL1=j6EMUS82Xp zMW6B{sWWswqEC5Kj4SDiT^j3Mz&@&PqSsw}7tOHVMKkPs1z}uDPwdjb7+#3q8;IeP zZPRU8VqEzN?nk{|`E`{}H$z4bT7$&;Sk401eOp4bT7$&;Sk401eOp4bT7$ Q&;Sk401eOp4g5C)KVu_*LjV8( diff --git a/!TheEsc/m2_smart,ffd b/!TheEsc/m2_smart,ffd index c8621a0f34c7a27fc3022e5b33baba67fe1a7039..75b67997452ec8dffd22f9ddf547b6ce6fd1629a 100644 GIT binary patch literal 1200 zcmYdgfB;5D28NSN2=*x$8%VdZBE;KZY@iSqCsZ6r-VQgjwhFl~zFN_UTUx>u! ggRxl{7>bbC|A7Ev0|Ub-8xj(u;V>EwBRLHK03rxr82|tP delta 11 TcmdnMxq)-zfe*|R4;%mhAae!i