further seperating of mission2 and mapedit

This commit is contained in:
stevenhowes
2021-04-06 20:09:00 +01:00
parent 436fea16e4
commit ae0a541ae5
6 changed files with 19 additions and 26 deletions
Binary file not shown.
Binary file not shown.
+11 -11
View File
@@ -40,27 +40,27 @@ Squeezeflags = -o $@
# Dynamic dependencies: # 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.Graphics
o.Graphics: C:h.swis o.Graphics: C:h.swis
o.Graphics: C:h.kernel o.Graphics: C:h.kernel
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.Input
o.Input: C:h.swis o.Input: C:h.swis
o.Input: C:h.kernel o.Input: C:h.kernel
o.Input: C:h.kernel o.Input: C:h.kernel
o.Intro: c.Intro o.Intro: c.Intro
o.Intro: h.Graphics 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: c.Mission1
o.Mission1: h.Graphics o.Mission1: h.Graphics
o.Mission2: c.Mission2 o.Mission2: c.Mission2
+6 -6
View File
@@ -51,6 +51,12 @@ o.Mission2: h.Graphics
o.Mission2: C:h.swis o.Mission2: C:h.swis
o.Mission2: C:h.kernel o.Mission2: C:h.kernel
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.Graphics
o.Graphics: C:h.swis o.Graphics: C:h.swis
o.Graphics: C:h.kernel o.Graphics: C:h.kernel
@@ -59,9 +65,3 @@ o.Input: c.Input
o.Input: C:h.swis o.Input: C:h.swis
o.Input: C:h.kernel o.Input: C:h.kernel
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
-7
View File
@@ -25,17 +25,10 @@ unsigned char *buffer;
unsigned char *fontbuffer; unsigned char *fontbuffer;
unsigned char *tilebuffer; unsigned char *tilebuffer;
extern int screen;
extern struct CompositionElement composition[128];
extern int current_element;
int lastprofile = 0;
int tick = 0; int tick = 0;
int lasttick = 0; int lasttick = 0;
extern int screen; extern int screen;
extern int game1_tick();
extern void game1_setup();
extern void screen_nobuffer(); extern void screen_nobuffer();
+2 -2
View File
@@ -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); 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]); sprintf(textbuffer,"Tile:%i\nSprite:%i",TilePlayer.rawtile,fullmap[TilePlayer.rawtile]);
draw_spritetext(textbuffer, 1070, 950); draw_spritetext(textbuffer, 1070, 950);*/
game2_tick_input(); game2_tick_input();