-- reverted to before layer vars

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index 342f3ba54b058bdce07d85e2db539793fc0578ac..f2e803f314402b02ebf67bdc968ffb4b676ce6a6 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -104,15 +104,7 @@ void main(int argc, char *argv[])
        VGAmodeX(1/*bakapee*/, 1, &gvar);\r
 \r
        /* load color palette */\r
-       /*ptmp.offset=(paloffset/3);\r
-       modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
-       //modexClearRegion(bg->page, 0, 0, 320, 240, 255);\r
-       //printf("      %d\n", sizeof(ptmp.data));\r
-       //printf("1:    %d\n", paloffset);\r
-       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
@@ -147,7 +139,6 @@ 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
@@ -172,7 +163,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->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
+               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
                {\r
                        short i;\r
                        for(i=800; i>=400; i--)\r
@@ -184,8 +175,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(&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
+               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
 \r
                FUNCTIONKEYFUNCTIONS\r
                FUNCTIONKEYDRAWJUNK\r