trying to figure out the issue with player sprite with pcx

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 5beb4743d33660ce11b0aec8ac039d03ff131010..716c7dcfb76a13243b890b29b6ae5cb2b5add4ca 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -20,10 +20,9 @@
  *\r
  */\r
 \r
-#include "src/lib/16_scr.h"\r
+#include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/wcpu.h"\r
-#include "src/lib/mapread.h"\r
 #include "src/lib/16_dbg.h"\r
 \r
 //#define FADE\r
@@ -31,7 +30,6 @@
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 //bitmap_t *p;\r
-global_game_variables_t gvar;\r
 static map_t map;\r
 player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
@@ -58,6 +56,7 @@ boolean panswitch=0;//1
 \r
 void main(int argc, char *argv[])\r
 {\r
+       static global_game_variables_t gvar;\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
@@ -78,7 +77,7 @@ void main(int argc, char *argv[])
        //mappalptr = map.tiles->btdata->palette;\r
 \r
        /* data */\r
-       player[0].data = malloc(48*128); //TODO use exmm\r
+       //player[0].data = _fmalloc(48*128); //TODO use exmm\r
        *player[0].data = bitmapLoadPcx("data/chikyuu.pcx"); // load sprite\r
 \r
        /* create the planar buffer */\r
@@ -218,7 +217,8 @@ void main(int argc, char *argv[])
        }       //p\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); }\r
+       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p\r
+       if(IN_KeyDown(23)){ modexDrawSprite(mv[1].page, 160, 120, player[0].data); IN_UserInput(1,1); } //o\r
        if(IN_KeyDown(22)){\r
        paloffset=0; modexPalBlack(); modexPalUpdate(player[0].data, &paloffset, 0, 0);\r
        printf("1paloffset      =       %d\n", paloffset/3);\r