added bug fixes to the 8086 port of wolf3d

diff --git a/16/sod8086/WOLF3D.SYM b/16/sod8086/WOLF3D.SYM
index 734c687d21c45027d03f4ad9efca5ec8ca5b821d..c77883eefc7a916b0cf8d02cd52e84594dab1b16 100755 (executable)
Binary files a/16/sod8086/WOLF3D.SYM and b/16/sod8086/WOLF3D.SYM differ

diff --git a/16/sod8086/obj/WOLF3D.EXE b/16/sod8086/obj/WOLF3D.EXE
new file mode 100755 (executable)
index 0000000..b1a6788
Binary files /dev/null and b/16/sod8086/obj/WOLF3D.EXE differ

diff --git a/16/sod8086/sodver.h b/16/sod8086/sodver.h
new file mode 100755 (executable)
index 0000000..b964b80
--- /dev/null
+++ b/16/sod8086/sodver.h
@@ -0,0 +1,7 @@
+#define SPEAR\r
+#define ARTSEXTERN\r
+#define DEMOSEXTERN\r
+#define CARMACIZED\r
+//#define MYPROFILE\r
+//#define DEBCHECK\r
+//#define UPLOAD\r

diff --git a/16/sod8086/wolf3d.dsk b/16/sod8086/wolf3d.dsk
index 9e466efebba1f609f14b97f07ebebe5ae4fb8fe6..33fcea09ea1f72c1deaf1e510a4c7ec157b65fdd 100755 (executable)
Binary files a/16/sod8086/wolf3d.dsk and b/16/sod8086/wolf3d.dsk differ

diff --git a/16/sod8086/wolf3d.prj b/16/sod8086/wolf3d.prj
index 6ce1e0c71f1aa917e28207685ed268d565194cc7..9d524549ce63a1830df8db254526af44342ba419 100755 (executable)
Binary files a/16/sod8086/wolf3d.prj and b/16/sod8086/wolf3d.prj differ

diff --git a/16/wf3d8086/WOLF3D.SYM b/16/wf3d8086/WOLF3D.SYM
index f84efe17f4f0af1bdabd89f038b691302fbf3570..f232bcf7508e5faa760fbef4f41205010ed70524 100755 (executable)
Binary files a/16/wf3d8086/WOLF3D.SYM and b/16/wf3d8086/WOLF3D.SYM differ

diff --git a/16/wf3d8086/wf3dver.h b/16/wf3d8086/wf3dver.h
new file mode 100755 (executable)
index 0000000..05abb0e
--- /dev/null
+++ b/16/wf3d8086/wf3dver.h
@@ -0,0 +1,10 @@
+//#define SPEAR\r
+//#define JAPAN\r
+#define GOODTIMES\r
+#define ARTSEXTERN\r
+#define DEMOSEXTERN\r
+//#define MYPROFILE\r
+//#define DEBCHECK\r
+#define CARMACIZED\r
+//#define UPLOAD\r
+\1a
\ No newline at end of file

diff --git a/16/wf3d8086/wl_act2.c b/16/wf3d8086/wl_act2.c
index d9d99a0b6d770ba2ae953d3b747d4fc787b4285a..1574c8b4fbcbfbaf6a91d0ad0248a308fa5edd29 100755 (executable)
--- a/16/wf3d8086/wl_act2.c
+++ b/16/wf3d8086/wl_act2.c
@@ -1936,7 +1936,7 @@ void A_Dormant (objtype *ob)
        long    deltax,deltay;\r
        int     xl,xh,yl,yh;\r
        int     x,y;\r
-       unsigned        tile;\r
+       objtype *tile;\r
 \r
        deltax = ob->x - player->x;\r
        if (deltax < -MINACTORDIST || deltax > MINACTORDIST)\r
@@ -1959,7 +1959,7 @@ moveok:
                        tile = actorat[x][y];\r
                        if (!tile)\r
                                continue;\r
-                       if (tile<256)\r
+                       if (tile && tile<objlist)\r
                                return;\r
                        if (((objtype *)tile)->flags&FL_SHOOTABLE)\r
                                return;\r

diff --git a/16/wf3d8086/wl_inter.c b/16/wf3d8086/wl_inter.c
index c74cc9e601e68a27a07b41e9d555efe08e6da3e2..93e363cc34683c4b95e4b62d0b44af937d05e734 100755 (executable)
--- a/16/wf3d8086/wl_inter.c
+++ b/16/wf3d8086/wl_inter.c
@@ -1311,6 +1311,7 @@ void NonShareware(void)
 #endif\r
 #endif\r
 \r
+#if 0\r
 #ifdef SPEAR\r
 #ifndef SPEARDEMO\r
 ////////////////////////////////////////////////////////\r
@@ -1715,4 +1716,5 @@ void CopyProtection(void)
 \r
 #endif // SPEARDEMO\r
 #endif // SPEAR\r
+#endif // 0\r
 //===========================================================================\r

diff --git a/16/wf3d8086/wl_main.c b/16/wf3d8086/wl_main.c
index 5c69e2612ee14e1592f3997467d34e12e83e5b7d..160480247d39d235279b7e39d9fe522d0e36f776 100755 (executable)
--- a/16/wf3d8086/wl_main.c
+++ b/16/wf3d8086/wl_main.c
@@ -1464,11 +1464,13 @@ void    DemoLoop (void)
                #endif\r
                #else\r
 \r
+#if 0\r
                        #ifndef GOODTIMES\r
                        #ifndef SPEARDEMO\r
                        CopyProtection();\r
                        #endif\r
                        #endif\r
+#endif\r
 \r
                #endif\r
                #endif\r

diff --git a/16/wf3d8086/wl_menu.c b/16/wf3d8086/wl_menu.c
index 7d1521cbeb3bedfbd83877b1bac5774bc60bfa45..2003f6e8afb8b1ea82d7d2b4758bc90b4e9645f7 100755 (executable)
--- a/16/wf3d8086/wl_menu.c
+++ b/16/wf3d8086/wl_menu.c
@@ -346,6 +346,7 @@ void US_ControlPanel(byte scancode)
        //\r
        switch(scancode)\r
        {\r
+#ifndef SPEAR\r
                case sc_F1:\r
                        #ifdef SPEAR\r
                        BossKey();\r
@@ -357,7 +358,7 @@ void US_ControlPanel(byte scancode)
                        #endif\r
                        #endif\r
                        goto finishup;\r
-\r
+#endif\r
                case sc_F2:\r
                        CP_SaveGame(0);\r
                        goto finishup;\r

diff --git a/16/wf3d8086/wl_text.c b/16/wf3d8086/wl_text.c
index 1df86b8374fc9bfe73e50524a2802a509b90f6b2..df713f317b6beeea8ec7502fa9e1dd7bea0ef0e7 100755 (executable)
--- a/16/wf3d8086/wl_text.c
+++ b/16/wf3d8086/wl_text.c
@@ -422,11 +422,12 @@ void PageLayout (boolean shownumber)
 // clear the screen\r
 //\r
        VWB_Bar (0,0,320,200,BACKCOLOR);\r
+#ifndef SPEAR\r
        VWB_DrawPic (0,0,H_TOPWINDOWPIC);\r
        VWB_DrawPic (0,8,H_LEFTWINDOWPIC);\r
        VWB_DrawPic (312,8,H_RIGHTWINDOWPIC);\r
        VWB_DrawPic (8,176,H_BOTTOMINFOPIC);\r
-\r
+#endif\r
 \r
        for (i=0;i<TEXTROWS;i++)\r
        {\r
@@ -558,10 +559,12 @@ void CacheLayoutGraphics (void)
                                numpages++;\r
                        if (ch == 'E')          // end of file, so load graphics and return\r
                        {\r
+#ifndef SPEAR\r
                                CA_MarkGrChunk(H_TOPWINDOWPIC);\r
                                CA_MarkGrChunk(H_LEFTWINDOWPIC);\r
                                CA_MarkGrChunk(H_RIGHTWINDOWPIC);\r
                                CA_MarkGrChunk(H_BOTTOMINFOPIC);\r
+#endif\r
                                CA_CacheMarks ();\r
                                text = textstart;\r
                                return;\r

diff --git a/16/wf3d8086/wolf3d.prj b/16/wf3d8086/wolf3d.prj
index 866373e4dbab2ea3eae242adb599d2b7d701bd86..030cd3426588766732a616db95360740aa80746b 100755 (executable)
Binary files a/16/wf3d8086/wolf3d.prj and b/16/wf3d8086/wolf3d.prj differ

diff --git a/16/wf3d8086/wolf3d.sym b/16/wf3d8086/wolf3d.sym
index f84efe17f4f0af1bdabd89f038b691302fbf3570..f232bcf7508e5faa760fbef4f41205010ed70524 100755 (executable)
Binary files a/16/wf3d8086/wolf3d.sym and b/16/wf3d8086/wolf3d.sym differ