updated the copyleft wwww i am not deAD! i just been 2 busy last 6 monthes

[16.git] / src / 0tesuto.c

diff --git a/src/0tesuto.c b/src/0tesuto.c
index fb3d0fc908ebf8c2f972324c5fc6aefbe603ed68..f2935528bde8aca772dc8704f72feb30cf3f4a15 100755 (executable)
--- a/src/0tesuto.c
+++ b/src/0tesuto.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -29,9 +29,11 @@
 \r
 //#define FILENAME_1 "data/aconita.vrl"\r
 //#define FILENAME_2 "data/aconita.pal"\r
-#define FILENAME_1 "data/spri/chikyuu.vrl"\r
+#define FILENAME_1 "data/spri/chistnd.vrl"\r
 #define FILENAME_2 "data/spri/chikyuu.pal"\r
 \r
+//#define ZSP\r
+\r
 #define INITTNUM 1\r
 \r
 map_view_t mv[4];\r
@@ -41,7 +43,7 @@ int main(int argc,char **argv)
 {\r
        static global_game_variables_t gvar;\r
        struct vrl1_vgax_header *vrl_header;\r
-       vrl1_vgax_offset_t *vrl_lineoffs;\r
+       vrl1_vgax_offset_t *line_offsets;\r
        unsigned char *buffer;\r
        unsigned int bufsz;\r
        int fd;\r
@@ -50,10 +52,10 @@ int main(int argc,char **argv)
        char bakapee1[64] = FILENAME_1;\r
        char bakapee2[64] = FILENAME_2;\r
 \r
-       boolean anim=1,noanim=0,zerostoppause=1;\r
-\r
-//     bakapee1=mALLoc(64);\r
-//     bakapee2=mALLoc(64);\r
+       boolean anim=1,noanim=0;\r
+#ifdef ZSP\r
+       boolean zerostoppause=1;\r
+#endif\r
 \r
        if (argc >= 2) {\r
 /*     if (argc < 2) {\r
@@ -103,8 +105,8 @@ int main(int argc,char **argv)
        VL_LoadPalFile(bakapee2, &gvar.video.palette, &gvar);\r
 \r
        /* preprocess the sprite to generate line offsets */\r
-       vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
-       if (vrl_lineoffs == NULL) return 1;\r
+       line_offsets = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
+       if (line_offsets == NULL) return 1;\r
 \r
        IN_Startup(&gvar);\r
        IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);\r
@@ -113,7 +115,8 @@ int main(int argc,char **argv)
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar);\r
        ZC_MVSetup(&gvar.mv, &map, &gvar);\r
-       ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);\r
+       //ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);\r
+       VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);\r
 \r
 //     VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);\r
        VL_PatternDraw(&gvar.video, 0/*gvar.video.sp*/, 0, 1);\r
@@ -148,11 +151,17 @@ int main(int argc,char **argv)
                        IN_ReadControl(&gvar.player[0], &gvar);\r
                        if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10\r
                        TAIL_PANKEYFUN;\r
-                       if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause)   //space\r
+                       if(gvar.in.inst->Keyboard[sc_Space]\r
+#ifdef ZSP\r
+                               || zerostoppause\r
+#endif\r
+)      //space\r
                        {\r
                                anim=!anim;\r
                                DRAWCORNERBOXES;\r
+#ifdef ZSP\r
                                if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0;\r
+#endif\r
                        }\r
                        if(gvar.in.inst->Keyboard[sc_R]){\r
                                gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;\r
@@ -190,7 +199,7 @@ int main(int argc,char **argv)
                                vga_state.vga_graphics_ram = omemptr + gvar.video.page[0].pagesize + gvar.video.page[1].pagesize;\r
 \r
                                /* then the sprite. note modding ram ptr means we just draw to (x&3,0) */\r
-draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
+draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,line_offsets,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
 //printf("x=%d y=%d    rx=%d   ry=%d\n", x, y, rx, ry);\r
 \r
                                /* restore ptr */\r
@@ -222,7 +231,8 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
 \r
 //===========================================================================//\r
 \r
-       ZC_ShowMV(&gvar.mv, 0, 0);\r
+       //ZC_ShowMV(&gvar.mv, 0, 0);\r
+       VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);\r
 if(!noanim) {\r
        /* another handy "demo" effect using VGA write mode 1.\r
         * we can take what's on screen and vertically squash it like an old analog TV set turning off. */\r
@@ -308,7 +318,7 @@ if(!noanim) {
 }\r
        IN_Shutdown(&gvar);\r
        VGAmodeX(0, 1, &gvar);\r
-       free(vrl_lineoffs);\r
+       free(line_offsets);\r
        buffer = NULL;\r
        free(buffer);\r
        bufsz = 0;\r