Index: src/game/g_svcmds.c =================================================================== --- src/game/g_svcmds.c (revision 2065) +++ src/game/g_svcmds.c (working copy) @@ -161,7 +161,7 @@ trap_GetUserinfo( i, userinfo, sizeof( userinfo ) ); G_Printf( "%-21s ", Info_ValueForKey( userinfo, "ip" ) ); - G_Printf( "%-8d ", Info_ValueForKey( userinfo, "rate" ) ); + G_Printf( "%-8d ", (int)(intptr_t)Info_ValueForKey( userinfo, "rate" ) ); G_Printf( "%s\n", cl->pers.netname ); // Info_ValueForKey( userinfo, "name" ) } } Index: src/game/g_combat.c =================================================================== --- src/game/g_combat.c (revision 2065) +++ src/game/g_combat.c (working copy) @@ -270,7 +270,7 @@ else obit = modNames[ meansOfDeath ]; - G_LogPrintf( "Die: %d %d %s: %s" S_COLOR_WHITE " killed %s\n", + G_LogPrintf( "Die: %d %ld %s: %s" S_COLOR_WHITE " killed %s\n", killer, self - g_entities, obit, @@ -1405,7 +1405,7 @@ if( mod == MOD_REPLACE ) return; - G_LogPrintf( S_COLOR_YELLOW "Deconstruct: %d %d %s %s: %s %s by %s\n", + G_LogPrintf( S_COLOR_YELLOW "Deconstruct: %ld %ld %s %s: %s %s by %s\n", actor - g_entities, self - g_entities, BG_Buildable( self->s.modelindex )->name, Index: src/game/g_session.c =================================================================== --- src/game/g_session.c (revision 2065) +++ src/game/g_session.c (working copy) @@ -54,7 +54,7 @@ Com_ClientListString( &client->sess.ignoreList ) ); - var = va( "session%i", client - level.clients ); + var = va( "session%ld", client - level.clients ); trap_Cvar_Set( var, s ); } @@ -74,7 +74,7 @@ int restartTeam; char ignorelist[ 17 ]; - var = va( "session%i", client - level.clients ); + var = va( "session%ld", client - level.clients ); trap_Cvar_VariableStringBuffer( var, s, sizeof(s) ); sscanf( s, "%i %i %i %i %16s", Index: src/game/g_buildable.c =================================================================== --- src/game/g_buildable.c (revision 2065) +++ src/game/g_buildable.c (working copy) @@ -2982,7 +2982,7 @@ removalCounts[ bNum ]++; if( nums ) - Q_strcat( nums, nsize, va( " %d", ent - g_entities ) ); + Q_strcat( nums, nsize, va( " %ld", ent - g_entities ) ); G_FreeEntity( ent ); } @@ -3663,7 +3663,7 @@ builder->client->pers.netname, ( readable[ 0 ] ) ? "^7, ^3replacing^7 " : "", readable ) ); - G_LogPrintf( "Construct: %d %d %s%s: %s" S_COLOR_WHITE " is building " + G_LogPrintf( "Construct: %ld %ld %s%s: %s" S_COLOR_WHITE " is building " "%s%s%s\n", builder - g_entities, built - g_entities, @@ -4220,7 +4220,7 @@ built->buildTime = built->s.time = 0; G_KillBox( built ); - G_LogPrintf( "revert: restore %d %s\n", + G_LogPrintf( "revert: restore %ld %s\n", built - g_entities, BG_Buildable( built->s.modelindex )->name ); G_FreeEntity( ent ); @@ -4253,7 +4253,7 @@ if( VectorLengthSquared( dist ) > 2.0f ) continue; - G_LogPrintf( "revert: remove %d %s\n", + G_LogPrintf( "revert: remove %ld %s\n", ent - g_entities, BG_Buildable( ent->s.modelindex )->name ); G_FreeEntity( ent ); break; Index: src/game/g_main.c =================================================================== --- src/game/g_main.c (revision 2065) +++ src/game/g_main.c (working copy) @@ -1640,7 +1640,7 @@ char string[ 1024 ]; int i; - Com_sprintf( string, sizeof( string ), "chat %d %d \"%s\"", + Com_sprintf( string, sizeof( string ), "chat %ld %d \"%s\"", ent ? ent - g_entities : -1, G_admin_permission( ent, ADMF_ADMINCHAT ) ? SAY_ADMINS : SAY_ADMINS_PUBLIC, msg ); @@ -1651,7 +1651,7 @@ trap_SendServerCommand( i, string ); // Send to the logfile and server console - G_LogPrintf( "%s: %d \"%s" S_COLOR_WHITE "\": " S_COLOR_MAGENTA "%s\n", + G_LogPrintf( "%s: %ld \"%s" S_COLOR_WHITE "\": " S_COLOR_MAGENTA "%s\n", G_admin_permission( ent, ADMF_ADMINCHAT ) ? "AdminMsg" : "AdminMsgPublic", ent ? ent - g_entities : -1, ent ? ent->client->pers.netname : "console", msg ); Index: src/game/g_admin.c =================================================================== --- src/game/g_admin.c (revision 2065) +++ src/game/g_admin.c (working copy) @@ -672,7 +672,7 @@ ent->client->pers.admin->flags, ( level ) ? level->flags : "" ); - G_LogPrintf( "AdminAuth: %i \"%s" S_COLOR_WHITE "\" \"%s" S_COLOR_WHITE + G_LogPrintf( "AdminAuth: %ld \"%s" S_COLOR_WHITE "\" \"%s" S_COLOR_WHITE "\" [%d] (%s): %s\n", ent - g_entities, ent->client->pers.netname, ent->client->pers.admin->name, ent->client->pers.admin->level, Index: src/game/g_cmds.c =================================================================== --- src/game/g_cmds.c (revision 2065) +++ src/game/g_cmds.c (working copy) @@ -819,7 +819,7 @@ return qfalse; } - trap_SendServerCommand( other-g_entities, va( "chat %d %d \"%s\"", + trap_SendServerCommand( other-g_entities, va( "chat %ld %d \"%s\"", ent ? ent-g_entities : -1, mode, message ) ); @@ -847,7 +847,7 @@ switch( mode ) { case SAY_ALL: - G_LogPrintf( "Say: %d \"%s" S_COLOR_WHITE "\": " S_COLOR_GREEN "%s\n", + G_LogPrintf( "Say: %ld \"%s" S_COLOR_WHITE "\": " S_COLOR_GREEN "%s\n", ( ent ) ? ent - g_entities : -1, ( ent ) ? ent->client->pers.netname : "console", chatText ); break; @@ -855,7 +855,7 @@ // console say_team is handled in g_svscmds, not here if( !ent || !ent->client ) Com_Error( ERR_FATAL, "SAY_TEAM by non-client entity\n" ); - G_LogPrintf( "SayTeam: %d \"%s" S_COLOR_WHITE "\": " S_COLOR_CYAN "%s\n", + G_LogPrintf( "SayTeam: %ld \"%s" S_COLOR_WHITE "\": " S_COLOR_CYAN "%s\n", ent - g_entities, ent->client->pers.netname, chatText ); break; case SAY_RAW: @@ -900,7 +900,7 @@ for(i = 0; i < 3; i++ ) range[ i ] = g_sayAreaRange.value; - G_LogPrintf( "SayArea: %d \"%s" S_COLOR_WHITE "\": " S_COLOR_BLUE "%s\n", + G_LogPrintf( "SayArea: %ld \"%s" S_COLOR_WHITE "\": " S_COLOR_BLUE "%s\n", ent - g_entities, ent->client->pers.netname, msg ); VectorAdd( ent->s.origin, range, maxs ); @@ -1054,12 +1054,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, text ) ); 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, text ) ); break; default: @@ -1399,7 +1399,7 @@ return; } - G_LogPrintf( "%s: %d \"%s" S_COLOR_WHITE "\": %s\n", + G_LogPrintf( "%s: %ld \"%s" S_COLOR_WHITE "\": %s\n", team == TEAM_NONE ? "CallVote" : "CallTeamVote", ent - g_entities, ent->client->pers.netname, level.voteString[ team ] ); @@ -3260,7 +3260,7 @@ ADMP( va( "^%cPrivate message: ^7%s\n", color, text ) ); ADMP( va( "%s\n", str ) ); - G_LogPrintf( "%s: %d \"%s" S_COLOR_WHITE "\" \"%s\": ^%c%s\n", + G_LogPrintf( "%s: %ld \"%s" S_COLOR_WHITE "\" \"%s\": ^%c%s\n", ( teamonly ) ? "TPrivMsg" : "PrivMsg", ( ent ) ? ent - g_entities : -1, ( ent ) ? ent->client->pers.netname : "console", Index: src/game/g_team.c =================================================================== --- src/game/g_team.c (revision 2065) +++ src/game/g_team.c (working copy) @@ -245,7 +245,7 @@ G_UpdateTeamConfigStrings( ); - G_LogPrintf( "ChangeTeam: %d %s: %s" S_COLOR_WHITE " switched teams\n", + G_LogPrintf( "ChangeTeam: %ld %s: %s" S_COLOR_WHITE " switched teams\n", ent - g_entities, BG_TeamName( newTeam ), ent->client->pers.netname ); G_namelog_update_score( ent->client ); Index: src/qcommon/vm_x86_64.c =================================================================== --- src/qcommon/vm_x86_64.c (revision 2065) +++ src/qcommon/vm_x86_64.c (working copy) @@ -250,7 +250,7 @@ #define JMPIARG \ CHECK_INSTR(iarg); \ - emit("movq $%lu, %%rax", vm->codeBase+vm->instructionPointers[iarg]); \ + emit("movq $%lu, %%rax", (long int)(intptr_t)vm->codeBase+vm->instructionPointers[iarg]); \ emit("jmpq *%%rax"); #define CONST_OPTIMIZE @@ -518,7 +518,7 @@ goto emit_do_syscall; CHECK_INSTR(const_value); - emit("movq $%lu, %%rax", vm->codeBase+vm->instructionPointers[const_value]); + emit("movq $%lu, %%rax", (long int)(intptr_t)vm->codeBase+vm->instructionPointers[const_value]); emit("callq *%%rax"); got_const = 0; break; Index: src/cgame/cg_particles.c =================================================================== --- src/cgame/cg_particles.c (revision 2065) +++ src/cgame/cg_particles.c (working copy) @@ -732,7 +732,7 @@ if( bp->numModels > 0 ) { CG_Printf( S_COLOR_RED "ERROR: 'shader' not allowed in " - "conjunction with 'model'\n", token ); + "conjunction with 'model'\n" ); break; } @@ -762,7 +762,7 @@ if( bp->numFrames > 0 ) { CG_Printf( S_COLOR_RED "ERROR: 'model' not allowed in " - "conjunction with 'shader'\n", token ); + "conjunction with 'shader'\n" ); break; } Index: src/cgame/cg_trails.c =================================================================== --- src/cgame/cg_trails.c (revision 2065) +++ src/cgame/cg_trails.c (working copy) @@ -898,7 +898,7 @@ { if( btb->numJitters == MAX_TRAIL_BEAM_JITTERS ) { - CG_Printf( S_COLOR_RED "ERROR: too many jitters\n", token ); + CG_Printf( S_COLOR_RED "ERROR: too many jitters\n" ); break; } Index: src/cgame/cg_players.c =================================================================== --- src/cgame/cg_players.c (revision 2065) +++ src/cgame/cg_players.c (working copy) @@ -2355,7 +2355,7 @@ cent->pe.nonseg.pitching = qfalse; if( cg_debugPosition.integer ) - CG_Printf( "%i ResetPlayerEntity yaw=%i\n", cent->currentState.number, cent->pe.torso.yawAngle ); + CG_Printf( "%i ResetPlayerEntity yaw=%i\n", cent->currentState.number, (int) cent->pe.torso.yawAngle ); } /* Index: src/cgame/cg_buildable.c =================================================================== --- src/cgame/cg_buildable.c (revision 2065) +++ src/cgame/cg_buildable.c (working copy) @@ -438,8 +438,8 @@ if( newAnimation != lf->animationNumber || !lf->animation ) { if( cg_debugRandom.integer ) - CG_Printf( "newAnimation: %d lf->animationNumber: %d lf->animation: %d\n", - newAnimation, lf->animationNumber, lf->animation ); + CG_Printf( "newAnimation: %d lf->animationNumber: %d lf->animation: %ld\n", + newAnimation, lf->animationNumber, (intptr_t) lf->animation ); CG_SetBuildableLerpFrameAnimation( buildable, lf, newAnimation );