From: sparky4 <sparky4@cock.li>
Date: Mon, 14 Nov 2022 15:34:13 +0000 (-0600)
Subject: added bug fixes to the 8086 port of wolf3d
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=e8708918d29a425379a2c93ccc4ae0c974741338;p=16.git

added bug fixes to the 8086 port of wolf3d
---

diff --git a/16/sod8086/WOLF3D.SYM b/16/sod8086/WOLF3D.SYM
index 734c687d..c77883ee 100755
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
index 00000000..b1a67883
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
index 00000000..b964b80b
--- /dev/null
+++ b/16/sod8086/sodver.h
@@ -0,0 +1,7 @@
+#define SPEAR
+#define ARTSEXTERN
+#define DEMOSEXTERN
+#define CARMACIZED
+//#define MYPROFILE
+//#define DEBCHECK
+//#define UPLOAD
diff --git a/16/sod8086/wolf3d.dsk b/16/sod8086/wolf3d.dsk
index 9e466efe..33fcea09 100755
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 6ce1e0c7..9d524549 100755
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 f84efe17..f232bcf7 100755
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
index 00000000..05abb0e5
--- /dev/null
+++ b/16/wf3d8086/wf3dver.h
@@ -0,0 +1,10 @@
+//#define SPEAR
+//#define JAPAN
+#define GOODTIMES
+#define ARTSEXTERN
+#define DEMOSEXTERN
+//#define MYPROFILE
+//#define DEBCHECK
+#define CARMACIZED
+//#define UPLOAD
+
\ No newline at end of file
diff --git a/16/wf3d8086/wl_act2.c b/16/wf3d8086/wl_act2.c
index d9d99a0b..1574c8b4 100755
--- a/16/wf3d8086/wl_act2.c
+++ b/16/wf3d8086/wl_act2.c
@@ -1936,7 +1936,7 @@ void A_Dormant (objtype *ob)
 	long	deltax,deltay;
 	int	xl,xh,yl,yh;
 	int	x,y;
-	unsigned	tile;
+	objtype	*tile;
 
 	deltax = ob->x - player->x;
 	if (deltax < -MINACTORDIST || deltax > MINACTORDIST)
@@ -1959,7 +1959,7 @@ moveok:
 			tile = actorat[x][y];
 			if (!tile)
 				continue;
-			if (tile<256)
+			if (tile && tile<objlist)
 				return;
 			if (((objtype *)tile)->flags&FL_SHOOTABLE)
 				return;
diff --git a/16/wf3d8086/wl_inter.c b/16/wf3d8086/wl_inter.c
index c74cc9e6..93e363cc 100755
--- a/16/wf3d8086/wl_inter.c
+++ b/16/wf3d8086/wl_inter.c
@@ -1311,6 +1311,7 @@ void NonShareware(void)
 #endif
 #endif
 
+#if 0
 #ifdef SPEAR
 #ifndef SPEARDEMO
 ////////////////////////////////////////////////////////
@@ -1715,4 +1716,5 @@ void CopyProtection(void)
 
 #endif // SPEARDEMO
 #endif // SPEAR
+#endif // 0
 //===========================================================================
diff --git a/16/wf3d8086/wl_main.c b/16/wf3d8086/wl_main.c
index 5c69e261..16048024 100755
--- a/16/wf3d8086/wl_main.c
+++ b/16/wf3d8086/wl_main.c
@@ -1464,11 +1464,13 @@ void    DemoLoop (void)
 		#endif
 		#else
 
+#if 0
 			#ifndef GOODTIMES
 			#ifndef SPEARDEMO
 			CopyProtection();
 			#endif
 			#endif
+#endif
 
 		#endif
 		#endif
diff --git a/16/wf3d8086/wl_menu.c b/16/wf3d8086/wl_menu.c
index 7d1521cb..2003f6e8 100755
--- a/16/wf3d8086/wl_menu.c
+++ b/16/wf3d8086/wl_menu.c
@@ -346,6 +346,7 @@ void US_ControlPanel(byte scancode)
 	//
 	switch(scancode)
 	{
+#ifndef SPEAR
 		case sc_F1:
 			#ifdef SPEAR
 			BossKey();
@@ -357,7 +358,7 @@ void US_ControlPanel(byte scancode)
 			#endif
 			#endif
 			goto finishup;
-
+#endif
 		case sc_F2:
 			CP_SaveGame(0);
 			goto finishup;
diff --git a/16/wf3d8086/wl_text.c b/16/wf3d8086/wl_text.c
index 1df86b83..df713f31 100755
--- a/16/wf3d8086/wl_text.c
+++ b/16/wf3d8086/wl_text.c
@@ -422,11 +422,12 @@ void PageLayout (boolean shownumber)
 // clear the screen
 //
 	VWB_Bar (0,0,320,200,BACKCOLOR);
+#ifndef SPEAR
 	VWB_DrawPic (0,0,H_TOPWINDOWPIC);
 	VWB_DrawPic (0,8,H_LEFTWINDOWPIC);
 	VWB_DrawPic (312,8,H_RIGHTWINDOWPIC);
 	VWB_DrawPic (8,176,H_BOTTOMINFOPIC);
-
+#endif
 
 	for (i=0;i<TEXTROWS;i++)
 	{
@@ -558,10 +559,12 @@ void CacheLayoutGraphics (void)
 				numpages++;
 			if (ch == 'E')		// end of file, so load graphics and return
 			{
+#ifndef SPEAR
 				CA_MarkGrChunk(H_TOPWINDOWPIC);
 				CA_MarkGrChunk(H_LEFTWINDOWPIC);
 				CA_MarkGrChunk(H_RIGHTWINDOWPIC);
 				CA_MarkGrChunk(H_BOTTOMINFOPIC);
+#endif
 				CA_CacheMarks ();
 				text = textstart;
 				return;
diff --git a/16/wf3d8086/wolf3d.prj b/16/wf3d8086/wolf3d.prj
index 866373e4..030cd342 100755
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 f84efe17..f232bcf7 100755
Binary files a/16/wf3d8086/wolf3d.sym and b/16/wf3d8086/wolf3d.sym differ