[patch] various fixes for vavoom-1.21-1

vavoom-1.21.1-misc_fixes.diff (text/plain), 6.20 KB, created by Davide Cendron (RETIRED) on 2006-08-08 06:59:50 UTC

#  Fix AMD64 Vcc compiling issue
--- utils/vcc/vcpp/cpp.h   2006-07-20 23:33:51.000000000 +0200
+++ utils/vcc/vcpp/cpp.h   2006-07-20 23:34:36.000000000 +0200
@@ -155,7 +155,7 @@

 extern "C" {
 extern int creat(char *, int);
-extern int open(char *, int);
+extern int open(char *, int, ...);
 extern int close(int);
 extern int dup2(int, int);
 extern int write(int, const void *, size_t);

# Fix Openal Compiling  error
--- source/s_al.cpp	2006-07-06 20:53:29.000000000 +0200
+++ source/s_al.cpp	2006-07-26 18:46:36.000000000 +0200
@@ -39,6 +39,10 @@
 #include "gamedefs.h"
 #include "s_local.h"
 
+#ifndef AL_VERSION_1_1
+typedef ALchar ALubyte;
+#endif
+
 class VOpenALDevice : public VSoundDevice
 {
 private:
@@ -165,11 +169,11 @@
 	}
 	Z_Free(sbuf);
 
-	if (alIsExtensionPresent((ALubyte *)"EAX"))
+	if (alIsExtensionPresent((ALchar*)"EAX"))
 	{
 		GCon->Log(NAME_Init, "EAX 2.0 supported");
-		pEAXSet = (EAXSet)alGetProcAddress((ALubyte *)"EAXSet");
-		pEAXGet = (EAXGet)alGetProcAddress((ALubyte *)"EAXGet");
+		pEAXSet = (EAXSet)alGetProcAddress((ALchar*)"EAXSet");
+		pEAXGet = (EAXGet)alGetProcAddress((ALchar*)"EAXGet");
 		supportEAX = true;
 	}
 
# Fix GLVIS process error with Hexen IWAD
--- utils/glvis/level.cpp	2006-07-17 20:10:28.000000000 +0200
+++ utils/glvis/level.cpp	2006-08-01 19:04:08.000000000 +0200
@@ -537,6 +537,14 @@
 		subsector_t *sub = &subsectors[line->leaf];
 		if (line->partner)
 		{
+			//	Skip self-referencing subsector segs
+			if (line->leaf == line->partner->leaf)
+			{
+				Owner.DisplayMessage("Self-referencing subsector detected\n");
+				numportals--;
+				continue;
+			}
+
 			// create portal
 			if (sub->numportals == MAX_PORTALS_ON_LEAF)
 				throw GLVisError("Leaf with too many portals");
# Fix StatusBar graphic glitches using default size
--- progs/doom/cgame/StatusBarScreen.vc	2006-06-27 21:46:33.000000000 +0200
+++ progs/doom/cgame/StatusBarScreen.vc	2006-08-08 08:47:27.000000000 +0200
@@ -283,6 +283,14 @@
 {
 	int i;
 
+	// draw something in the blank spaces
+	// check which version of Doom we are playing
+#ifdef DOOM2
+	R_FillRectWithFlat(0, 448, 640, 32, 'grnrock');
+#else
+	R_FillRectWithFlat(0, 448, 640, 32, 'floor7_2');
+#endif
+
 	//  background
 	R_DrawPic(ST_BGX, ST_BGY, pic_bar);
 
--- progs/heretic/cgame/StatusBarScreen.vc	2006-06-27 21:46:40.000000000 +0200
+++ progs/heretic/cgame/StatusBarScreen.vc	2006-08-08 08:47:57.000000000 +0200
@@ -271,6 +271,10 @@
 	int i;
 	int health;
 
+	// draw something in the blank spaces
+	R_FillRectWithFlat(0, 438, 640, 42,
+		!WadLumpPresent('e2m1') ? 'floor04' : 'flat513');
+
 	//  Background
 	R_DrawPic(BAR_X, BAR_Y, pic_barback);
 
--- progs/hexen/cgame/StatusBarScreen.vc	2006-06-27 21:46:46.000000000 +0200
+++ progs/hexen/cgame/StatusBarScreen.vc	2006-08-08 08:46:55.000000000 +0200
@@ -307,6 +307,9 @@
 		sb_health = 100;
 	}
 
+	// draw something in the blank spaces
+	R_FillRectWithFlat(0, 441, 640, 39, 'f_022');
+
 	R_DrawPic(BAR_X + 0, BAR_Y - 27, pic_bar);
 	R_DrawPic(BAR_X + 28 + (((sb_health * 196) / 100) % 9), BAR_Y + 32, pic_chain);
 	R_DrawPic(BAR_X + 7 + ((sb_health * 11) / 5), BAR_Y + 32, pic_lifegem);
--- progs/strife/cgame/StatusBarScreen.vc	2006-06-27 21:47:00.000000000 +0200
+++ progs/strife/cgame/StatusBarScreen.vc	2006-08-08 15:01:04.000000000 +0200
@@ -261,6 +261,9 @@
 	int i;
 	int NumKeys;
 
+	// draw something in the blank spaces
+	R_FillRectWithFlat(0, 448, 640, 32, 'f_pave01');
+
 	//  background
 	R_DrawPic(BAR_X + 0, BAR_Y + 168, pic_invback);
 	R_DrawPic(BAR_X + 0, BAR_Y + 160, pic_invtop);
@@ -430,6 +433,7 @@
 {
 	int Idx;
 	int i;
+	int NumKeys;
 
 	// health
 	SB_DrawTallNum(70, 450, cl.health, 30);
@@ -477,6 +481,86 @@
 	{
 		R_DrawPic2(530, 450, pic_sigil[cl.Sigil], 40);
 	}
+
+	if (bShowWeapons)
+	{
+		R_DrawPic2(BAR_X + 0, BAR_Y + 96, pic_invpbak, 33);
+		R_DrawPic(BAR_X + 0, BAR_Y + 96, pic_invpop);
+		if (cl.WeaponOwned[StrifeDefs::wp_crossbow])
+		{
+			R_DrawPic(BAR_X + 38, BAR_Y + 126, pic_crossbow);
+		}
+		if (cl.WeaponOwned[StrifeDefs::wp_riffle])
+		{
+			R_DrawPic(BAR_X + 40, BAR_Y + 147, pic_riffle);
+		}
+		if (cl.WeaponOwned[StrifeDefs::wp_missile])
+		{
+			R_DrawPic(BAR_X + 39, BAR_Y + 171, pic_missile);
+		}
+		if (cl.WeaponOwned[StrifeDefs::wp_grenade])
+		{
+			R_DrawPic(BAR_X + 78, BAR_Y + 127, pic_grenade);
+		}
+		if (cl.WeaponOwned[StrifeDefs::wp_flame])
+		{
+			R_DrawPic(BAR_X + 80, BAR_Y + 157, pic_flame);
+		}
+		if (cl.WeaponOwned[StrifeDefs::wp_blaster])
+		{
+			R_DrawPic(BAR_X + 75, BAR_Y + 182, pic_blaster);
+		}
+		for (i = 0; i < StrifeDefs::NUMAMMO; i++)
+		{
+			SB_DrawSmallNum(BAR_X + 205, BAR_Y + 40 + AmmoPosY[i], cl.Ammo[i]);
+			SB_DrawSmallNum(BAR_X + 238, BAR_Y + 40 + AmmoPosY[i], cl.MaxAmmo[i] * (cl.Backpack ? 2 : 1));
+		}
+		SB_DrawSmallNum(BAR_X + 267, BAR_Y + 124, cl.Accuracy);
+		SB_DrawSmallNum(BAR_X + 267, BAR_Y + 148, cl.Stamina);
+		NumKeys = 0;
+		for (i = 0; i < StrifeDefs::NUMKEYS; i++)
+		{
+			if (cl.Keys & (1 << i))
+			{
+				NumKeys++;
+			}
+		}
+		SB_DrawSmallNum(BAR_X + 267, BAR_Y + 172, NumKeys);
+		if (cl.Communicator)
+		{
+			R_DrawPic(BAR_X + 280, BAR_Y + 170, pic_i_comm);
+		}
+	}
+	else if (bShowKeys)
+	{
+		R_DrawPic2(BAR_X + 0, BAR_Y + 96, pic_invpbak2, 33);
+		R_DrawPic(BAR_X + 0, BAR_Y + 96, pic_invpop2);
+		for (i = 0; i < 10; i++)
+		{
+			if (cl.Keys & (1 << (i + KeysPage * 10)))
+			{
+				R_DrawPic(BAR_X + 20 + (i / 5) * 140, BAR_Y + 100 + (i % 5) * 18,
+					pic_key[i + KeysPage * 10]);
+				T_SetFont(font_yellow);
+				T_SetAlign(hleft, vtop);
+				T_DrawText(BAR_X + 40 + (i / 5) * 140, BAR_Y + 104 + (i % 5) * 18,
+					KeyNames[i + KeysPage * 10]);
+			}
+		}
+	}
+	else if (bShowObjectives)
+	{
+		R_DrawPic2(BAR_X + 0, BAR_Y + 96, pic_invpbak2, 33);
+		R_DrawPic(BAR_X + 0, BAR_Y + 96, pic_invpop2);
+		if (LoadedLog != cl.Objectives)
+		{
+			LogText = LoadTextLump(StrToName(va("log%d", cl.Objectives)));
+			LoadedLog = cl.Objectives;
+		}
+		T_SetFont(font_yellow);
+		T_SetAlign(hleft, vtop);
+		T_DrawTextW(BAR_X + 20, BAR_Y + 100, LogText, 280);
+	}
 }
 
 //==========================================================================
@@ -502,8 +586,7 @@
 
 void SB_Drawer(int sb_view)
 {
-	if (sb_view != SB_VIEW_FULLSCREEN ||
-		bShowWeapons || bShowKeys || bShowObjectives)
+	if (sb_view != SB_VIEW_FULLSCREEN)
 	{
 		SB_DrawMainBar();
 	}