__seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd...

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 36a7370c2fa96bfcc23fe33cac557dcda0f90455..7fb6f755e137606516e5225ee90f603850faab67 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -46,7 +46,6 @@ unsigned int i;
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       static player_t player[MaxPlayers];\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
@@ -69,7 +68,7 @@ void main(int argc, char *argv[])
 \r
 #endif\r
        /*      input!  */\r
-       IN_Default(0, &player,ctrl_Keyboard1);\r
+       IN_Default(0, &gvar.gvar.player,ctrl_Keyboard1);\r
 \r
        /* save the palette */\r
 #ifdef MODEX\r
@@ -102,7 +101,7 @@ void main(int argc, char *argv[])
        &gvar.video.palette = modexNewPal();\r
        modexPalSave(&gvar.video.palette);\r
        modexSavePalFile("data/g.pal", &gvar.video.palette);\r
-       modexPalBlack();        //so player will not see loadings~\r
+       modexPalBlack();        //so gvar.player will not see loadings~\r
 #endif\r
 #endif\r
 \r
@@ -117,8 +116,8 @@ void main(int argc, char *argv[])
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
        mapGoTo(&mv, 0, 0);\r
 \r
-       ZC_playerXYpos(0, 0, &player, &mv, 0, 1);\r
-       EN_initplayer(&player, 0, &gvar.video);\r
+       ZC_gvar.playerXYpos(0, 0, &gvar.player, &mv, 0, 1);\r
+       EN_initgvar.player(&gvar.player, 0, &gvar.video);\r
        if (gvar.video.sprifilei == -1)\r
        {\r
 #ifdef FADE\r
@@ -131,9 +130,9 @@ void main(int argc, char *argv[])
        }\r
 \r
 #ifndef        SPRITE\r
-       modexClearRegion(mv[0].page, player[0].enti.x, player[0].enti.y-TILEWH, 16, 32, 15);\r
+       modexClearRegion(mv[0].page, gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 32, 15);\r
 #else\r
-       modexDrawSpriteRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y-TILEWH, 16, 64, 16, 32,   PCXBMPPTR);\r
+       modexDrawSpriteRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 64, 16, 32, PCXBMPPTR);\r
 #endif\r
 \r
        //if(!pageflipflop)\r
@@ -161,25 +160,25 @@ void main(int argc, char *argv[])
        modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
 #endif\r
-       while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)\r
+       while(!IN_KeyDown(sc_Escape) && gvar.player[0].enti.hp>0)\r
        {\r
                shinku(&gvar);\r
        //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
-       //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction\r
-       //when player[0].enti.tx or player[0].enti.ty == 0 or player[0].enti.tx == 20 or player[0].enti.ty == 15 then stop because that is edge of map and you do not want to walk of the map\r
+       //to stop scrolling and have the gvar.player position data move to the edge of the screen with respect to the direction\r
+       //when gvar.player[0].enti.tx or gvar.player[0].enti.ty == 0 or gvar.player[0].enti.tx == 20 or gvar.player[0].enti.ty == 15 then stop because that is edge of map and you do not want to walk of the map\r
 \r
-       //player movement\r
-               IN_ReadControl(0, &player);\r
+       //gvar.player movement\r
+               IN_ReadControl(0, &gvar.player);\r
        if(!panswitch){\r
-               ZC_walk(&mv, &player, 0);\r
+               ZC_walk(&mv, &gvar.player, 0);\r
        }else{\r
-               PANKEYFUNZC;//panPageManual(&mv, &player, 0);\r
-               //printf("      player[0].enti.q: %d", player[0].enti.q);       printf("        player[0].d: %d\n", player[0].d);\r
+               PANKEYFUNZC;//panPageManual(&mv, &gvar.player, 0);\r
+               //printf("      gvar.player[0].enti.q: %d", gvar.player[0].enti.q);     printf("        gvar.player[0].d: %d\n", gvar.player[0].d);\r
        }\r
 \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->layerdata[0].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(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
+       if(((mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
        {\r
                short i;\r
                for(i=800; i>=400; i--)\r
@@ -188,7 +187,7 @@ void main(int argc, char *argv[])
                }\r
                nosound();\r
        }\r
-       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
+       if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }\r
        //debugging binds!\r
 #ifdef MODEX\r
 #ifdef FADE\r
@@ -215,7 +214,7 @@ void main(int argc, char *argv[])
 \r
        FUNCTIONKEYFUNCTIONS\r
        FUNCTIONKEYDRAWJUNK\r
-       if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }\r
+       if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }\r
 \r
        //9\r
 #ifdef FADE\r
@@ -223,7 +222,7 @@ void main(int argc, char *argv[])
 #endif\r
                if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
 \r
-       if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) break; //incase things go out of sync!\r
+       if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) break;  //incase things go out of sync!\r
        }\r
 \r
        /* fade back to text mode */\r