diff -r a326c662d4ac src/game/bg_alloc.c --- a/src/game/bg_alloc.c Tue May 13 11:37:25 2008 +0200 +++ b/src/game/bg_alloc.c Fri May 16 22:10:01 2008 +0200 @@ -50,11 +50,11 @@ // Does two passes, attempts to fill same-sized free slot first. freeMemNode_t *fmn, *prev, *next, *smallest; - int allocsize, smallestsize; + size_t allocsize, smallestsize; char *endptr; int *ptr; - allocsize = ( size + sizeof(int) + ROUNDBITS ) & ~ROUNDBITS; // Round to 32-byte boundary + allocsize = ((size_t)( size + sizeof(int) + ROUNDBITS )) & ~ROUNDBITS; // Round to 32-byte boundary ptr = NULL; smallest = NULL; diff -r a326c662d4ac src/game/g_admin.c --- a/src/game/g_admin.c Tue May 13 11:37:25 2008 +0200 +++ b/src/game/g_admin.c Fri May 16 22:10:01 2008 +0200 @@ -842,7 +842,7 @@ if( g_admin_levels[ j ]->level == l ) { G_DecolorString( g_admin_levels[ j ]->name, lname ); - Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%is", + Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%zds", ( admin_level_maxname + strlen( g_admin_levels[ j ]->name ) - strlen( lname ) ) ); Com_sprintf( lname, sizeof( lname ), lname_fmt, @@ -900,7 +900,7 @@ if( g_admin_levels[ j ]->level == g_admin_admins[ i ]->level ) { G_DecolorString( g_admin_levels[ j ]->name, lname ); - Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%is", + Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%zds", ( admin_level_maxname + strlen( g_admin_levels[ j ]->name ) - strlen( lname ) ) ); Com_sprintf( lname, sizeof( lname ), lname_fmt, @@ -927,7 +927,7 @@ if( g_admin_levels[ j ]->level == g_admin_admins[ i ]->level ) { G_DecolorString( g_admin_levels[ j ]->name, lname ); - Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%is", + Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%zds", ( admin_level_maxname + strlen( g_admin_levels[ j ]->name ) - strlen( lname ) ) ); Com_sprintf( lname, sizeof( lname ), lname_fmt, @@ -2679,7 +2679,7 @@ if( *lname ) { G_DecolorString( lname, lname2 ); - Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%is", + Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%zds", ( admin_level_maxname + strlen( lname ) - strlen( lname2 ) ) ); Com_sprintf( lname2, sizeof( lname2 ), lname_fmt, lname ); } @@ -2859,12 +2859,12 @@ G_admin_duration( secs, duration, sizeof( duration ) ); G_DecolorString( g_admin_bans[ i ]->name, n1 ); - Com_sprintf( name_fmt, sizeof( name_fmt ), "%%%is", + Com_sprintf( name_fmt, sizeof( name_fmt ), "%%%zds", ( max_name + strlen( g_admin_bans[ i ]->name ) - strlen( n1 ) ) ); Com_sprintf( n1, sizeof( n1 ), name_fmt, g_admin_bans[ i ]->name ); G_DecolorString( g_admin_bans[ i ]->banner, n2 ); - Com_sprintf( banner_fmt, sizeof( banner_fmt ), "%%%is", + Com_sprintf( banner_fmt, sizeof( banner_fmt ), "%%%zds", ( max_banner + strlen( g_admin_bans[ i ]->banner ) - strlen( n2 ) ) ); Com_sprintf( n2, sizeof( n2 ), banner_fmt, g_admin_bans[ i ]->banner ); @@ -3253,7 +3253,7 @@ return qfalse; } - trap_SendConsoleCommand( EXEC_APPEND,va( "!setlevel %d %d;",ent - g_entities, level) ); + trap_SendConsoleCommand( EXEC_APPEND,va( "!setlevel %ld %d;",ent - g_entities, level) ); ClientUserinfoChanged( ent - g_entities ); AP( va( "print \"^3!register: ^7%s^7 is now a protected nickname.\n\"", ent->client->pers.netname) ); @@ -3288,7 +3288,7 @@ { return qfalse; } - trap_SendConsoleCommand( EXEC_APPEND,va( "!setlevel %d %d;",ent - g_entities, level) ); + trap_SendConsoleCommand( EXEC_APPEND,va( "!setlevel %ld %d;",ent - g_entities, level) ); ClientUserinfoChanged( ent - g_entities ); AP( va( "print \"^3!register: ^7%s^7 is now a protected nickname.\n\"", ent->client->pers.netname) ); @@ -4014,7 +4014,7 @@ Com_sprintf( argbuf, sizeof argbuf, "%s%s%s%s%s%s%s!", ( repeat > 1 ) ? "x" : "", ( repeat > 1 ) ? va( "%d ", repeat ) : "", ( ID ) ? "#" : "", ( ID ) ? va( "%d ", ptr->ID ) : "", - ( builder ) ? "-" : "", ( builder ) ? va( "%d ", builder - g_entities ) : "", + ( builder ) ? "-" : "", ( builder ) ? va( "%ld ", builder - g_entities ) : "", ( team == TEAM_ALIENS ) ? "a " : ( team == TEAM_HUMANS ) ? "h " : "" ); ADMP( va( "^3!revert: ^7revert aborted: reverting this %s would conflict with " "another buildable, use ^3!revert %s ^7to override\n", action, argbuf ) ); @@ -4042,7 +4042,7 @@ Com_sprintf( argbuf, sizeof argbuf, "%s%s%s%s%s%s%s!", ( repeat > 1 ) ? "x" : "", ( repeat > 1 ) ? va( "%d ", repeat ) : "", ( ID ) ? "#" : "", ( ID ) ? va( "%d ", ptr->ID ) : "", - ( builder ) ? "-" : "", ( builder ) ? va( "%d ", builder - g_entities ) : "", + ( builder ) ? "-" : "", ( builder ) ? va( "%ld ", builder - g_entities ) : "", ( team == TEAM_ALIENS ) ? "a " : ( team == TEAM_HUMANS ) ? "h " : "" ); ADMP( va( "^3!revert: ^7revert aborted: reverting this %s would " "conflict with another buildable, use ^3!revert %s ^7to override\n", diff -r a326c662d4ac src/game/g_cmds.c --- a/src/game/g_cmds.c Tue May 13 11:37:25 2008 +0200 +++ b/src/game/g_cmds.c Fri May 16 22:10:01 2008 +0200 @@ -1250,12 +1250,12 @@ case VOICE_CHAN_ALL: case VOICE_CHAN_LOCAL: trap_SendServerCommand( -1, va( - "voice %d %d %d %d \"%s\"\n", + "voice %ld %d %d %d \"%s\"\n", ent-g_entities, vchan, cmdNum, trackNum, arg ) ); break; case VOICE_CHAN_TEAM: G_TeamCommand( ent->client->pers.teamSelection, va( - "voice %d %d %d %d \"%s\"\n", + "voice %ld %d %d %d \"%s\"\n", ent-g_entities, vchan, cmdNum, trackNum, arg ) ); break; default: @@ -3882,7 +3882,7 @@ Q_strcat( str, sizeof( str ), "^7, " ); Q_strcat( str, sizeof( str ), tmpent->client->pers.netname ); trap_SendServerCommand( pids[ i ], va( - "chat \"%s^%c -> ^7%s^7: (%d recipients): ^%c%s^7\" %i", + "chat \"%s^%c -> ^7%s^7: (%d recipients): ^%c%s^7\" %ld", ( ent ) ? ent->client->pers.netname : "Console", color, name, diff -r a326c662d4ac src/game/g_local.h --- a/src/game/g_local.h Tue May 13 11:37:25 2008 +0200 +++ b/src/game/g_local.h Fri May 16 22:10:01 2008 +0200 @@ -1110,7 +1110,7 @@ extern level_locals_t level; extern gentity_t g_entities[ MAX_GENTITIES ]; -#define FOFS(x) ((int)&(((gentity_t *)0)->x)) +#define FOFS(x) ((long)&(((gentity_t *)0)->x)) extern vmCvar_t g_dedicated; extern vmCvar_t g_cheats; diff -r a326c662d4ac src/game/g_session.c --- a/src/game/g_session.c Tue May 13 11:37:25 2008 +0200 +++ b/src/game/g_session.c Fri May 16 22:10:01 2008 +0200 @@ -54,7 +54,7 @@ BG_ClientListString( &client->sess.ignoreList ) ); - var = va( "session%i", client - level.clients ); + var = va( "session%ld", client - level.clients ); trap_Cvar_Set( var, s ); } @@ -73,7 +73,7 @@ int spectatorState; int restartTeam; - var = va( "session%i", client - level.clients ); + var = va( "session%ld", client - level.clients ); trap_Cvar_VariableStringBuffer( var, s, sizeof(s) ); // FIXME: should be using BG_ClientListParse() for ignoreList, but diff -r a326c662d4ac src/tools/lcc/cpp/tokens.c --- a/src/tools/lcc/cpp/tokens.c Tue May 13 11:37:25 2008 +0200 +++ b/src/tools/lcc/cpp/tokens.c Fri May 16 22:10:01 2008 +0200 @@ -267,7 +267,7 @@ if (str) fprintf(stderr, "%s ", str); if (tpbp || tp>trp->lp) - fprintf(stderr, "(tp offset %d) ", tp-trp->bp); + fprintf(stderr, "(tp offset %ld) ", tp-trp->bp); for (tp=trp->bp; tplp && tpbp+32; tp++) { if (tp->type!=NL) { int c = tp->t[tp->len];