i did a butt load of tweaking to the paltest code and i did verious fixes here and...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index 816c600e4689e587db7958470d419f53617acc59..3126f7da4651f0d0dcdcf48c725c78d99ed67a02 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,15 +22,15 @@
 \r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-//#include "src/lib/16_dbg.h"\r
+#include "src/lib/16_dbg.h"\r
+\r
+//#define FADE\r
 \r
-#define FADE\r
 //#define NOMAPLOAD\r
 //#define OLDPLAYERSPRITESTUFF\r
+#define XC_CTRLTYPE ctrl_Joystick1//ctrl_Mouse//ctrl_Keyboard\r
 #ifdef __DEBUG__\r
-//#define SCROLLEXEDEBUG\r
-boolean\r
-       dbg_nointest=1;\r
+#define SCROLLEXEDEBUG\r
 #endif\r
 \r
 //static map_t map;\r
@@ -79,6 +79,10 @@ void main(int argc, char *argv[])
        char bakapee[64] = FILENAME_1;\r
        char bakapeep[64] = FILENAME_1P;\r
 //     char bakapee3[64] = FILENAME_3;\r
+#ifdef __DEBUG__\r
+       dbg_nointest=0;\r
+       dbg_joymousedelta=0;\r
+#endif\r
 \r
        Startup16(&gvar);\r
 \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
@@ -307,6 +315,7 @@ void main(int argc, char *argv[])
 //             if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }\r
 //#endif\r
                if(gvar.in.inst->Keyboard[sc_R]){ VL_modexPalOverscan(&gvar.video.palette, rand()%32); } //r\r
+               if(gvar.in.inst->Keyboard[sc_F]){ VL_SetPalette(&gamepal, &gvar.video); } //f\r
 \r
 \r
                //if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit (&gvar, "PLAYER OFF THE RAILS!");//break;        //incase things go out of sync!\r
@@ -334,6 +343,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