made it cooler~

	modified:   Project 16.bfproject
	modified:   makefile
	modified:   src/16.h
	renamed:    src/lib/lib_head.c -> src/lib/16_head.c
	renamed:    src/lib/lib_head.h -> src/lib/16_head.h
	modified:   src/lib/16_in.h
	modified:   src/lib/16_mm.h
	modified:   src/lib/16text.h
	modified:   src/lib/bitmap.h
	modified:   src/lib/dos_kb.h
	modified:   src/lib/mapread.h
	modified:   src/lib/modex16.h
	modified:   src/lib/scroll16.h

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 92551881813dc78b830a7c45997f2bfdef62f807..204b7ab8fc9aca61cd3a649a1f9516e6bd6e0137 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -34,8 +34,8 @@ openfiles: /dos/z/16/src/lib/jsmn/farjsmn.c:7182:6170:0:
 openfiles: /dos/z/16/src/lib/jsmn/farjsmn.h:861:381:0:
 openfiles: /dos/z/16/src/lib/16_in.c:1522:1072:0:
 openfiles: /dos/z/16/src/lib/16_in.h:3692:3652:0:
-openfiles: /dos/z/16/src/lib/lib_head.c:3456:2616:0:
-openfiles: /dos/z/16/src/lib/lib_head.h:3332:2969:0:
+openfiles: /dos/z/16/src/lib/16_head.c:3456:2616:0:
+openfiles: /dos/z/16/src/lib/16_head.h:3332:2969:0:
 openfiles: /dos/z/16/makefile:1235:295:1:
 openfiles: /dos/z/16/src/lib/types.h:1043:28:0:
 openfiles: /dos/z/16/src/16.h:943:0:0:

diff --git a/makefile b/makefile
index 973cf984c78940c8846f868a44419db16a6f05f3..000a0b58e44b3e215aa091001a85ed989d67cf74 100644 (file)
--- a/makefile
+++ b/makefile
@@ -22,7 +22,7 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
+16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
 
 all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
@@ -157,8 +157,8 @@ mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
 16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c
        wcl $(FLAGS) -c $(SRCLIB)16_mm.c
 
-lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
-       wcl $(FLAGS) -c $(SRCLIB)lib_head.c
+16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
+       wcl $(FLAGS) -c $(SRCLIB)16_head.c
 
 jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
        wcl $(FLAGS) -c $(JSMNLIB)jsmn.c

diff --git a/src/16.h b/src/16.h
index 7f2e0976b63b41db54b315d1903661ae91badf43..d6038ae86439a53daac77ea60817a091a25f5eaf 100644 (file)
--- a/src/16.h
+++ b/src/16.h
@@ -23,7 +23,7 @@
 #ifndef __16_H_
 #define __16_H_
 
-#include "src/lib/lib_head.h"
+#include "src/lib/16_head.h"
 #include "src/lib/modex16.h"
 #include "src/lib/wcpu/wcpu.h"
 #include "src/lib/planar.h"

diff --git a/src/lib/lib_head.c b/src/lib/16_head.c
similarity index 97%
rename from src/lib/lib_head.c
rename to src/lib/16_head.c
index 4ca25c9cbc48fe153f5311d45462810c542fb440..d56b52607748051ca1c7cee1e6e326021918bc27 100644 (file)
--- a/src/lib/lib_head.c
+++ b/src/lib/16_head.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "src/lib/lib_head.h"
+#include "src/lib/16_head.h"
 
 /* local function */\r
 void wait(clock_t wait);

diff --git a/src/lib/lib_head.h b/src/lib/16_head.h
similarity index 100%
rename from src/lib/lib_head.h
rename to src/lib/16_head.h

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 1036b6ec8eeaaa7e9294e8fbaa3ee21823a2c50d..9a9c768502fb4cd65ec5b2d7696c09b78539dd57 100644 (file)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -20,23 +20,23 @@
 //     ID Engine\r
 //     ID_IN.h - Header file for Input Manager\r
 //     v1.0d1w\r
-//     By Jason Blochowiak
+//     By Jason Blochowiak\r
 //     Open Watcom port by sparky4\r
 //\r
 \r
 #ifndef        __16_IN__\r
 #define        __16_IN__\r
-
+\r
 #include <string.h>\r
-#include "src/lib/lib_head.h"\r
+#include "src/lib/16_head.h"\r
 \r
 #ifdef __DEBUG__\r
 #define        __DEBUG_InputMgr__\r
-#endif
+#endif\r
 \r
 #ifdef __DEBUG_InputMgr__\r
-#define TESTKEYIN
-#define TESTCONTROLNOISY
+#define TESTKEYIN\r
+#define TESTCONTROLNOISY\r
 #endif\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
@@ -48,7 +48,7 @@
 \r
 #define        MaxPlayers      4\r
 #define        MaxKbds         2\r
-#define        MaxJoys         2
+#define        MaxJoys         2\r
 #define        MaxPads         2\r
 #define        NumCodes        128\r
 \r
@@ -135,10 +135,10 @@ typedef   byte            ScanCode;
 #define        key_BackSpace   0x08\r
 #define        key_Tab                 0x09\r
 #define        key_Delete              0x7f\r
-
-#define        key_LSuper                      0x5b
-#define        key_RSuper                      0x5c
-#define        key_Menu                        0x5d
+\r
+#define        key_LSuper                      0x5b\r
+#define        key_RSuper                      0x5c\r
+#define        key_Menu                        0x5d\r
 \r
 //     Stuff for the mouse\r
 #define        MReset          0\r
@@ -157,8 +157,8 @@ typedef     enum            {
                                                        ctrl_Keyboard1 = ctrl_Keyboard,ctrl_Keyboard2,\r
                                                ctrl_Joystick,\r
                                                        ctrl_Joystick1 = ctrl_Joystick,ctrl_Joystick2,\r
-                                               ctrl_Mouse,
-                                               ctrl_Joypad,
+                                               ctrl_Mouse,\r
+                                               ctrl_Joypad,\r
                                                        ctrl_Joypad1 = ctrl_Joypad,ctrl_Joypad2\r
                                        } ControlType;\r
 typedef        enum            {\r
@@ -166,12 +166,12 @@ typedef   enum            {
                                                motion_None = 0,\r
                                                motion_Right = 1,motion_Down = 1\r
                                        } Motion;\r
-typedef        enum            {
-                                               dir_North,//dir_NorthEast,
-                                               dir_West,//dir_Nortinest,
+typedef        enum            {\r
+                                               dir_North,//dir_NorthEast,\r
+                                               dir_West,//dir_Nortinest,\r
                                                dir_None,\r
-                                               dir_East,//,dir_SouthEast,
-                                               dir_South,//dir_Soutinest,
+                                               dir_East,//,dir_SouthEast,\r
+                                               dir_South,//dir_Soutinest,\r
                                        } Direction;\r
 typedef        struct          {\r
                                                boolean         button0,button1,button2,button3;\r
@@ -183,9 +183,9 @@ typedef     struct          {
 typedef        struct          {\r
                                                ScanCode        button0,button1,\r
                                                                        //upleft,\r
-                                                                       up,
-                                                                       down,
-                                                                       left,
+                                                                       up,\r
+                                                                       down,\r
+                                                                       left,\r
                                                                        right\r
                                                                        //upright,\r
                                                                        //downleft,\r
@@ -199,101 +199,101 @@ typedef struct          {
                                                                        joyMaxX,joyMaxY,\r
                                                                        joyMultXL,joyMultYL,\r
                                                                        joyMultXH,joyMultYH;\r
-                                       } JoystickDef;
-typedef        struct
-{
+                                       } JoystickDef;\r
+typedef        struct\r
+{\r
        boolean w;\r
-} JoypadDef;
-
-typedef        struct
-{
-       int x; //player exact position on the viewable map
-       int y; //player exact position on the viewable map
-       int tx; //player tile position on the viewable map
-       int ty; //player tile position on the viewable map
-       int triggerx; //player's trigger box tile position on the viewable map
-       int triggery; //player's trigger box tile position on the viewable map
-       int setx; //NOT USED YET! player sprite sheet set on the image x
-       int sety; //NOT USED YET! player sprite sheet set on the image y
-       word q; //loop variable
-//     word d; //direction
-       //bitmap_t data; //supposively the sprite sheet data
-       int hp; //hitpoints of the player
-       CursorInfo      info;
-       ControlType     Controls;
-} player_t;
-
+} JoypadDef;\r
+\r
+typedef        struct\r
+{\r
+       int x; //player exact position on the viewable map\r
+       int y; //player exact position on the viewable map\r
+       int tx; //player tile position on the viewable map\r
+       int ty; //player tile position on the viewable map\r
+       int triggerx; //player's trigger box tile position on the viewable map\r
+       int triggery; //player's trigger box tile position on the viewable map\r
+       int setx; //NOT USED YET! player sprite sheet set on the image x\r
+       int sety; //NOT USED YET! player sprite sheet set on the image y\r
+       word q; //loop variable\r
+//     word d; //direction\r
+       //bitmap_t data; //supposively the sprite sheet data\r
+       int hp; //hitpoints of the player\r
+       CursorInfo      info;\r
+       ControlType     Controls;\r
+} player_t;\r
+\r
 /*\r
 =============================================================================\r
 \r
                                        GLOBAL VARIABLES\r
 \r
 =============================================================================\r
-*/
-/*extern struct inconfig
-{
+*/\r
+/*extern struct inconfig\r
+{\r
        boolean                 MousePresent;\r
        boolean                 JoysPresent[MaxJoys];\r
-       boolean                 JoyPadPresent[MaxPads];
+       boolean                 JoyPadPresent[MaxPads];\r
        boolean         Keyboard[NumCodes];\r
        boolean         Paused;\r
        char            LastASCII;\r
-       ScanCode        LastScan;
-
-       KeyboardDef     KbdDefs[MaxKbds];
-       JoystickDef     JoyDefs[MaxJoys];
-       JoypadDef       JoypadDefs[MaxPads];
-} inpu;*/
-
+       ScanCode        LastScan;\r
+\r
+       KeyboardDef     KbdDefs[MaxKbds];\r
+       JoystickDef     JoyDefs[MaxJoys];\r
+       JoypadDef       JoypadDefs[MaxPads];\r
+} inpu;*/\r
+\r
 #ifdef DEMO0\r
                static Demo             DemoMode = demo_Off;\r
                static byte /*_seg*/    *DemoBuffer;\r
                static word             DemoOffset,DemoSize;\r
 #endif\r
-
+\r
 extern dword far* clockdw;\r
 \r
-//     Internal routines
-extern void interrupt INL_KeyService();
-extern void Mouse(int x);
-//static void INL_GetMouseDelta(int *x,int *y);
-//static word INL_GetMouseButtons(void);
-extern void IN_GetJoyAbs(word joy,word *xp,word *yp);
-//static void INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive);
-//static word INL_GetJoyButtons(word joy);
-extern word IN_GetJoyButtonsDB(word joy);
-//static void INL_StartKbd(void);
-//static void INL_ShutKbd(void);
-//static boolean INL_StartMouse(void);
-//static void INL_ShutMouse(void);
-//static void INL_SetJoyScale(word joy);
-extern void IN_SetupJoy(word joy,word minx,word maxx,word miny,word maxy);
-//static boolean INL_StartJoy(word joy);
-//static void INL_ShutJoy(word joy);
-extern void IN_Startup();
-extern void IN_Default(boolean gotit,player_t *player,ControlType nt);
-extern void IN_Shutdown();
-extern void IN_SetKeyHook(void (*hook)());
-extern void IN_ClearKeysDown();
-//static void INL_AdjustCursor(CursorInfo *info,word buttons,int dx,int dy);
-extern void IN_ReadCursor(CursorInfo *info);
-extern void IN_ReadControl(int playnum,player_t *player);
-extern void IN_SetControlType(word playnum,player_t *player,ControlType type);
-#if DEMO0
-extern boolean IN_StartDemoRecord(word bufsize);
-extern void IN_StartDemoPlayback(byte /*__segment*/ *buffer,word bufsize);
-extern void IN_StopDemo(void);
-extern void IN_FreeDemoBuffer(void);
-#endif
-extern byte *IN_GetScanName(ScanCode scan);
-extern ScanCode IN_WaitForKey();
-extern char IN_WaitForASCII();
-extern void IN_AckBack();
-extern void IN_Ack();
-extern boolean IN_IsUserInput();
-extern boolean IN_UserInput(dword delay,boolean clear);
-extern boolean IN_KeyDown(byte code);
-extern void IN_ClearKey(byte code);
-extern boolean IN_qb(byte kee);
+//     Internal routines\r
+extern void interrupt INL_KeyService();\r
+extern void Mouse(int x);\r
+//static void INL_GetMouseDelta(int *x,int *y);\r
+//static word INL_GetMouseButtons(void);\r
+extern void IN_GetJoyAbs(word joy,word *xp,word *yp);\r
+//static void INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive);\r
+//static word INL_GetJoyButtons(word joy);\r
+extern word IN_GetJoyButtonsDB(word joy);\r
+//static void INL_StartKbd(void);\r
+//static void INL_ShutKbd(void);\r
+//static boolean INL_StartMouse(void);\r
+//static void INL_ShutMouse(void);\r
+//static void INL_SetJoyScale(word joy);\r
+extern void IN_SetupJoy(word joy,word minx,word maxx,word miny,word maxy);\r
+//static boolean INL_StartJoy(word joy);\r
+//static void INL_ShutJoy(word joy);\r
+extern void IN_Startup();\r
+extern void IN_Default(boolean gotit,player_t *player,ControlType nt);\r
+extern void IN_Shutdown();\r
+extern void IN_SetKeyHook(void (*hook)());\r
+extern void IN_ClearKeysDown();\r
+//static void INL_AdjustCursor(CursorInfo *info,word buttons,int dx,int dy);\r
+extern void IN_ReadCursor(CursorInfo *info);\r
+extern void IN_ReadControl(int playnum,player_t *player);\r
+extern void IN_SetControlType(word playnum,player_t *player,ControlType type);\r
+#if DEMO0\r
+extern boolean IN_StartDemoRecord(word bufsize);\r
+extern void IN_StartDemoPlayback(byte /*__segment*/ *buffer,word bufsize);\r
+extern void IN_StopDemo(void);\r
+extern void IN_FreeDemoBuffer(void);\r
+#endif\r
+extern byte *IN_GetScanName(ScanCode scan);\r
+extern ScanCode IN_WaitForKey();\r
+extern char IN_WaitForASCII();\r
+extern void IN_AckBack();\r
+extern void IN_Ack();\r
+extern boolean IN_IsUserInput();\r
+extern boolean IN_UserInput(dword delay,boolean clear);\r
+extern boolean IN_KeyDown(byte code);\r
+extern void IN_ClearKey(byte code);\r
+extern boolean IN_qb(byte kee);\r
 \r
 #endif\r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index bb1301012c63873bd8fab61dff6f7395c1899572..f16663bf06d329106cb03b8a34bdaa21db5f3bac 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <malloc.h>
-#include "src/lib/lib_head.h"
+#include "src/lib/16_head.h"
 //++++mh       #include "src/lib/16_in.h"
 
 #ifdef __DEBUG__               // 1 == Debug/Dev  ;  0 == Production/final

diff --git a/src/lib/16text.h b/src/lib/16text.h
index 98c3b90474b0bac1303814c80a37ba49ef0848f8..935fb67fe0e61b7491a4cf85ba1094d14214a672 100644 (file)
--- a/src/lib/16text.h
+++ b/src/lib/16text.h
@@ -6,7 +6,7 @@
  */\r
 #ifndef TEXT_H\r
 #define TEXT_H\r
-#include "types.h"\r
+#include "src/lib/types.h"\r
 \r
 /* font information type */\r
 typedef struct font {\r

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 1a2abcf9dd08da4f065bc612c7bb9c407b0b054f..37d7f82858857ddd67a1be2a82e47ee49ce3bdb9 100644 (file)
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -26,7 +26,7 @@
 #ifndef BITMAP_H\r
 #define BITMAP_H
 #include "src/lib/types.h"
-#include "src/lib/lib_head.h"
+#include "src/lib/16_head.h"
 \r
 typedef struct {\r
        byte *data;

diff --git a/src/lib/dos_kb.h b/src/lib/dos_kb.h
index 8f85fe7ff2ae26c13242a0e9adf58274bed69c43..3161cfe904a501e2931b5a49dc3880911f5f2a27 100644 (file)
--- a/src/lib/dos_kb.h
+++ b/src/lib/dos_kb.h
@@ -1,6 +1,6 @@
 #ifndef _DOSLIB_KB_H_
 #define _DOSLIB_KB_H_
-#include "src/lib/lib_head.h"
+#include "src/lib/16_head.h"
 
 /* Maximum number of scan codes on keyboard controllers */
 #define NUM_SCANCODES   128

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index 06cab45a345789709aefa870bb7de1f84cc36cf2..4f1742468eea4ef867a6e0d45eb2515555361840 100644 (file)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -8,7 +8,7 @@
 
 #include "src/lib/jsmn/jsmn.h"
 #include "src/lib/modex16.h"
-#include "src/lib/lib_head.h"
+#include "src/lib/16_head.h"
 
 //#define DEBUG_MAPDATA
 //#define DEBUG_MAPVAR

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index e25405d09bcce67c757613a9bdcc74391e0359db..bb00795b681b9b179b8dba6745a7100882a86c2a 100644 (file)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -29,7 +29,7 @@
 #include "src/lib/types.h"
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.h"
-#include "src/lib/lib_head.h"
+#include "src/lib/16_head.h"
 
 /* -========================== Types & Macros ==========================- */
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index e7fa1e166ce8492ad94d7cfa31117f81215133c0..71a0cbf35e24708122656d19a5a52f5bc84ebded 100644 (file)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -23,6 +23,7 @@
 #ifndef __SCROLL16_H_
 #define __SCROLL16_H_
 
+#include "src/lib/16_head.h"
 #include "src/lib/16_in.h"
 
 //#define TILEWH 16