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 2af75cd60db6db12b99537c6fadd1af8a04c81c7..561976633d9cdfbb3dfd1940f0d95aeaf0accc32 100644 (file)
--- 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 1c27259ff09c12d62d59a159f985e8372ffa7f62..bc1197d6845fb1ed20d3da0d075823a347e354b2 100644 (file)
--- 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 240b9187d70bc66f500a58ea3f4a834bbe1db42f..3c5a773baad675113f75f9b7e564f4eb8c48dcd9 100644 (file)
--- 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 3d5ec4feb0d0900dd306da8ae13066348888a368..4eb3b9112013e521dce3c5da218142bfa265ec57 100644 (file)
--- 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 2aa42d61ed315f37013f37ce76e7ec7658659587..c43f57407c3da5383679af8bd200f1bd2d3934ef 100644 (file)
--- 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 4b0d99b8fdb167ef533ad9a7f3caf1cd10bc09d7..6e852ae1d70985703bd3f396f5e522bf63fbb34f 100644 (file)
--- 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 3e2298cb80428fc8173f50e9108b801595ed9cb4..a337aa30f3e83db2cd7de94e2833e75639731e17 100644 (file)
--- 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