__seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd...

diff --git a/makefile b/makefile
index c396e4c6c41ff014c5294423adf1b90a6f652c77..58f4ec18e3baf371d6d05fe5e78de7964dec3c83 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -339,7 +339,7 @@ mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
 16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h
 16_timer.$(OBJ):$(SRCLIB)/16_timer.c $(SRCLIB)/16_timer.h
 16_in.$(OBJ):   $(SRCLIB)/16_in.c $(SRCLIB)/16_in.h
-16_in_.$(OBJ):  $(SRCLIB)/16_in_.c $(SRCLIB)/16_in_.h
+16_in_.$(OBJ):  $(SRCLIB)/16_in_.c $(SRCLIB)/16_in.h
 16_rf.$(OBJ):   $(SRCLIB)/16_rf.c      $(SRCLIB)/16_rf.h
 16_mm.$(OBJ):   $(SRCLIB)/16_mm.c      $(SRCLIB)/16_mm.h
 16_pm.$(OBJ):   $(SRCLIB)/16_pm.c      $(SRCLIB)/16_pm.h

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 39519c203762e2c71006a2e3ed61c917f7169ee0..4c039165158ffcf3fbaaa73ff19c37935aa2882c 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -202,37 +202,7 @@ typedef    struct          {
                                                                        joyMaxX,joyMaxY,\r
                                                                        joyMultXL,joyMultYL,\r
                                                                        joyMultXH,joyMultYH;\r
-                                       } JoystickDef;\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 sheetsetx; //NOT USED YET! player sprite sheet set on the image x\r
-       int sheetsety; //NOT USED YET! player sprite sheet set on the image y\r
-       byte d;         //direction to render sprite!! wwww\r
-       byte q;         //loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www\r
-       byte near pdir; //previous direction~\r
-       word speed;             //player speed!\r
-       word spt;               //speed per tile\r
-#ifdef __WATCOMC__\r
-       struct sprite   *spri;  //supposively the sprite sheet data\r
-       memptr          gr;\r
-       entity_t                *ent;\r
-#endif\r
-       bitmap_t        *data;          //supposively the sprite sheet data//old format\r
-       bitmap_t        bmp;\r
-       sword hp; //hitpoints of the player\r
-       int persist_aniframe;    // gonna be increased to 1 before being used, so 0 is ok for default\r
-       CursorInfo      info;\r
-       ControlType     Controls;\r
-//newer vars\r
-       int dx, dy, delta;      //TODO: what is this? ^^\r
-} player_t;*/\r
+                                       } JoystickDef;*/\r
 \r
 /*\r
 =============================================================================\r
@@ -241,19 +211,6 @@ typedef    struct
 \r
 =============================================================================\r
 */\r
-/*extern struct inconfig\r
-{\r
-       boolean                 MousePresent;\r
-       boolean                 JoysPresent[MaxJoys];\r
-       boolean         Keyboard[NumCodes];\r
-       boolean         Paused;\r
-       char            LastASCII;\r
-       ScanCode        LastScan;\r
-\r
-       KeyboardDef     KbdDefs[MaxKbds];\r
-       JoystickDef     JoyDefs[MaxJoys];\r
-} inpu;*/\r
-\r
 #ifdef DEMO0\r
                static Demo             DemoMode = demo_Off;\r
                static byte /*_seg*/    *DemoBuffer;\r

diff --git a/src/lib/16_in_.h b/src/lib/16_in_.h
index 969fdb7e07f0d2eefbefdca531a2b79051a0c1ce..39519c203762e2c71006a2e3ed61c917f7169ee0 100755 (executable)
--- a/src/lib/16_in_.h
+++ b/src/lib/16_in_.h
@@ -204,6 +204,36 @@ typedef    struct          {
                                                                        joyMultXH,joyMultYH;\r
                                        } JoystickDef;\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 sheetsetx; //NOT USED YET! player sprite sheet set on the image x\r
+       int sheetsety; //NOT USED YET! player sprite sheet set on the image y\r
+       byte d;         //direction to render sprite!! wwww\r
+       byte q;         //loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www\r
+       byte near pdir; //previous direction~\r
+       word speed;             //player speed!\r
+       word spt;               //speed per tile\r
+#ifdef __WATCOMC__\r
+       struct sprite   *spri;  //supposively the sprite sheet data\r
+       memptr          gr;\r
+       entity_t                *ent;\r
+#endif\r
+       bitmap_t        *data;          //supposively the sprite sheet data//old format\r
+       bitmap_t        bmp;\r
+       sword hp; //hitpoints of the player\r
+       int persist_aniframe;    // gonna be increased to 1 before being used, so 0 is ok for default\r
+       CursorInfo      info;\r
+       ControlType     Controls;\r
+//newer vars\r
+       int dx, dy, delta;      //TODO: what is this? ^^\r
+} player_t;*/\r
+\r
 /*\r
 =============================================================================\r
 \r
@@ -211,6 +241,19 @@ typedef    struct          {
 \r
 =============================================================================\r
 */\r
+/*extern struct inconfig\r
+{\r
+       boolean                 MousePresent;\r
+       boolean                 JoysPresent[MaxJoys];\r
+       boolean         Keyboard[NumCodes];\r
+       boolean         Paused;\r
+       char            LastASCII;\r
+       ScanCode        LastScan;\r
+\r
+       KeyboardDef     KbdDefs[MaxKbds];\r
+       JoystickDef     JoyDefs[MaxJoys];\r
+} inpu;*/\r
+\r
 #ifdef DEMO0\r
                static Demo             DemoMode = demo_Off;\r
                static byte /*_seg*/    *DemoBuffer;\r