fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync a few minor stuff with uhexen2 svn 

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1132 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2014-10-30 18:00:06 +00:00
parent 6763f8138c
commit 5795242b39
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quakespasm/Quake/gl_vidsdl.c
View File

@ -466,7 +466,7 @@ static qboolean VID_ValidMode (int width, int height, int bpp, qboolean fullscre
VID_SetMode VID_SetMode
================ ================
*/ */
static int VID_SetMode (int width, int height, int bpp, qboolean fullscreen) static qboolean VID_SetMode (int width, int height, int bpp, qboolean fullscreen)
{ {
int temp; int temp;
Uint32 flags; Uint32 flags;

6
quakespasm/Quake/net_sys.h
View File

@ -105,11 +105,15 @@ typedef int sys_socket_t;
#define SOCKET_ERROR (-1) #define SOCKET_ERROR (-1)
#if !(defined(__AROS__) || defined(__amigaos4__)) #if !(defined(__AROS__) || defined(__amigaos4__))
typedef int socklen_t; typedef LONG socklen_t; /* int32_t */
#endif #endif
#if !defined(__amigaos4__) #if !defined(__amigaos4__)
#if (LONG_MAX <= 2147483647L)
typedef unsigned long in_addr_t; /* u_int32_t */
#else
typedef unsigned int in_addr_t; /* u_int32_t */ typedef unsigned int in_addr_t; /* u_int32_t */
#endif #endif
#endif
#define SOCKETERRNO Errno() #define SOCKETERRNO Errno()
#define ioctlsocket IoctlSocket #define ioctlsocket IoctlSocket

2
quakespasm/Quake/quakedef.h
View File

@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// !!! if this is changed, it must be changed in d_ifacea.h too !!! // !!! if this is changed, it must be changed in d_ifacea.h too !!!
#define CACHE_SIZE 32 // used to align key data structures #define CACHE_SIZE 32 // used to align key data structures
#define UNUSED(x) (x = x) // for pesky compiler / lint warnings #define Q_UNUSED(x) (x = x) // for pesky compiler / lint warnings
#define MINIMUM_MEMORY 0x550000 #define MINIMUM_MEMORY 0x550000
#define MINIMUM_MEMORY_LEVELPAK (MINIMUM_MEMORY + 0x100000) #define MINIMUM_MEMORY_LEVELPAK (MINIMUM_MEMORY + 0x100000)

3
quakespasm/Quake/snd_vorbis.c
View File

@ -56,7 +56,7 @@ static int ovc_fseek (void *f, ogg_int64_t off, int whence)
return FS_fseek((fshandle_t *)f, (long) off, whence); return FS_fseek((fshandle_t *)f, (long) off, whence);
} }
static const ov_callbacks ovc_qfs = static ov_callbacks ovc_qfs =
{ {
(size_t (*)(void *, size_t, size_t, void *)) FS_fread, (size_t (*)(void *, size_t, size_t, void *)) FS_fread,
(int (*)(void *, ogg_int64_t, int)) ovc_fseek, (int (*)(void *, ogg_int64_t, int)) ovc_fseek,
@ -169,7 +169,6 @@ static int S_VORBIS_CodecReadStream (snd_stream_t *stream, int bytes, void *buff
if (res < 0) if (res < 0)
return res; return res;
return cnt; return cnt;
} }