trying to figure out the issue with player sprite with pcx i have no idea wwww

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index 97b45e605aaca03333cbfafcfce1f42b1a6cb783..90c72add6a38a7315976189a7deb253faf4796f5 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -28,7 +28,7 @@
 \r
 #define MODEXZ\r
 \r
-//TODO: known issues the array dependent mv stuff and player arrays\r
+//bitmap_t p;\r
 static map_t map;\r
 player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
@@ -76,8 +76,8 @@ void main(int argc, char *argv[])
 \r
        // data\r
        read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet);\r
-       player[0].data = malloc(48*128); //TODO use exmm\r
-       *player[0].data = bitmapLoadPcx("data/chikyuu.pcx"); // load sprite\r
+       player[0].data = malloc(72*128); //TODO use exmm\r
+       *player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
 \r
        //      input!\r
        IN_Default(0, &player,ctrl_Keyboard1);\r
@@ -93,8 +93,10 @@ void main(int argc, char *argv[])
 #ifdef MODEXZ\r
 #ifdef FADE\r
        modexPalBlack();        //reset the palette~\r
+#endif\r
        CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar);\r
        modexPalUpdate1(pal);\r
+#ifdef FADE\r
        gpal = modexNewPal();\r
        modexPalSave(gpal);\r
        modexSavePalFile("data/g.pal", gpal);\r
@@ -178,7 +180,6 @@ void main(int argc, char *argv[])
                }       //p\r
 #ifdef FADE\r
                if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].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
                        printf("2paloffset      =       %d\n", paloffset/3);\r
                        IN_UserInput(1,1);\r
@@ -203,8 +204,8 @@ void main(int argc, char *argv[])
                }\r
                if(IN_KeyDown(66))      //f8\r
                {\r
-       //              modexDrawSprite(mv[0].page, 16, 16, p);\r
-                       modexDrawSprite(mv[0].page, 32+48, 16, (player[0].data));\r
+//                     modexDrawSprite(mv[0].page, 16, 16, &p);\r
+                       modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
                }\r
                //TODO fmemtest into page\r
                /*if(IN_KeyDown(4+1))   //4\r