From ae0a541ae592d4ed7c4fcd86b3cca2f82596e4b2 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Tue, 6 Apr 2021 20:09:00 +0100 Subject: [PATCH] further seperating of mission2 and mapedit --- !TheEsc/!MapEdit,ff8 | Bin 6592 -> 6588 bytes !TheEsc/!RunImage,ff8 | Bin 19664 -> 19368 bytes !TheEsc/Makefile,fe1 | 22 +++++++++++----------- !TheEsc/Tools,fe1 | 12 ++++++------ !TheEsc/c/MapEdit | 7 ------- !TheEsc/c/Mission2 | 4 ++-- 6 files changed, 19 insertions(+), 26 deletions(-) diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8 index 4a0ff47bd5ffd45597262fde7150ae76825b1eba..dcbf90be297e0d978803ffbd14204e3625e66474 100644 GIT binary patch delta 236 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 IpLv`87XgvjIsgCw delta 2990 zcmZ`*32>9g6@I&tZ0Wa-U)TgJgMV2D8z1pS2JnHAd~k+hf=LK;0tRy!445lZ!T>U{ zNl73a&*2!Fpg04Q&@_-JFin9ZZZS~f5W$cVC{P{z0iy|pwv(igqP~?yhsmV>%+9{= z?c2BCd;50xe|H!2?P19Po`7gZfN+Wx!d8I4H;xCW-=2J$wQmn7w#%fgg*NpP_0!;E zRbG(NbI}U78@tfPQVpA}aLfby)GyG**02Y7f~91T-0G$x??VT?!kAdvuv>A$I6?#U&Gw<6ZbdTzQX=W@Sx=v>?;1-l9PJCBueLFH39`8Vw=doqmijn zV}(*7XS2_6v7FC-jc>}C>^`bw6>FGN+d!7KNac^V0#Ov zS|_A+Q?;#Vs+%)+cHMGO<|~)XpSgkxo{^PARxf)ytfLsWnUE*G#H&oWE-~9xOs)X7 zs2m0bL4H%^a$1mq+rLKWDNhDEpkX7)+dKiWS+|7j?9~hV8`zV0R+29O+&Bx+-G!ef zWiyYrCn;TL?oXN_-2he8d_J_WN-%vRp88~HN zn*`x8)RLe%sD+d2Hj)JmozWATii1;!b03v*YPM^H1jmR+sC${BE+eBsu}LkHU-9c^ z5m)F`7dhgr~QfKxsH6c4&QKud8NU-A>GW_QSbIarJTzb@LWa_x9O2*erFx5r?R0eh>g;b ztE*@jGK1eZi}QwD;gs`=tPJM%He|(f_7Iol>|$S|A$JlxgU{!VVISe!x&2rtevWHwPs7D|>$wu=y_4r) zBJq6+ve{W2S&+_7VO_y+(_LL}cpBn#1os!L;8opTTVWpKV|6&bsK``H24lzd`kw6F zRP;c@i?z6MSdqC}OGQ1gccen=JvHn)V;|!F5zqDAtAS%@Ceeu8rh-BAZuJmaix-K2 z*A+kHr5apU;^6TbY%j?+|HvO*3INl-!YeeAqQQqHqsM@C2nLm>R>agp*TSfb4v(fpcToDy0_iU1i*j~R&jr;(!1y@;dB9o)%rVfnnY=gF#`Eb573M5a?i_{?K? zGTtlC;lJ<3)KSCM>o^=Mrp-&EoE+We32A<_DOm5O*R#nJvd`Y9&Z<$=-IXF41)(GW zDY_@Hld#M0mfe01Z;;$feP{HLXsD0s^qzo|ngMF)dWS3A-KlDtI#n~-OW+Qgd+nV8 z3kg|7fDr+)NWY(1M7$NkDFf$E7s5p6nDta9k5PgcCForudf217pHKp##E6nHM#&hn zH&LHVjJp5%7$f=z0eNSXfe2eL5@Y1@`=X*Y&JrbC5HiG4Q56ktazICUOcKG_FWqGJ4MDJ|N98VYC8PfgjZX_(8UWuOG&mxgOuo^mlFg0|Tb}>;0B3)OB+@S3Gg2kFT}0=551IK_-y4y{^>dI^~z`1)1FfRvrYpn_>r<5 z0pRqi3tUCs1@4v@MCfz7dv)SBLg*fS0{du1G46F&do;MMT8s8^`c(HxfC1F()Wj#e Y){B*>HJ--8@e93&$Nj)?);R5d0dI9^z5oCK diff --git a/!TheEsc/Makefile,fe1 b/!TheEsc/Makefile,fe1 index efe2412..bd9e92a 100644 --- a/!TheEsc/Makefile,fe1 +++ b/!TheEsc/Makefile,fe1 @@ -40,27 +40,27 @@ Squeezeflags = -o $@ # Dynamic dependencies: -o.CTheEscape: c.CTheEscape -o.CTheEscape: C:h.swis -o.CTheEscape: C:h.kernel -o.CTheEscape: C:h.kernel -o.CTheEscape: h.Sound -o.CTheEscape: h.Graphics o.Graphics: c.Graphics o.Graphics: C:h.swis o.Graphics: C:h.kernel o.Graphics: C:h.kernel -o.Sound: c.Sound -o.Sound: C:h.swis -o.Sound: C:h.kernel -o.Sound: C:h.kernel -o.Sound: h.Sound o.Input: c.Input o.Input: C:h.swis o.Input: C:h.kernel o.Input: C:h.kernel o.Intro: c.Intro o.Intro: h.Graphics +o.CTheEscape: c.CTheEscape +o.CTheEscape: C:h.swis +o.CTheEscape: C:h.kernel +o.CTheEscape: C:h.kernel +o.CTheEscape: h.Sound +o.CTheEscape: h.Graphics +o.Sound: c.Sound +o.Sound: C:h.swis +o.Sound: C:h.kernel +o.Sound: C:h.kernel +o.Sound: h.Sound o.Mission1: c.Mission1 o.Mission1: h.Graphics o.Mission2: c.Mission2 diff --git a/!TheEsc/Tools,fe1 b/!TheEsc/Tools,fe1 index d6b59ab..0052b8d 100644 --- a/!TheEsc/Tools,fe1 +++ b/!TheEsc/Tools,fe1 @@ -51,6 +51,12 @@ o.Mission2: h.Graphics o.Mission2: C:h.swis o.Mission2: C:h.kernel o.Mission2: C:h.kernel +o.MapEdit: c.MapEdit +o.MapEdit: C:h.swis +o.MapEdit: C:h.kernel +o.MapEdit: C:h.kernel +o.MapEdit: h.Sound +o.MapEdit: h.Graphics o.Graphics: c.Graphics o.Graphics: C:h.swis o.Graphics: C:h.kernel @@ -59,9 +65,3 @@ o.Input: c.Input o.Input: C:h.swis o.Input: C:h.kernel o.Input: C:h.kernel -o.MapEdit: c.MapEdit -o.MapEdit: C:h.swis -o.MapEdit: C:h.kernel -o.MapEdit: C:h.kernel -o.MapEdit: h.Sound -o.MapEdit: h.Graphics diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit index 2c5108a..33fcb58 100644 --- a/!TheEsc/c/MapEdit +++ b/!TheEsc/c/MapEdit @@ -25,17 +25,10 @@ unsigned char *buffer; unsigned char *fontbuffer; unsigned char *tilebuffer; -extern int screen; -extern struct CompositionElement composition[128]; -extern int current_element; -int lastprofile = 0; - int tick = 0; int lasttick = 0; extern int screen; -extern int game1_tick(); -extern void game1_setup(); extern void screen_nobuffer(); diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index df6a6a7..a8a78ff 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -248,11 +248,11 @@ int game2_tick() } } - draw_sprite("lcarsblack",1000,DISPLAY_Y-164); +/* draw_sprite("lcarsblack",1000,DISPLAY_Y-164); TilePlayer.rawtile = (TilePlayer.mapoffset.Y) + TilePlayer.localtile.Y + (TilePlayer.mapoffset.X * 100) + (TilePlayer.localtile.X * 100); sprintf(textbuffer,"Tile:%i\nSprite:%i",TilePlayer.rawtile,fullmap[TilePlayer.rawtile]); - draw_spritetext(textbuffer, 1070, 950); + draw_spritetext(textbuffer, 1070, 950);*/ game2_tick_input();