From: dabb <dabb@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 24 Aug 2000 07:17:27 +0000 (+0000)
Subject: Borland C++ compile fixes.
X-Git-Tag: RELEASE_0_2_0_RC1~1008
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=85c8ba9ec06127c46afc95ac0101bd154bd90fb0

Borland C++ compile fixes.


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 2af75cd6..56197663 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-int			skytexturenum;
+extern int                     skytexturenum;
 
 int		lightmap_textures;
 
@@ -83,7 +83,7 @@ void R_AddDynamicLights (msurface_t *surf)
 	float		dist, f;
 	vec3_t		impact, local;
 	// use 64bit integer...  shame it's not very standardized...
-#if _MSC_VER
+#if _MSC_VER || __BORLANDC__
 	__int64		k; // MSVC
 #else
 	long long	k; // GCC
diff --git a/gl_screen.c b/gl_screen.c
index 1c27259f..bc1197d6 100644
--- a/gl_screen.c
+++ b/gl_screen.c
@@ -104,9 +104,9 @@ int			scr_fullupdate;
 int			clearconsole;
 int			clearnotify;
 
-int			sb_lines;
+extern int                     sb_lines;
 
-viddef_t	vid;				// global video state
+extern viddef_t        vid;                            // global video state
 
 vrect_t		scr_vrect;
 
diff --git a/net_wins.c b/net_wins.c
index 240b9187..3c5a773b 100644
--- a/net_wins.c
+++ b/net_wins.c
@@ -398,11 +398,12 @@ int WINS_Read (int socket, byte *buf, int len, struct qsockaddr *addr)
 {
 	int addrlen = sizeof (struct qsockaddr);
 	int ret;
+	int errno;
 
 	ret = precvfrom (socket, buf, len, 0, (struct sockaddr *)addr, &addrlen);
 	if (ret == -1)
 	{
-		int errno = pWSAGetLastError();
+		 errno = pWSAGetLastError();
 
 		if (errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED)
 			return 0;
diff --git a/net_wipx.c b/net_wipx.c
index 3d5ec4fe..4eb3b911 100644
--- a/net_wipx.c
+++ b/net_wipx.c
@@ -239,11 +239,12 @@ int WIPX_Read (int handle, byte *buf, int len, struct qsockaddr *addr)
 	int addrlen = sizeof (struct qsockaddr);
 	int socket = ipxsocket[handle];
 	int ret;
+	int errno;
 
 	ret = precvfrom (socket, packetBuffer, len+4, 0, (struct sockaddr *)addr, &addrlen);
 	if (ret == -1)
 	{
-		int errno = pWSAGetLastError();
+		errno = pWSAGetLastError();
 
 		if (errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED)
 			return 0;
@@ -350,13 +351,14 @@ int WIPX_StringToAddr (char *string, struct qsockaddr *addr)
 
 int WIPX_GetSocketAddr (int handle, struct qsockaddr *addr)
 {
+	int errno;
 	int socket = ipxsocket[handle];
 	int addrlen = sizeof(struct qsockaddr);
 
 	memset(addr, 0, sizeof(struct qsockaddr));
 	if(pgetsockname(socket, (struct sockaddr *)addr, &addrlen) != 0)
 	{
-		int errno = pWSAGetLastError();
+		errno = pWSAGetLastError();
 	}
 
 	return 0;
diff --git a/snd_win.c b/snd_win.c
index 2aa42d61..c43f5740 100644
--- a/snd_win.c
+++ b/snd_win.c
@@ -66,9 +66,8 @@ LPDIRECTSOUNDBUFFER pDSBuf, pDSPBuf;
 
 HINSTANCE hInstDS;
 
-qboolean SNDDMA_InitDirect (void);
 qboolean SNDDMA_InitWav (void);
-
+sndinitstat SNDDMA_InitDirect (void);
 
 /*
 ==================
@@ -554,7 +553,7 @@ Returns false if nothing is found.
 ==================
 */
 
-int SNDDMA_Init(void)
+qboolean SNDDMA_Init(void)
 {
 	sndinitstat	stat;
 
diff --git a/sv_phys.c b/sv_phys.c
index 4b0d99b8..6e852ae1 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -386,7 +386,7 @@ void SV_AddGravity (edict_t *ent)
 	eval_t	*val;
 
 	val = GETEDICTFIELDVALUE(ent, eval_gravity);
-	if (val && val->_float)
+	if (val!=0 && val->_float)
 		ent_gravity = val->_float;
 	else
 		ent_gravity = 1.0;
diff --git a/world.c b/world.c
index 3e2298cb..a337aa30 100644
--- a/world.c
+++ b/world.c
@@ -861,7 +861,7 @@ loc0:
 		|| clip->boxmaxs[2] < touch->v.absmin[2] )
 			continue;
 
-		if (clip->passedict && clip->passedict->v.size[0] && !touch->v.size[0])
+		if (clip->passedict!=0 && clip->passedict->v.size[0] && !touch->v.size[0])
 			continue;	// points never interact
 
 	// might intersect, so do an exact clip