intro screen stuff added from wolf 3d. i am far too busy to code again. there is...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index 816c600e4689e587db7958470d419f53617acc59..93afc85618a66527029a27b336f5493697c79742 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -24,13 +24,17 @@
 #include "src/lib/16_timer.h"\r
 //#include "src/lib/16_dbg.h"\r
 \r
-#define FADE\r
+//#define FADE\r
+\r
 //#define NOMAPLOAD\r
 //#define OLDPLAYERSPRITESTUFF\r
+#define XC_CTRLTYPE ctrl_Mouse//Keyboard\r
+//Mouse\r
 #ifdef __DEBUG__\r
-//#define SCROLLEXEDEBUG\r
+#define SCROLLEXEDEBUG\r
 boolean\r
-       dbg_nointest=1;\r
+       dbg_nointest=0,\r
+       dbg_joymousedelta=0;\r
 #endif\r
 \r
 //static map_t map;\r
@@ -95,11 +99,12 @@ void main(int argc, char *argv[])
 \r
        // create the map\r
                #ifdef SCROLLEXEDEBUG\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll1.16w");    MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.datadumpfilename, "mmdump1.16w");  MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.heapdumpfilename, "heap1.16w");            HC_heapdump(&gvar);\r
        //fprintf(stderr, "testing map load~    ");\r
                #endif\r
-       CA_loadmap("data/test.map", &gvar.map, &gvar);\r
 #ifndef NOMAPLOAD\r
+       CA_loadmap("data/test.map", &gvar.map, &gvar);\r
        chkmap(&gvar.map, 0);\r
 #else\r
        chkmap(&gvar.map, 1);\r
@@ -108,7 +113,8 @@ void main(int argc, char *argv[])
                #ifdef SCROLLEXEDEBUG\r
        printf("chkmap ok\n");\r
 //     fprintf(stderr, "yay map loaded~~\n");\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll2.16w");    MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.datadumpfilename, "mmdump2.16w");  MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.heapdumpfilename, "heap2.16w");            HC_heapdump(&gvar);\r
                #endif\r
 \r
        // data\r
@@ -118,18 +124,20 @@ void main(int argc, char *argv[])
 #else\r
                #ifdef SCROLLEXEDEBUG\r
        fprintf(stderr, "VRS_LoadVRS~   ");\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll3.16w");    MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.datadumpfilename, "mmdump3.16w");  MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.heapdumpfilename, "heap3.16w");            HC_heapdump(&gvar);\r
                #endif\r
        VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
                #ifdef SCROLLEXEDEBUG\r
        printf("VRS load OK~\n");\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll4.16w");    MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.datadumpfilename, "mmdump4.16w");  MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.heapdumpfilename, "heap4.16w");            HC_heapdump(&gvar);\r
                #endif\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll.16w");\r
 #endif\r
 \r
        // input!\r
-       IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
+       IN_Default(0, &gvar.player[0],XC_CTRLTYPE, &gvar);\r
+       IN_SetControlType(&gvar.player[0],XC_CTRLTYPE);\r
 \r
        // save the palette\r
 #ifdef FADE\r
@@ -334,6 +342,16 @@ void main(int argc, char *argv[])
 #endif\r
 }\r
 \r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
 #ifdef OLDPLAYERSPRITESTUFF\r
 void\r
 modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {\r