[ioquake3] 02/10: Imported Upstream version 1.36+u20150730+dfsg1
Simon McVittie
smcv at debian.org
Fri Oct 2 09:20:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository ioquake3.
commit 0fd7b95cd76cedf82b752a11b7c9d4420edb9f87
Author: Simon McVittie <smcv at debian.org>
Date: Sat Aug 1 23:20:40 2015 +0100
Imported Upstream version 1.36+u20150730+dfsg1
---
Makefile | 31 ++++++----------------
code/cgame/cg_servercmds.c | 2 +-
code/client/cl_curl.c | 63 +++++++++++++++++++++++++++++++++------------
code/client/cl_main.c | 7 +----
code/game/bg_pmove.c | 4 +--
code/qcommon/cm_patch.c | 14 ++++++++--
code/qcommon/files.c | 4 ++-
code/qcommon/q_platform.h | 35 ++++---------------------
code/qcommon/vm_x86.c | 20 +++++++++-----
code/renderergl1/tr_image.c | 4 +--
code/renderergl1/tr_light.c | 6 +++++
code/renderergl2/tr_fbo.c | 3 ---
code/renderergl2/tr_image.c | 4 +--
code/renderergl2/tr_light.c | 10 +++----
code/sdl/sdl_gamma.c | 5 +++-
code/sdl/sdl_glimp.c | 24 +++++++++++++----
code/sdl/sdl_input.c | 10 +++----
code/sdl/sdl_snd.c | 2 +-
code/ui/ui_main.c | 12 +++++----
make-macosx-app.sh | 2 +-
20 files changed, 143 insertions(+), 119 deletions(-)
diff --git a/Makefile b/Makefile
index f8ade88..825307f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g')
-COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/x86/)
+COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/x86/ | sed -e 's/^arm.*/arm/')
ifeq ($(COMPILE_PLATFORM),sunos)
# Solaris uname and GNU uname differ
@@ -317,34 +317,18 @@ endif
# SETUP AND BUILD -- LINUX
#############################################################################
-## Defaults
-LIB=lib
-
INSTALL=install
MKDIR=mkdir
EXTRA_FILES=
CLIENT_EXTRA_FILES=
-ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
-
- ifeq ($(ARCH),x86_64)
- LIB=lib64
- else
- ifeq ($(ARCH),ppc64)
- LIB=lib64
- else
- ifeq ($(ARCH),s390x)
- LIB=lib64
- else
- ifeq ($(ARCH),aarch64)
- LIB=lib64
- endif
- endif
- endif
- endif
+ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
+ TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\"
+endif
+ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
- -pipe -DUSE_ICON
+ -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
CLIENT_CFLAGS += $(SDL_CFLAGS)
OPTIMIZEVM = -O3
@@ -824,6 +808,7 @@ else # ifeq netbsd
#############################################################################
ifeq ($(PLATFORM),irix64)
+ LIB=lib
ARCH=mips
@@ -1246,7 +1231,7 @@ release:
CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
ifneq ($(call bin_path, tput),)
- TERM_COLUMNS=$(shell echo $$((`tput cols`-4)))
+ TERM_COLUMNS=$(shell if c=`tput cols`; then echo $$(($$c-4)); else echo 76; fi)
else
TERM_COLUMNS=76
endif
diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 648353b..e863edc 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -326,7 +326,7 @@ static void CG_ConfigStringModified( void ) {
cgs.teamVoteNo[num-CS_TEAMVOTE_NO] = atoi( str );
cgs.teamVoteModified[num-CS_TEAMVOTE_NO] = qtrue;
} else if ( num >= CS_TEAMVOTE_STRING && num <= CS_TEAMVOTE_STRING + 1) {
- Q_strncpyz( cgs.teamVoteString[num-CS_TEAMVOTE_STRING], str, sizeof( cgs.teamVoteString ) );
+ Q_strncpyz( cgs.teamVoteString[num-CS_TEAMVOTE_STRING], str, sizeof( cgs.teamVoteString[0] ) );
#ifdef MISSIONPACK
trap_S_StartLocalSound( cgs.media.voteNow, CHAN_ANNOUNCER );
#endif
diff --git a/code/client/cl_curl.c b/code/client/cl_curl.c
index 901ef99..3519de0 100644
--- a/code/client/cl_curl.c
+++ b/code/client/cl_curl.c
@@ -177,12 +177,20 @@ void CL_cURL_Shutdown( void )
void CL_cURL_Cleanup(void)
{
if(clc.downloadCURLM) {
+ CURLMcode result;
+
if(clc.downloadCURL) {
- qcurl_multi_remove_handle(clc.downloadCURLM,
+ result = qcurl_multi_remove_handle(clc.downloadCURLM,
clc.downloadCURL);
+ if(result != CURLM_OK) {
+ Com_DPrintf("qcurl_multi_remove_handle failed: %s\n", qcurl_multi_strerror(result));
+ }
qcurl_easy_cleanup(clc.downloadCURL);
}
- qcurl_multi_cleanup(clc.downloadCURLM);
+ result = qcurl_multi_cleanup(clc.downloadCURLM);
+ if(result != CURLM_OK) {
+ Com_DPrintf("CL_cURL_Cleanup: qcurl_multi_cleanup failed: %s\n", qcurl_multi_strerror(result));
+ }
clc.downloadCURLM = NULL;
clc.downloadCURL = NULL;
}
@@ -209,8 +217,25 @@ static size_t CL_cURL_CallbackWrite(void *buffer, size_t size, size_t nmemb,
return size*nmemb;
}
+CURLcode qcurl_easy_setopt_warn(CURL *curl, CURLoption option, ...)
+{
+ CURLcode result;
+ va_list args;
+
+ va_start(args, option);
+ result = qcurl_easy_setopt(curl, option, args);
+ va_end(args);
+ if(result != CURLE_OK) {
+ Com_DPrintf("qcurl_easy_setopt failed: %s\n", qcurl_easy_strerror(result));
+ }
+
+ return result;
+}
+
void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
{
+ CURLMcode result;
+
clc.cURLUsed = qtrue;
Com_Printf("URL: %s\n", remoteURL);
Com_DPrintf("***** CL_cURL_BeginDownload *****\n"
@@ -246,23 +271,23 @@ void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
}
if(com_developer->integer)
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_VERBOSE, 1);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_URL, clc.downloadURL);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_TRANSFERTEXT, 0);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_REFERER, va("ioQ3://%s",
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_VERBOSE, 1);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_URL, clc.downloadURL);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_TRANSFERTEXT, 0);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_REFERER, va("ioQ3://%s",
NET_AdrToString(clc.serverAddress)));
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_USERAGENT, va("%s %s",
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_USERAGENT, va("%s %s",
Q3_VERSION, qcurl_version()));
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_WRITEFUNCTION,
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_WRITEFUNCTION,
CL_cURL_CallbackWrite);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_WRITEDATA, &clc.download);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_NOPROGRESS, 0);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_PROGRESSFUNCTION,
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_WRITEDATA, &clc.download);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_NOPROGRESS, 0);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROGRESSFUNCTION,
CL_cURL_CallbackProgress);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_PROGRESSDATA, NULL);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_FAILONERROR, 1);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_FOLLOWLOCATION, 1);
- qcurl_easy_setopt(clc.downloadCURL, CURLOPT_MAXREDIRS, 5);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROGRESSDATA, NULL);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FAILONERROR, 1);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FOLLOWLOCATION, 1);
+ qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_MAXREDIRS, 5);
clc.downloadCURLM = qcurl_multi_init();
if(!clc.downloadCURLM) {
qcurl_easy_cleanup(clc.downloadCURL);
@@ -271,7 +296,13 @@ void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
"failed");
return;
}
- qcurl_multi_add_handle(clc.downloadCURLM, clc.downloadCURL);
+ result = qcurl_multi_add_handle(clc.downloadCURLM, clc.downloadCURL);
+ if(result != CURLM_OK) {
+ qcurl_easy_cleanup(clc.downloadCURL);
+ clc.downloadCURL = NULL;
+ Com_Error(ERR_DROP,"CL_cURL_BeginDownload: qcurl_multi_add_handle() failed: %s", qcurl_multi_strerror(result));
+ return;
+ }
if(!(clc.sv_allowDownload & DLF_NO_DISCONNECT) &&
!clc.cURLDisconnected) {
diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index f411151..43f741f 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -149,7 +149,6 @@ typedef struct serverStatus_s
} serverStatus_t;
serverStatus_t cl_serverStatusList[MAX_SERVERSTATUSREQUESTS];
-int serverStatusCount;
#if defined __USEA3D && defined __A3D_GEOM
void hA3Dg_ExportRenderGeom (refexport_t *incoming_re);
@@ -3866,11 +3865,7 @@ serverStatus_t *CL_GetServerStatus( netadr_t from ) {
oldestTime = cl_serverStatusList[i].startTime;
}
}
- if (oldest != -1) {
- return &cl_serverStatusList[oldest];
- }
- serverStatusCount++;
- return &cl_serverStatusList[serverStatusCount & (MAX_SERVERSTATUSREQUESTS-1)];
+ return &cl_serverStatusList[oldest];
}
/*
diff --git a/code/game/bg_pmove.c b/code/game/bg_pmove.c
index 976a78e..2d0e8cf 100644
--- a/code/game/bg_pmove.c
+++ b/code/game/bg_pmove.c
@@ -483,9 +483,9 @@ static void PM_WaterMove( void ) {
// jump = head for surface
if ( pm->cmd.upmove >= 10 ) {
if (pm->ps->velocity[2] > -300) {
- if ( pm->watertype == CONTENTS_WATER ) {
+ if ( pm->watertype & CONTENTS_WATER ) {
pm->ps->velocity[2] = 100;
- } else if (pm->watertype == CONTENTS_SLIME) {
+ } else if ( pm->watertype & CONTENTS_SLIME ) {
pm->ps->velocity[2] = 80;
} else {
pm->ps->velocity[2] = 50;
diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index 3cd7bca..6f46239 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -876,7 +876,10 @@ void CM_AddFacetBevels( facet_t *facet ) {
}
if ( i == facet->numBorders ) {
- if (facet->numBorders > 4 + 6 + 16) Com_Printf("ERROR: too many bevels\n");
+ if ( facet->numBorders >= 4 + 6 + 16 ) {
+ Com_Printf( "ERROR: too many bevels\n" );
+ continue;
+ }
facet->borderPlanes[facet->numBorders] = CM_FindPlane2(plane, &flipped);
facet->borderNoAdjust[facet->numBorders] = 0;
facet->borderInward[facet->numBorders] = flipped;
@@ -938,7 +941,10 @@ void CM_AddFacetBevels( facet_t *facet ) {
}
if ( i == facet->numBorders ) {
- if (facet->numBorders > 4 + 6 + 16) Com_Printf("ERROR: too many bevels\n");
+ if ( facet->numBorders >= 4 + 6 + 16 ) {
+ Com_Printf( "ERROR: too many bevels\n" );
+ continue;
+ }
facet->borderPlanes[facet->numBorders] = CM_FindPlane2(plane, &flipped);
for ( k = 0 ; k < facet->numBorders ; k++ ) {
@@ -976,6 +982,10 @@ void CM_AddFacetBevels( facet_t *facet ) {
#ifndef BSPC
//add opposite plane
+ if ( facet->numBorders >= 4 + 6 + 16 ) {
+ Com_Printf( "ERROR: too many bevels\n" );
+ return;
+ }
facet->borderPlanes[facet->numBorders] = facet->surfacePlane;
facet->borderNoAdjust[facet->numBorders] = 0;
facet->borderInward[facet->numBorders] = qtrue;
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index eb51faa..376eaad 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -533,7 +533,9 @@ qboolean FS_CreatePath (char *OSPath) {
// Skip creation of the root directory as it will always be there
ofs = strchr( path, PATH_SEP );
- ofs++;
+ if ( ofs != NULL ) {
+ ofs++;
+ }
for (; ofs != NULL && *ofs ; ofs++) {
if (*ofs == PATH_SEP) {
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index e22fc7d..3ed5357 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -185,38 +185,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define PATH_SEP '/'
-#if defined __i386__
-#define ARCH_STRING "x86"
-#elif defined __x86_64__
+#if !defined(ARCH_STRING)
+# error ARCH_STRING should be defined by the Makefile
+#endif
+
+#if defined __x86_64__
#undef idx64
#define idx64 1
-#define ARCH_STRING "x86_64"
-#elif defined __powerpc64__
-#define ARCH_STRING "ppc64"
-#elif defined __powerpc__
-#define ARCH_STRING "ppc"
-#elif defined __s390__
-#define ARCH_STRING "s390"
-#elif defined __s390x__
-#define ARCH_STRING "s390x"
-#elif defined __ia64__
-#define ARCH_STRING "ia64"
-#elif defined __alpha__
-#define ARCH_STRING "alpha"
-#elif defined __sparc__
-#define ARCH_STRING "sparc"
-#elif defined __arm__
-#define ARCH_STRING "arm"
-#elif defined __aarch64__
-#define ARCH_STRING "aarch64"
-#elif defined __cris__
-#define ARCH_STRING "cris"
-#elif defined __hppa__
-#define ARCH_STRING "hppa"
-#elif defined __mips__
-#define ARCH_STRING "mips"
-#elif defined __sh__
-#define ARCH_STRING "sh"
#endif
#if __FLOAT_WORD_ORDER == __BIG_ENDIAN
diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c
index 3ec42ee..9ee2679 100644
--- a/code/qcommon/vm_x86.c
+++ b/code/qcommon/vm_x86.c
@@ -203,19 +203,25 @@ static void EmitRexString(byte rex, const char *string)
#define MASK_REG(modrm, mask) \
- EmitString("81"); \
- EmitString((modrm)); \
- Emit4((mask))
+ do { \
+ EmitString("81"); \
+ EmitString((modrm)); \
+ Emit4((mask)); \
+ } while(0)
// add bl, bytes
#define STACK_PUSH(bytes) \
- EmitString("80 C3"); \
- Emit1(bytes)
+ do { \
+ EmitString("80 C3"); \
+ Emit1(bytes); \
+ } while(0)
// sub bl, bytes
#define STACK_POP(bytes) \
- EmitString("80 EB"); \
- Emit1(bytes)
+ do { \
+ EmitString("80 EB"); \
+ Emit1(bytes); \
+ } while(0)
static void EmitCommand(ELastCommand command)
{
diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index 39f3e57..7905842 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -1555,7 +1555,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// If not a .skin file, load as a single shader
if ( strcmp( name + strlen( name ) - 5, ".skin" ) ) {
skin->numSurfaces = 1;
- skin->surfaces[0] = ri.Hunk_Alloc( sizeof(skin->surfaces[0]), h_low );
+ skin->surfaces[0] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low );
skin->surfaces[0]->shader = R_FindShader( name, LIGHTMAP_NONE, qtrue );
return hSkin;
}
@@ -1626,7 +1626,7 @@ void R_InitSkins( void ) {
skin = tr.skins[0] = ri.Hunk_Alloc( sizeof( skin_t ), h_low );
Q_strncpyz( skin->name, "<default skin>", sizeof( skin->name ) );
skin->numSurfaces = 1;
- skin->surfaces[0] = ri.Hunk_Alloc( sizeof( *skin->surfaces ), h_low );
+ skin->surfaces[0] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low );
skin->surfaces[0]->shader = tr.defaultShader;
}
diff --git a/code/renderergl1/tr_light.c b/code/renderergl1/tr_light.c
index 0d0a5da..80b55f5 100644
--- a/code/renderergl1/tr_light.c
+++ b/code/renderergl1/tr_light.c
@@ -182,6 +182,9 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *ent ) {
data = gridData;
for ( j = 0 ; j < 3 ; j++ ) {
if ( i & (1<<j) ) {
+ if ( pos[j] + 1 > tr.world->lightGridBounds[j] - 1 ) {
+ break; // ignore values outside lightgrid
+ }
factor *= frac[j];
data += gridStep[j];
} else {
@@ -189,6 +192,9 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *ent ) {
}
}
+ if ( j != 3 ) {
+ continue;
+ }
if ( !(data[0]+data[1]+data[2]) ) {
continue; // ignore samples in walls
}
diff --git a/code/renderergl2/tr_fbo.c b/code/renderergl2/tr_fbo.c
index f02e6cc..c8ea0ae 100644
--- a/code/renderergl2/tr_fbo.c
+++ b/code/renderergl2/tr_fbo.c
@@ -47,9 +47,6 @@ qboolean R_CheckFBO(const FBO_t * fbo)
// an error occured
switch (code)
{
- case GL_FRAMEBUFFER_COMPLETE_EXT:
- break;
-
case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
ri.Printf(PRINT_WARNING, "R_CheckFBO: (%s) Unsupported framebuffer format\n", fbo->name);
break;
diff --git a/code/renderergl2/tr_image.c b/code/renderergl2/tr_image.c
index 768cce3..bb5759e 100644
--- a/code/renderergl2/tr_image.c
+++ b/code/renderergl2/tr_image.c
@@ -3120,7 +3120,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// If not a .skin file, load as a single shader
if ( strcmp( name + strlen( name ) - 5, ".skin" ) ) {
skin->numSurfaces = 1;
- skin->surfaces[0] = ri.Hunk_Alloc( sizeof(skin->surfaces[0]), h_low );
+ skin->surfaces[0] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low );
skin->surfaces[0]->shader = R_FindShader( name, LIGHTMAP_NONE, qtrue );
return hSkin;
}
@@ -3191,7 +3191,7 @@ void R_InitSkins( void ) {
skin = tr.skins[0] = ri.Hunk_Alloc( sizeof( skin_t ), h_low );
Q_strncpyz( skin->name, "<default skin>", sizeof( skin->name ) );
skin->numSurfaces = 1;
- skin->surfaces[0] = ri.Hunk_Alloc( sizeof( *skin->surfaces ), h_low );
+ skin->surfaces[0] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low );
skin->surfaces[0]->shader = tr.defaultShader;
}
diff --git a/code/renderergl2/tr_light.c b/code/renderergl2/tr_light.c
index faaa8dd..7d3ed2a 100644
--- a/code/renderergl2/tr_light.c
+++ b/code/renderergl2/tr_light.c
@@ -180,18 +180,15 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *ent, world_t *world ) {
byte *data;
int lat, lng;
vec3_t normal;
- qboolean ignore;
#if idppc
float d0, d1, d2, d3, d4, d5;
#endif
factor = 1.0;
data = gridData;
- ignore = qfalse;
for ( j = 0 ; j < 3 ; j++ ) {
if ( i & (1<<j) ) {
- if ((pos[j] + 1) > world->lightGridBounds[j] - 1)
- {
- ignore = qtrue; // ignore values outside lightgrid
+ if ( pos[j] + 1 > world->lightGridBounds[j] - 1 ) {
+ break; // ignore values outside lightgrid
}
factor *= frac[j];
data += gridStep[j];
@@ -200,8 +197,9 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *ent, world_t *world ) {
}
}
- if ( ignore )
+ if ( j != 3 ) {
continue;
+ }
if (world->hdrLightGrid)
{
diff --git a/code/sdl/sdl_gamma.c b/code/sdl/sdl_gamma.c
index b1af55a..a1e0cb5 100644
--- a/code/sdl/sdl_gamma.c
+++ b/code/sdl/sdl_gamma.c
@@ -88,6 +88,9 @@ void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned
}
}
- SDL_SetWindowGammaRamp(SDL_window, table[0], table[1], table[2]);
+ if (SDL_SetWindowGammaRamp(SDL_window, table[0], table[1], table[2]) < 0)
+ {
+ ri.Printf( PRINT_DEVELOPER, "SDL_SetWindowGammaRamp() failed: %s\n", SDL_GetError() );
+ }
}
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index 16294a8..e7052a0 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -136,11 +136,16 @@ static void GLimp_DetectAvailableModes(void)
SDL_DisplayMode windowMode;
int display = SDL_GetWindowDisplayIndex( SDL_window );
+ if( display < 0 )
+ {
+ ri.Printf( PRINT_WARNING, "Couldn't get window display index, no resolutions detected: %s\n", SDL_GetError() );
+ return;
+ }
numSDLModes = SDL_GetNumDisplayModes( display );
if( SDL_GetWindowDisplayMode( SDL_window, &windowMode ) < 0 || numSDLModes <= 0 )
{
- ri.Printf( PRINT_WARNING, "Couldn't get window display mode, no resolutions detected\n" );
+ ri.Printf( PRINT_WARNING, "Couldn't get window display mode, no resolutions detected: %s\n", SDL_GetError() );
return;
}
@@ -245,9 +250,15 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder)
// If a window exists, note its display index
if( SDL_window != NULL )
+ {
display = SDL_GetWindowDisplayIndex( SDL_window );
+ if( display < 0 )
+ {
+ ri.Printf( PRINT_DEVELOPER, "SDL_GetWindowDisplayIndex() failed: %s\n", SDL_GetError() );
+ }
+ }
- if( SDL_GetDesktopDisplayMode( display, &desktopMode ) == 0 )
+ if( display >= 0 && SDL_GetDesktopDisplayMode( display, &desktopMode ) == 0 )
{
displayAspect = (float)desktopMode.w / (float)desktopMode.h;
@@ -435,7 +446,7 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder)
#endif
if( ( SDL_window = SDL_CreateWindow( CLIENT_WINDOW_TITLE, x, y,
- glConfig.vidWidth, glConfig.vidHeight, flags ) ) == 0 )
+ glConfig.vidWidth, glConfig.vidHeight, flags ) ) == NULL )
{
ri.Printf( PRINT_DEVELOPER, "SDL_CreateWindow failed: %s\n", SDL_GetError( ) );
continue;
@@ -476,7 +487,10 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder)
qglClear( GL_COLOR_BUFFER_BIT );
SDL_GL_SwapWindow( SDL_window );
- SDL_GL_SetSwapInterval( r_swapInterval->integer );
+ if( SDL_GL_SetSwapInterval( r_swapInterval->integer ) == -1 )
+ {
+ ri.Printf( PRINT_DEVELOPER, "SDL_GL_SetSwapInterval failed: %s\n", SDL_GetError( ) );
+ }
glConfig.colorBits = testColorBits;
glConfig.depthBits = testDepthBits;
@@ -516,7 +530,7 @@ static qboolean GLimp_StartDriverAndSetMode(int mode, qboolean fullscreen, qbool
{
const char *driverName;
- if (SDL_Init(SDL_INIT_VIDEO) == -1)
+ if (SDL_Init(SDL_INIT_VIDEO) != 0)
{
ri.Printf( PRINT_ALL, "SDL_Init( SDL_INIT_VIDEO ) FAILED (%s)\n", SDL_GetError());
return qfalse;
diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 4869d28..2afa2c1 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -327,7 +327,7 @@ static void IN_ActivateMouse( void )
if( !mouseActive )
{
SDL_SetRelativeMouseMode( SDL_TRUE );
- SDL_SetWindowGrab( SDL_window, 1 );
+ SDL_SetWindowGrab( SDL_window, SDL_TRUE );
IN_GobbleMotionEvents( );
}
@@ -338,9 +338,9 @@ static void IN_ActivateMouse( void )
if( in_nograb->modified || !mouseActive )
{
if( in_nograb->integer )
- SDL_SetWindowGrab( SDL_window, 0 );
+ SDL_SetWindowGrab( SDL_window, SDL_FALSE );
else
- SDL_SetWindowGrab( SDL_window, 1 );
+ SDL_SetWindowGrab( SDL_window, SDL_TRUE );
in_nograb->modified = qfalse;
}
@@ -371,7 +371,7 @@ static void IN_DeactivateMouse( void )
{
IN_GobbleMotionEvents( );
- SDL_SetWindowGrab( SDL_window, 0 );
+ SDL_SetWindowGrab( SDL_window, SDL_FALSE );
SDL_SetRelativeMouseMode( SDL_FALSE );
// Don't warp the mouse unless the cursor is within the window
@@ -437,7 +437,7 @@ static void IN_InitJoystick( void )
if (!SDL_WasInit(SDL_INIT_JOYSTICK))
{
Com_DPrintf("Calling SDL_Init(SDL_INIT_JOYSTICK)...\n");
- if (SDL_Init(SDL_INIT_JOYSTICK) == -1)
+ if (SDL_Init(SDL_INIT_JOYSTICK) != 0)
{
Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) failed: %s\n", SDL_GetError());
return;
diff --git a/code/sdl/sdl_snd.c b/code/sdl/sdl_snd.c
index 710c036..609aed9 100644
--- a/code/sdl/sdl_snd.c
+++ b/code/sdl/sdl_snd.c
@@ -156,7 +156,7 @@ qboolean SNDDMA_Init(void)
if (!SDL_WasInit(SDL_INIT_AUDIO))
{
- if (SDL_Init(SDL_INIT_AUDIO) == -1)
+ if (SDL_Init(SDL_INIT_AUDIO) != 0)
{
Com_Printf( "FAILED (%s)\n", SDL_GetError( ) );
return qfalse;
diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
index c8d5cf2..a33371d 100644
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@@ -4567,6 +4567,11 @@ static qboolean Team_Parse(char **p) {
}
if (token[0] == '{') {
+ if (uiInfo.teamCount == MAX_TEAMS) {
+ uiInfo.teamCount--;
+ Com_Printf("Too many teams, last team replaced!\n");
+ }
+
// seven tokens per line, team name and icon, and 5 team member names
if (!String_Parse(p, &uiInfo.teamList[uiInfo.teamCount].teamName) || !String_Parse(p, &tempStr)) {
return qfalse;
@@ -4588,11 +4593,8 @@ static qboolean Team_Parse(char **p) {
}
Com_Printf("Loaded team %s with team icon %s.\n", uiInfo.teamList[uiInfo.teamCount].teamName, tempStr);
- if (uiInfo.teamCount < MAX_TEAMS) {
- uiInfo.teamCount++;
- } else {
- Com_Printf("Too many teams, last team replaced!\n");
- }
+ uiInfo.teamCount++;
+
token = COM_ParseExt(p, qtrue);
if (token[0] != '}') {
return qfalse;
diff --git a/make-macosx-app.sh b/make-macosx-app.sh
index 7e484dd..00a92f0 100755
--- a/make-macosx-app.sh
+++ b/make-macosx-app.sh
@@ -42,7 +42,7 @@ if [ "$2" != "" ]; then
elif [ "$2" == "ppc" ]; then
CURRENT_ARCH="ppc"
else
- echo "Invalid architecture: $1"
+ echo "Invalid architecture: $2"
echo "Valid architectures are:"
echo " x86"
echo " x86_64"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git
More information about the Pkg-games-commits
mailing list