something is bothering me very much on the animation part of frame. particularly...

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index e056fdec17d2c5fcac0a9b7a6344fc480bb5df29..a02ae0da9590a0299568a56e833e35a8c4f925bd 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -56,9 +56,9 @@ void main(int argc, char *argv[])
 \r
        // OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
        //IN CA i think you use CAL_SetupGrFile but i do think we should work together on this part --sparky4\r
-       player[0].ent = malloc(sizeof(entity_t));\r
-       player[0].ent->spri = malloc(sizeof(struct sprite));\r
-       player[0].ent->spri->spritesheet = malloc(sizeof(struct vrs_container));\r
+       //player[0].ent = malloc(sizeof(entity_t));\r
+       player[0].enti.spri = malloc(sizeof(struct sprite));\r
+       player[0].enti.spri->spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
 //     fprintf(stderr, "testing map load~      ");\r
@@ -68,7 +68,7 @@ void main(int argc, char *argv[])
 //     fprintf(stderr, "yay map loaded~~\n");\r
 \r
        // data\r
-       read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet);\r
+       read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].enti.spri->spritesheet);\r
        PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
 \r
        // input!\r
@@ -102,22 +102,20 @@ void main(int argc, char *argv[])
        ZC_MVSetup(&mv, &map, &gvar);\r
 \r
        //renderswitch\r
-       gvar.video.rs=1;\r
-       //player[0].ent->spri->x = player[0].ent->spri->y = TILEWH;\r
+       gvar.video.rss=0;\r
 \r
        // set up paging\r
        //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
        playerXYpos(0, 0, &player, &mv, 0);\r
-       IN_initplayer(&player, 0);\r
-       player[0].ent->spri->x = player[0].enti.x-4;\r
-       player[0].ent->spri->y = player[0].enti.y-16;\r
-       player[0].ent->spri->delay = 0;\r
+       EN_initplayer(&player, 0);\r
+       player[0].enti.spri->x = player[0].enti.x-4;\r
+       player[0].enti.spri->y = player[0].enti.y-16;\r
 \r
        player[0].enti.dire=31;\r
-       gvar.video.sprifilei = set_anim_by_id(player[0].ent->spri, player[0].enti.dire);\r
-       //print_anim_ids(player[0].ent->spri);\r
+       gvar.video.sprifilei = set_anim_by_id(player[0].enti.spri, player[0].enti.dire);\r
+       //print_anim_ids(player[0].enti.spri);\r
        if (gvar.video.sprifilei == -1)\r
        {\r
 #ifdef FADE\r
@@ -128,7 +126,7 @@ void main(int argc, char *argv[])
                modexFadeOn(4, dpal);\r
 #endif\r
        }\r
-       animate_spri((player[0].ent->spri), &gvar.video);\r
+       animate_spri(&(player[0].enti), &gvar.video);\r
 \r
        VL_ShowPage(mv[0].page, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\r
 #ifdef FADE\r
@@ -195,10 +193,10 @@ void main(int argc, char *argv[])
                        {\r
                                case 11:\r
                                        i=0;\r
-                                       player[0].ent->spri->x = TILEWH;\r
+                                       player[0].enti.spri->x = TILEWH;\r
                                default:\r
                                        i++;\r
-                                       player[0].ent->spri->delay = 0; animate_spri((player[0].ent->spri), &gvar.video);// player[0].ent->spri->x += 16;\r
+                                       animate_spri(&(player[0].enti), &gvar.video);// player[0].enti.spri->x += 16;\r
                                break;\r
                        }\r
                }\r