corepal variable added and i need to find out how to get the joystick input correct...

diff --git a/makefile b/makefile
index b0bd59862e526ad95f53150f10f4f16ffcd6452e..bc228a0a99ee342408f6f28d9172913ac9341869 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -269,7 +269,7 @@ testexec: $(EXEC) $(TESTEXEC2)
 # game and bakapi executables
 #
 16.exe:                16.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-bakapi.exe:            bakapi.$(OBJ) 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) $(DOSLIB) 16_wcpu.$(OBJ)# gfx.lib
+bakapi.exe:            bakapi.$(OBJ) 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) $(DOSLIB) 16_wcpu.$(OBJ) gamepal.$(OBJ)# gfx.lib
 sp2.exe:               sp2.$(OBJ)
 
 #

diff --git a/src/inputest.c b/src/inputest.c
index e74d10c7027b57dee4341a6f752cce88e38e8719..efba7464bbbaa1024716730dc62169d7ff96bb7c 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -25,8 +25,8 @@
 #include "src/lib/16_in.h"\r
 #include "src/lib/16_tail.h"\r
 \r
-//#define INPUTEST_JOYSTICKPADTEST\r
-#define INPUTEST_MOUSETEST\r
+#define INPUTEST_JOYSTICKPADTEST\r
+//#define INPUTEST_MOUSETEST\r
 \r
 void\r
 main(int argc, char *argv[])\r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index ac0010216d332e64900901137d3e89fc04ea2a59..a9d4b66805ba28432b976a3cfc2d4395ae4ec00b 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -45,7 +45,8 @@ void  VL_Startup (global_game_variables_t *gvar)
        __asm   cld;\r
 \r
        VGAmodeX(1/*TODO other modes*/, 1, gvar);\r
-       VL_LoadPalFileCore(gvar->video.palette, gvar);\r
+//--   VL_LoadPalFileCore(gvar->video.palette, gvar);\r
+       VL_SetCorePal(gvar);\r
        //Quit ("Improper video card!  If you really have a VGA card that I am not\ndetecting it!", gvar);\r
 }\r
 \r
@@ -939,6 +940,21 @@ void VLL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, word
        }\r
 }\r
 \r
+//++++//\r
+void VL_SetCorePal(global_game_variables_t *gvar)\r
+{\r
+       byte *palette = &corepal;\r
+       word i;\r
+\r
+       vga_palette_lseek(0);\r
+       for (i=0;i < COREPALSIZE;i++)\r
+               vga_palette_write(palette[(i*3)+0]>>2,\r
+                                                 palette[(i*3)+1]>>2,\r
+                                                 palette[(i*3)+2]>>2);\r
+\r
+       VL_PaletteSync(gvar);\r
+}\r
+\r
 void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar)\r
 {\r
        VLL_LoadPalFilewithoffset(filename, palette,\r

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index 098eed8b35d8f42c391577af5f070e15e682820f..30231f474987cc73ea633ac74f269886bbc82072 100755 (executable)
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -69,6 +69,7 @@ typedef union
 /* -======================= Constants & Vars ==========================- */\r
 extern byte far*  VGA;  /* The VGA Memory */\r
 extern byte far gamepal;\r
+extern byte far corepal;       //core palette used universally\r
 #define SCREEN_SEG             0xa000\r
 #define VIDEO_INT              0x10\r
 #define SET_MODE               0x00\r
@@ -207,6 +208,7 @@ void modexPalSave(byte *palette);
 void modexLoadPalFile(char *filename, byte *palette);\r
 void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar);\r
 void VL_LoadPalFileCore(byte *palette, global_game_variables_t *gvar);\r
+void VL_SetCorePal(global_game_variables_t *gvar);\r
 //void VLL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, global_game_variables_t *gvar);\r
 void VL_UpdatePaletteWrite(byte *palette, word o, word palsize, global_game_variables_t *gvar);\r
 void VL_PaletteSync(global_game_variables_t *gvar);\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 1921c95c26a77c368197a8e402aab9d50d2df38e..3801d6b6128ef21c0fdbbdd407dd6ff818b0c1c7 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 1921c95c26a77c368197a8e402aab9d50d2df38e
+Subproject commit 3801d6b6128ef21c0fdbbdd407dd6ff818b0c1c7

diff --git a/src/lib/gamepal.c b/src/lib/gamepal.c
index f9f8caa99430ba311eb839b986d604096a6de692..7edffc058a19ee2005e04a027df4121e619dd1dc 100755 (executable)
--- a/src/lib/gamepal.c
+++ b/src/lib/gamepal.c
@@ -53,3 +53,15 @@ unsigned char __far gamepal[768]={
  46, 58, 58, 39, 55, 55, 29, 50, 50, 18, 48, 48,  8, 45, 45,  8,\r
  44, 44,  0, 41, 41,  0, 38, 38,  0, 35, 35,  0, 33, 33,  0, 31,\r
  31,  0, 30, 30,  0, 29, 29,  0, 28, 28,  0, 27, 27, 38,  0, 34};\r
+\r
+const unsigned char __far corepal[27]={\r
+ 1,  1,  1,    //overscan color not pure black\r
+63,  0,  0,    //red\r
+ 0,  0, 63,    //blue\r
+ 0, 63,  0,    //green\r
+63, 63,  0,    //yellow\r
+63, 63, 63,    //white\r
+63,  0, 63,    //magenta\r
+ 0, 63, 63,    //cyan\r
+ 0,  0,  0,    //pure black\r
+};\r

diff --git a/src/xcroll.c b/src/xcroll.c
index 0c428ba9ad363be1e35415116b9d8310281cb22c..cbbabea946049750bd2f0738fa800017f415fecc 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -28,7 +28,7 @@
 \r
 //#define NOMAPLOAD\r
 //#define OLDPLAYERSPRITESTUFF\r
-#define XC_CTRLTYPE ctrl_Mouse//Keyboard\r
+#define XC_CTRLTYPE ctrl_Joystick1//ctrl_Mouse//ctrl_Keyboard\r
 //Mouse\r
 #ifdef __DEBUG__\r
 #define SCROLLEXEDEBUG\r