==== FIXED MAP INDEX NUMBER PRITING IN DRAWTILE wwww ====

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index ed2341bb37e629d758bcafe5ab8e1227c3009c97..342f3ba54b058bdce07d85e2db539793fc0578ac 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -112,6 +112,7 @@ void main(int argc, char *argv[])
        map.tiles->data->offset=(paloffset/3);\r
        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
+       //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
 \r
 #ifdef FADE\r
        gpal = modexNewPal();\r
@@ -146,6 +147,7 @@ void main(int argc, char *argv[])
        gvar.video.page[0].tlx=mv[0].tx*TILEWH;\r
        gvar.video.page[0].tly=mv[0].ty*TILEWH;\r
        shinku(&gvar);\r
+//modexpdump(mv[0].page);\r
 #ifdef FADE\r
        modexFadeOn(4, gpal);\r
 #endif\r
@@ -170,7 +172,7 @@ void main(int argc, char *argv[])
 \r
                //the scripting stuff....\r
                //if(((player[0].enti.triggerx == TRIGGX && player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))\r
-               if(((mv[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))\r
+               if(((mv[0].map->MAPDATAPTR[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))\r
                {\r
                        short i;\r
                        for(i=800; i>=400; i--)\r
@@ -182,8 +184,8 @@ void main(int argc, char *argv[])
                if(player[0].enti.q == (TILEWH/(player[0].enti.speed))+1 && player[0].info.dir != 2 && (player[0].enti.triggerx == 5 && player[0].enti.triggery == 5)){ player[0].enti.hp--; }\r
                //debugging binds!\r
 \r
-               if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o\r
-               if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u\r
+               if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o\r
+               if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u\r
 \r
                FUNCTIONKEYFUNCTIONS\r
                FUNCTIONKEYDRAWJUNK\r