proper sprite loading added wwwwwww

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index a6b3bcc9009a87a2de2a81d0577095eae67ceec3..1667459fa1501d29127589726bd653b740ada43a 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -68,8 +68,8 @@ void main(int argc, char *argv[])
 \r
        if (argc < 2) {\r
                //fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");\r
-               bakapee1 =              FILENAME_2;\r
-               bakapee1p =     FILENAME_2P;\r
+               bakapee1 =              FILENAME_1;\r
+               bakapee1p =     FILENAME_1P;\r
 \r
        }else{\r
                if(argv[1]) bakapee1 = argv[1];\r
@@ -90,7 +90,8 @@ void main(int argc, char *argv[])
 //     fprintf(stderr, "yay map loaded~~\n");\r
 \r
        // data\r
-       read_vrs(&gvar, bakapee1, player[0].enti.spri->spritesheet);\r
+       //read_vrs(&gvar, , .spri->spritesheet);\r
+       VRS_LoadVRS(bakapee1, &player[0].enti, &gvar);\r
 \r
        // input!\r
        IN_Default(0, &player,ctrl_Keyboard1);\r
@@ -223,7 +224,8 @@ void main(int argc, char *argv[])
                                bakapee1=FILENAME_2;\r
                                bakapee1p=FILENAME_2P;\r
                        }\r
-                       read_vrs(&gvar, bakapee1, player[0].enti.spri->spritesheet);\r
+                       //read_vrs(&gvar, bakapee1, player[0].enti.spri->spritesheet);\r
+                       VRS_ReadVRS(bakapee1, &player[0].enti, &gvar);\r
                        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
                }//JK\r
 #ifdef FADE\r