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

diff --git a/makefile b/makefile
index 306538e046912856e9a22ae6119d1dfb806ff19a..0b4e1f974353fb2e7cc2b0f7c8718f0f3c9707ef 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -359,6 +359,7 @@ mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
 16_mm.$(OBJ):   $(SRCLIB)/16_mm.c      $(SRCLIB)/16_mm.h
 16_pm.$(OBJ):   $(SRCLIB)/16_pm.c      $(SRCLIB)/16_pm.h
 16_ca.$(OBJ):   $(SRCLIB)/16_ca.c      $(SRCLIB)/16_ca.h
 16_mm.$(OBJ):   $(SRCLIB)/16_mm.c      $(SRCLIB)/16_mm.h
 16_pm.$(OBJ):   $(SRCLIB)/16_pm.c      $(SRCLIB)/16_pm.h
 16_ca.$(OBJ):   $(SRCLIB)/16_ca.c      $(SRCLIB)/16_ca.h

+16_us.$(OBJ):   $(SRCLIB)/16_us.c

 16_dbg.$(OBJ): $(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h
 midi.$(OBJ):   $(SRCLIB)/midi.c $(SRCLIB)/midi.h
 16_head.$(OBJ):$(SRCLIB)/16_head.c $(SRCLIB)/16_head.h
 16_dbg.$(OBJ): $(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h
 midi.$(OBJ):   $(SRCLIB)/midi.c $(SRCLIB)/midi.h
 16_head.$(OBJ):$(SRCLIB)/16_head.c $(SRCLIB)/16_head.h


@@ -429,7 +430,7 @@ backupconfig: .symbolic
        @$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)/git_modu.les
        @$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)/git_igno.re
 
        @$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)/git_modu.les
        @$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)/git_igno.re
 

-initconfig:
+initconfig: .symbolic

        @$(COPYCOMMAND) $(GITCONFIGDIR)/git_con.fig .git/config
        @$(COPYCOMMAND) $(GITCONFIGDIR)/git_modu.les .gitmodules
        @$(COPYCOMMAND) $(GITCONFIGDIR)/git_igno.re .gitignore
        @$(COPYCOMMAND) $(GITCONFIGDIR)/git_con.fig .git/config
        @$(COPYCOMMAND) $(GITCONFIGDIR)/git_modu.les .gitmodules
        @$(COPYCOMMAND) $(GITCONFIGDIR)/git_igno.re .gitignore

diff --git a/src/lib/16_us.c b/src/lib/16_us.c
index a164d2b42c2b5928ff0108d9257e0b8d42d7cf92..ec2b3b28cd5e8aaba2300d51acdd22c03e93dac5 100755 (executable)
--- a/src/lib/16_us.c
+++ b/src/lib/16_us.c
@@ -1,4 +1,11 @@
-#if 0\r
+/*#include "src/lib/16_in.h"\r
+static word far* clockw= (word far*) 0x046C; // 18.2hz clock\r
+\r
+#define CtlPanelSX     1\r
+#define CtlPanelSY     1\r
+#define CtlPanelEX     1\r
+#define CtlPanelEY     1\r
+#define TickBase               1\r

 \r
 #define PaddleMinX      (CtlPanelSX + 3)\r
 #define PaddleMaxX      (CtlPanelEX - 15)\r
 \r
 #define PaddleMinX      (CtlPanelSX + 3)\r
 #define PaddleMaxX      (CtlPanelEX - 15)\r


@@ -11,18 +18,18 @@
 void\r
 USL_DrawPongScore(word k,word c)\r
 {\r
 void\r
 USL_DrawPongScore(word k,word c)\r
 {\r

-       fontcolor = HiliteColor;\r
-       PrintY = py = CtlPanelSY + 4;\r
-       px = CtlPanelSX + 6;\r
-       VWB_Bar(px,py,42,6,BackColor);\r
-       USL_DrawString("YOU:");\r
-       PrintX = px;\r
-       US_PrintUnsigned(k);\r
-       px = CtlPanelSX + 108;\r
-       VWB_Bar(px,py,50,6,BackColor);\r
-       USL_DrawString("COMP:");\r
-       PrintX = px;\r
-       US_PrintUnsigned(c);\r
+       //++++fontcolor = HiliteColor;\r
+       //++++PrintY = py = CtlPanelSY + 4;\r
+       //++++px = CtlPanelSX + 6;\r
+       //++++VWB_Bar(px,py,42,6,BackColor);\r
+       //++++USL_DrawString("YOU:");\r
+       //++++PrintX = px;\r
+       //++++US_PrintUnsigned(k);\r
+       //++++px = CtlPanelSX + 108;\r
+       //++++VWB_Bar(px,py,50,6,BackColor);\r
+       //++++USL_DrawString("COMP:");\r
+       //++++PrintX = px;\r
+       //++++US_PrintUnsigned(c);\r

 }\r
 \r
 void\r
 }\r
 \r
 void\r


@@ -37,8 +44,9 @@ USL_PlayPong(void)
                                kscore,cscore,\r
                                speedup;\r
        int                     bdx,bdy;\r
                                kscore,cscore,\r
                                speedup;\r
        int                     bdx,bdy;\r

-       longword        balltime,waittime;\r
+       word        balltime,waittime;\r

        CursorInfo      cursorinfo;\r
        CursorInfo      cursorinfo;\r

+       word TimeCount = *clockw;\r

 \r
        kx = cx = PaddleMinX + ((PaddleMaxX - PaddleMinX) / 2);\r
        bx = by = bdx = bdy = 0;\r
 \r
        kx = cx = PaddleMinX + ((PaddleMaxX - PaddleMinX) / 2);\r
        bx = by = bdx = bdy = 0;\r


@@ -79,11 +87,11 @@ USL_PlayPong(void)
                                cx -= 1;\r
                }\r
 \r
                                cx -= 1;\r
                }\r
 \r

-               VWB_Bar(BallMinX,BallMinY - 1,\r
-                               BallMaxX - BallMinX + 5,BallMaxY - BallMinY + 7,\r
-                               BackColor);\r
-               VWB_DrawSprite(cx,CPaddleY,PADDLESPR);\r
-               VWB_DrawSprite(kx,KPaddleY,PADDLESPR);\r
+               //++++VWB_Bar(BallMinX,BallMinY - 1,\r
+               //              BallMaxX - BallMinX + 5,BallMaxY - BallMinY + 7,\r
+               //              BackColor);\r
+               //++++VWB_DrawSprite(cx,CPaddleY,PADDLESPR);\r
+               //++++VWB_DrawSprite(kx,KPaddleY,PADDLESPR);\r

                if (ball)\r
                {\r
                        if\r
                if (ball)\r
                {\r
                        if\r


@@ -92,7 +100,7 @@ USL_PlayPong(void)
                        ||      (((bx + bdx) >> 2) < BallMinX)\r
                        )\r
                        {\r
                        ||      (((bx + bdx) >> 2) < BallMinX)\r
                        )\r
                        {\r

-                               SD_PlaySound(BALLBOUNCESND);\r
+                               //++++SD__PlaySound(BALLBOUNCESND);\r

                                bdx = -bdx;\r
                        }\r
                        bx += bdx;\r
                                bdx = -bdx;\r
                        }\r
                        bx += bdx;\r


@@ -102,7 +110,7 @@ USL_PlayPong(void)
                                killball = true;\r
                                lastscore = false;\r
                                cscore++;\r
                                killball = true;\r
                                lastscore = false;\r
                                cscore++;\r

-                               SD_PlaySound(COMPSCOREDSND);\r
+                               //++++SD__PlaySound(COMPSCOREDSND);\r

                                USL_DrawPongScore(kscore,cscore);\r
                                if (cscore == 21)\r
                                {\r
                                USL_DrawPongScore(kscore,cscore);\r
                                if (cscore == 21)\r
                                {\r


@@ -116,7 +124,7 @@ USL_PlayPong(void)
                                killball = true;\r
                                lastscore = true;\r
                                kscore++;\r
                                killball = true;\r
                                lastscore = true;\r
                                kscore++;\r

-                               SD_PlaySound(KEENSCOREDSND);\r
+                               //++++SD__PlaySound(KEENSCOREDSND);\r

                                USL_DrawPongScore(kscore,cscore);\r
                                if (kscore == 21)\r
                                {\r
                                USL_DrawPongScore(kscore,cscore);\r
                                if (kscore == 21)\r
                                {\r


@@ -140,7 +148,7 @@ USL_PlayPong(void)
                                {\r
                                        rx = cx;\r
                                        revdir = true;\r
                                {\r
                                        rx = cx;\r
                                        revdir = true;\r

-                                       SD_PlaySound(COMPPADDLESND);\r
+                                       //++++SD__PlaySound(COMPPADDLESND);\r

                                }\r
                                else if\r
                                (\r
                                }\r
                                else if\r
                                (\r


@@ -156,7 +164,7 @@ USL_PlayPong(void)
                                        }\r
                                        rx = kx;\r
                                        revdir = true;\r
                                        }\r
                                        rx = kx;\r
                                        revdir = true;\r

-                                       SD_PlaySound(KEENPADDLESND);\r
+                                       //++++SD__PlaySound(KEENPADDLESND);\r

                                }\r
                                if (revdir)\r
                                {\r
                                }\r
                                if (revdir)\r
                                {\r


@@ -167,7 +175,7 @@ USL_PlayPong(void)
                                        revdir = false;\r
                                }\r
                        }\r
                                        revdir = false;\r
                                }\r
                        }\r

-                       VWB_DrawSprite(x,y,(x & 1)? BALL1PIXELTOTHERIGHTSPR : BALLSPR);\r
+                       //++++VWB_DrawSprite(x,y,(x & 1)? BALL1PIXELTOTHERIGHTSPR : BALLSPR);\r

                }\r
                else if (TimeCount >= balltime)\r
                {\r
                }\r
                else if (TimeCount >= balltime)\r
                {\r


@@ -179,10 +187,10 @@ USL_PlayPong(void)
                        bx = (BallMinX + ((BallMaxX - BallMinX) / 2)) << 2;\r
                        by = (BallMinY + ((BallMaxY - BallMinY) / 2)) << 2;\r
                }\r
                        bx = (BallMinX + ((BallMaxX - BallMinX) / 2)) << 2;\r
                        by = (BallMinY + ((BallMaxY - BallMinY) / 2)) << 2;\r
                }\r

-               VW_UpdateScreen();\r
+               //++++VW_UpdateScreen();\r

                while (waittime == TimeCount)\r
                        ;       // DEBUG - do adaptiveness\r
                while (waittime == TimeCount)\r
                        ;       // DEBUG - do adaptiveness\r

-       } while ((LastScan != sc_Escape) && !done);\r
+       } while ((inpu.LastScan != sc_Escape) && !done);\r

        IN_ClearKeysDown();\r
 }\r
 \r
        IN_ClearKeysDown();\r
 }\r
 \r


@@ -193,13 +201,12 @@ USL_PongCustom(UserCall call,struct UserItem far *item)
        if (call != uic_SetupCard)\r
                return(false);\r
 \r
        if (call != uic_SetupCard)\r
                return(false);\r
 \r

-       VWB_DrawPic(0,0,CP_MENUSCREENPIC);\r
-       VWB_DrawPic(CtlPanelSX + 56,CtlPanelSY,CP_PADDLEWARPIC);\r
-       VWB_Hlin(CtlPanelSX + 3,CtlPanelEX - 3,CtlPanelSY + 12,HiliteColor ^ BackColor);\r
-       VWB_Hlin(CtlPanelSX + 3,CtlPanelEX - 3,CtlPanelEY - 7,HiliteColor ^ BackColor);\r
+       //++++VWB_DrawPic(0,0,CP_MENUSCREENPIC);\r
+       //++++VWB_DrawPic(CtlPanelSX + 56,CtlPanelSY,CP_PADDLEWARPIC);\r
+       //++++VWB_Hlin(CtlPanelSX + 3,CtlPanelEX - 3,CtlPanelSY + 12,HiliteColor ^ BackColor);\r
+       //++++VWB_Hlin(CtlPanelSX + 3,CtlPanelEX - 3,CtlPanelEY - 7,HiliteColor ^ BackColor);\r

        USL_PlayPong();\r
 \r
        return(true);\r
 }\r
        USL_PlayPong();\r
 \r
        return(true);\r
 }\r

-\r
-#endif\r
+*/\r