dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-04-05 01:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

s/ReadLong/ReadInt/ to match the return type

Browse source
This commit is contained in:
dhewg 2012-06-28 13:19:14 +02:00
parent 94df46637a
commit 9034da11d0
34 changed files with 135 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
neo/d3xp/Entity.cpp
View file

@ -4845,7 +4845,7 @@ idEntity::ReadColorFromSnapshot
void idEntity::ReadColorFromSnapshot( const idBitMsgDelta &msg ) {
idVec4 color;
UnpackColor( msg.ReadLong(), color );
UnpackColor( msg.ReadInt(), color );
renderEntity.shaderParms[ SHADERPARM_RED ] = color[0];
renderEntity.shaderParms[ SHADERPARM_GREEN ] = color[1];
renderEntity.shaderParms[ SHADERPARM_BLUE ] = color[2];
@ -5012,7 +5012,7 @@ bool idEntity::ClientReceiveEvent( int event, int time, const idBitMsg &msg ) {
common->DPrintf( "ent 0x%x: start sound shader too old (%d ms)\n", entityNumber, gameLocal.realClientTime - time );
return true;
}
index = gameLocal.ClientRemapDecl( DECL_SOUND, msg.ReadLong() );
index = gameLocal.ClientRemapDecl( DECL_SOUND, msg.ReadInt() );
if ( index >= 0 && index < declManager->GetNumDecls( DECL_SOUND ) ) {
shader = declManager->SoundByIndex( index, false );
channel = (s_channelType)msg.ReadByte();
@ -5501,8 +5501,8 @@ bool idAnimatedEntity::ClientReceiveEvent( int event, int time, const idBitMsg &
localOrigin[2] = msg.ReadFloat();
localNormal = msg.ReadDir( 24 );
localDir = msg.ReadDir( 24 );
damageDefIndex = gameLocal.ClientRemapDecl( DECL_ENTITYDEF, msg.ReadLong() );
materialIndex = gameLocal.ClientRemapDecl( DECL_MATERIAL, msg.ReadLong() );
damageDefIndex = gameLocal.ClientRemapDecl( DECL_ENTITYDEF, msg.ReadInt() );
materialIndex = gameLocal.ClientRemapDecl( DECL_MATERIAL, msg.ReadInt() );
const idDeclEntityDef *damageDef = static_cast<const idDeclEntityDef *>( declManager->DeclByIndex( DECL_ENTITYDEF, damageDefIndex ) );
const idMaterial *collisionMaterial = static_cast<const idMaterial *>( declManager->DeclByIndex( DECL_MATERIAL, materialIndex ) );
AddLocalDamageEffect( jointNum, localOrigin, localNormal, localDir, damageDef, collisionMaterial );

4
neo/d3xp/Fx.cpp
View file

@ -768,8 +768,8 @@ void idEntityFx::ReadFromSnapshot( const idBitMsgDelta &msg ) {
GetPhysics()->ReadFromSnapshot( msg );
ReadBindFromSnapshot( msg );
fx_index = gameLocal.ClientRemapDecl( DECL_FX, msg.ReadLong() );
start_time = msg.ReadLong();
fx_index = gameLocal.ClientRemapDecl( DECL_FX, msg.ReadInt() );
start_time = msg.ReadInt();
if ( fx_index != -1 && start_time > 0 && !fxEffect && started < 0 ) {
spawnArgs.GetInt( "effect_lapse", "1000", max_lapse );

22
neo/d3xp/Game_network.cpp
View file

@ -820,7 +820,7 @@ void idGameLocal::ServerProcessReliableMessage( int clientNum, const idBitMsg &m
break;
}
case GAME_RELIABLE_MESSAGE_VCHAT: {
int index = msg.ReadLong();
int index = msg.ReadInt();
bool team = msg.ReadBits( 1 ) != 0;
mpGame.ProcessVoiceChat( clientNum, team, index );
break;
@ -858,7 +858,7 @@ void idGameLocal::ServerProcessReliableMessage( int clientNum, const idBitMsg &m
event->spawnId = msg.ReadBits( 32 );
event->event = msg.ReadByte();
event->time = msg.ReadLong();
event->time = msg.ReadInt();
event->paramsSize = msg.ReadBits( idMath::BitsForInteger( MAX_EVENT_PARAM_SIZE ) );
if ( event->paramsSize ) {
@ -1025,7 +1025,7 @@ void idGameLocal::ClientReadSnapshot( int clientNum, int sequence, const int gam
#if ASYNC_WRITE_TAGS
idRandom tagRandom;
tagRandom.SetSeed( msg.ReadLong() );
tagRandom.SetSeed( msg.ReadInt() );
#endif
// read all entities from the snapshot
@ -1103,7 +1103,7 @@ void idGameLocal::ClientReadSnapshot( int clientNum, int sequence, const int gam
ent->snapshotBits = msg.GetNumBitsRead() - numBitsRead;
#if ASYNC_WRITE_TAGS
if ( msg.ReadLong() != tagRandom.RandomInt() ) {
if ( msg.ReadInt() != tagRandom.RandomInt() ) {
cmdSystem->BufferCommandText( CMD_EXEC_NOW, "writeGameState" );
if ( entityDefNumber >= 0 && entityDefNumber < declManager->GetNumDecls( DECL_ENTITYDEF ) ) {
classname = declManager->DeclByIndex( DECL_ENTITYDEF, entityDefNumber, false )->GetName();
@ -1156,7 +1156,7 @@ void idGameLocal::ClientReadSnapshot( int clientNum, int sequence, const int gam
sourceAreas[ i++ ] = 0;
}
for ( i = 0; i < idEntity::MAX_PVS_AREAS; i++ ) {
serverPVS[ i ] = msg.ReadLong();
serverPVS[ i ] = msg.ReadInt();
}
if ( memcmp( sourceAreas, serverPVS, idEntity::MAX_PVS_AREAS * sizeof( int ) ) ) {
common->Warning( "client PVS areas != server PVS areas, sequence 0x%x", sequence );
@ -1347,7 +1347,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
char name[MAX_STRING_CHARS];
type = msg.ReadByte();
index = msg.ReadLong();
index = msg.ReadInt();
msg.ReadString( name, sizeof( name ) );
const idDecl *decl = declManager->FindType( (declType_t)type, name, false );
@ -1361,7 +1361,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
}
case GAME_RELIABLE_MESSAGE_SPAWN_PLAYER: {
int client = msg.ReadByte();
int spawnId = msg.ReadLong();
int spawnId = msg.ReadInt();
if ( !entities[ client ] ) {
SpawnPlayer( client );
entities[ client ]->FreeModelDef();
@ -1395,7 +1395,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
break;
}
case GAME_RELIABLE_MESSAGE_SOUND_INDEX: {
int index = gameLocal.ClientRemapDecl( DECL_SOUND, msg.ReadLong() );
int index = gameLocal.ClientRemapDecl( DECL_SOUND, msg.ReadInt() );
if ( index >= 0 && index < declManager->GetNumDecls( DECL_SOUND ) ) {
const idSoundShader *shader = declManager->SoundByIndex( index );
mpGame.PlayGlobalSound( -1, SND_COUNT, shader->GetName() );
@ -1419,7 +1419,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
event->spawnId = msg.ReadBits( 32 );
event->event = msg.ReadByte();
event->time = msg.ReadLong();
event->time = msg.ReadInt();
event->paramsSize = msg.ReadBits( idMath::BitsForInteger( MAX_EVENT_PARAM_SIZE ) );
if ( event->paramsSize ) {
@ -1474,7 +1474,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
break;
}
case GAME_RELIABLE_MESSAGE_PORTALSTATES: {
int numPortals = msg.ReadLong();
int numPortals = msg.ReadInt();
assert( numPortals == gameRenderWorld->NumPortals() );
for ( int i = 0; i < numPortals; i++ ) {
gameRenderWorld->SetPortalState( (qhandle_t) (i+1), msg.ReadBits( NUM_RENDER_PORTAL_BITS ) );
@ -1482,7 +1482,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
break;
}
case GAME_RELIABLE_MESSAGE_PORTAL: {
qhandle_t portal = msg.ReadLong();
qhandle_t portal = msg.ReadInt();
int blockingBits = msg.ReadBits( NUM_RENDER_PORTAL_BITS );
assert( portal > 0 && portal <= gameRenderWorld->NumPortals() );
gameRenderWorld->SetPortalState( portal, blockingBits );

14
neo/d3xp/Light.cpp
View file

@ -1107,14 +1107,14 @@ void idLight::ReadFromSnapshot( const idBitMsgDelta &msg ) {
Off();
}
}
UnpackColor( msg.ReadLong(), baseColor );
UnpackColor( msg.ReadInt(), baseColor );
// lightParentEntityNum = msg.ReadBits( GENTITYNUM_BITS );
/* // only helps prediction
UnpackColor( msg.ReadLong(), fadeFrom );
UnpackColor( msg.ReadLong(), fadeTo );
fadeStart = msg.ReadLong();
fadeEnd = msg.ReadLong();
UnpackColor( msg.ReadInt(), fadeFrom );
UnpackColor( msg.ReadInt(), fadeTo );
fadeStart = msg.ReadInt();
fadeEnd = msg.ReadInt();
*/
// FIXME: read renderLight.shader
@ -1122,14 +1122,14 @@ void idLight::ReadFromSnapshot( const idBitMsgDelta &msg ) {
renderLight.lightRadius[1] = msg.ReadFloat( 5, 10 );
renderLight.lightRadius[2] = msg.ReadFloat( 5, 10 );
UnpackColor( msg.ReadLong(), shaderColor );
UnpackColor( msg.ReadInt(), shaderColor );
renderLight.shaderParms[SHADERPARM_RED] = shaderColor[0];
renderLight.shaderParms[SHADERPARM_GREEN] = shaderColor[1];
renderLight.shaderParms[SHADERPARM_BLUE] = shaderColor[2];
renderLight.shaderParms[SHADERPARM_ALPHA] = shaderColor[3];
renderLight.shaderParms[SHADERPARM_TIMESCALE] = msg.ReadFloat( 5, 10 );
renderLight.shaderParms[SHADERPARM_TIMEOFFSET] = msg.ReadLong();
renderLight.shaderParms[SHADERPARM_TIMEOFFSET] = msg.ReadInt();
//renderLight.shaderParms[SHADERPARM_DIVERSITY] = msg.ReadFloat();
renderLight.shaderParms[SHADERPARM_MODE] = msg.ReadShort();

2
neo/d3xp/Moveable.cpp
View file

@ -1346,7 +1346,7 @@ bool idExplodingBarrel::ClientReceiveEvent( int event, int time, const idBitMsg
switch( event ) {
case EVENT_EXPLODE:
if ( gameLocal.realClientTime - msg.ReadLong() < spawnArgs.GetInt( "explode_lapse", "1000" ) ) {
if ( gameLocal.realClientTime - msg.ReadInt() < spawnArgs.GetInt( "explode_lapse", "1000" ) ) {
ExplodingEffects( );
}
return true;

4
neo/d3xp/MultiplayerGame.cpp
View file

@ -4122,7 +4122,7 @@ void idMultiplayerGame::ClientReadStartState( const idBitMsg &msg ) {
// read the state in preparation for reading snapshot updates
gameState = (idMultiplayerGame::gameState_t)msg.ReadByte();
matchStartedTime = msg.ReadLong( );
matchStartedTime = msg.ReadInt( );
startFragLimit = msg.ReadShort( );
while ( ( client = msg.ReadShort() ) != MAX_CLIENTS ) {
assert( gameLocal.entities[ client ] && gameLocal.entities[ client ]->IsType( idPlayer::Type ) );
@ -4143,7 +4143,7 @@ idMultiplayerGame::ClientReadWarmupTime
================
*/
void idMultiplayerGame::ClientReadWarmupTime( const idBitMsg &msg ) {
warmupEndTime = msg.ReadLong();
warmupEndTime = msg.ReadInt();
}
/*

4
neo/d3xp/Player.cpp
View file

@ -9727,10 +9727,10 @@ void idPlayer::ReadPlayerStateFromSnapshot( const idBitMsgDelta &msg ) {
int i, ammo;
bobCycle = msg.ReadByte();
stepUpTime = msg.ReadLong();
stepUpTime = msg.ReadInt();
stepUpDelta = msg.ReadFloat();
#ifdef _D3XP
inventory.weapons = msg.ReadLong();
inventory.weapons = msg.ReadInt();
#else
inventory.weapons = msg.ReadShort();
#endif

2
neo/d3xp/Projectile.cpp
View file

@ -1375,7 +1375,7 @@ bool idProjectile::ClientReceiveEvent( int event, int time, const idBitMsg &msg
collision.c.point[1] = msg.ReadFloat();
collision.c.point[2] = msg.ReadFloat();
collision.c.normal = msg.ReadDir( 24 );
int index = gameLocal.ClientRemapDecl( DECL_MATERIAL, msg.ReadLong() );
int index = gameLocal.ClientRemapDecl( DECL_MATERIAL, msg.ReadInt() );
collision.c.material = ( index != -1 ) ? static_cast<const idMaterial *>( declManager->DeclByIndex( DECL_MATERIAL, index ) ) : NULL;
velocity[0] = msg.ReadFloat( 5, 10 );
velocity[1] = msg.ReadFloat( 5, 10 );

2
neo/d3xp/Weapon.cpp
View file

@ -2749,7 +2749,7 @@ bool idWeapon::ClientReceiveEvent( int event, int time, const idBitMsg &msg ) {
return true;
}
case EVENT_CHANGESKIN: {
int index = gameLocal.ClientRemapDecl( DECL_SKIN, msg.ReadLong() );
int index = gameLocal.ClientRemapDecl( DECL_SKIN, msg.ReadInt() );
renderEntity.customSkin = ( index != -1 ) ? static_cast<const idDeclSkin *>( declManager->DeclByIndex( DECL_SKIN, index ) ) : NULL;
UpdateVisuals();
if ( worldModel.GetEntity() ) {

2
neo/d3xp/physics/Physics_AF.cpp
View file

@ -7972,7 +7972,7 @@ void idPhysics_AF::ReadFromSnapshot( const idBitMsgDelta &msg ) {
int i, num id_attribute((unused));
idCQuat quat;
current.atRest = msg.ReadLong();
current.atRest = msg.ReadInt();
current.noMoveTime = msg.ReadFloat();
current.activateTime = msg.ReadFloat();
current.pushVelocity[0] = msg.ReadDeltaFloat( 0.0f, AF_VELOCITY_EXPONENT_BITS, AF_VELOCITY_MANTISSA_BITS );

2
neo/d3xp/physics/Physics_Monster.cpp
View file

@ -802,6 +802,6 @@ void idPhysics_Monster::ReadFromSnapshot( const idBitMsgDelta &msg ) {
current.pushVelocity[0] = msg.ReadDeltaFloat( 0.0f, MONSTER_VELOCITY_EXPONENT_BITS, MONSTER_VELOCITY_MANTISSA_BITS );
current.pushVelocity[1] = msg.ReadDeltaFloat( 0.0f, MONSTER_VELOCITY_EXPONENT_BITS, MONSTER_VELOCITY_MANTISSA_BITS );
current.pushVelocity[2] = msg.ReadDeltaFloat( 0.0f, MONSTER_VELOCITY_EXPONENT_BITS, MONSTER_VELOCITY_MANTISSA_BITS );
current.atRest = msg.ReadLong();
current.atRest = msg.ReadInt();
current.onGround = msg.ReadBits( 1 ) != 0;
}

4
neo/d3xp/physics/Physics_Parametric.cpp
View file

@ -1106,8 +1106,8 @@ void idPhysics_Parametric::ReadFromSnapshot( const idBitMsgDelta &msg ) {
idVec3 linearStartValue, linearSpeed, linearBaseSpeed, startPos, endPos;
idAngles angularStartValue, angularSpeed, angularBaseSpeed, startAng, endAng;
current.time = msg.ReadLong();
current.atRest = msg.ReadLong();
current.time = msg.ReadInt();
current.atRest = msg.ReadInt();
current.origin[0] = msg.ReadFloat();
current.origin[1] = msg.ReadFloat();
current.origin[2] = msg.ReadFloat();

2
neo/d3xp/physics/Physics_RigidBody.cpp
View file

@ -1504,7 +1504,7 @@ idPhysics_RigidBody::ReadFromSnapshot
void idPhysics_RigidBody::ReadFromSnapshot( const idBitMsgDelta &msg ) {
idCQuat quat, localQuat;
current.atRest = msg.ReadLong();
current.atRest = msg.ReadInt();
current.i.position[0] = msg.ReadFloat();
current.i.position[1] = msg.ReadFloat();
current.i.position[2] = msg.ReadFloat();

52
neo/framework/async/AsyncClient.cpp
View file

@ -740,7 +740,7 @@ void idAsyncClient::ProcessUnreliableServerMessage( const idBitMsg &msg ) {
usercmd_t *last;
bool pureWait;
serverGameInitId = msg.ReadLong();
serverGameInitId = msg.ReadInt();
id = msg.ReadByte();
switch( id ) {
@ -754,12 +754,12 @@ void idAsyncClient::ProcessUnreliableServerMessage( const idBitMsg &msg ) {
if ( idAsyncNetwork::verbose.GetInteger() == 2 ) {
common->Printf( "received ping message from server\n" );
}
SendPingResponseToServer( msg.ReadLong() );
SendPingResponseToServer( msg.ReadInt() );
break;
}
case SERVER_UNRELIABLE_MESSAGE_GAMEINIT: {
serverGameFrame = msg.ReadLong();
serverGameTime = msg.ReadLong();
serverGameFrame = msg.ReadInt();
serverGameTime = msg.ReadInt();
msg.ReadDeltaDict( serverSI, NULL );
pureWait = serverSI.GetBool( "si_pure" );
@ -798,9 +798,9 @@ void idAsyncClient::ProcessUnreliableServerMessage( const idBitMsg &msg ) {
break;
}
snapshotSequence = msg.ReadLong();
snapshotGameFrame = msg.ReadLong();
snapshotGameTime = msg.ReadLong();
snapshotSequence = msg.ReadInt();
snapshotGameFrame = msg.ReadInt();
snapshotGameTime = msg.ReadInt();
numDuplicatedUsercmds = msg.ReadByte();
aheadOfServer = msg.ReadShort();
@ -886,7 +886,7 @@ void idAsyncClient::ProcessReliableMessagePure( const idBitMsg &msg ) {
session->SetGUI( NULL, NULL );
serverGameInitId = msg.ReadLong();
serverGameInitId = msg.ReadInt();
if ( serverGameInitId != gameInitId ) {
common->DPrintf( "ignoring pure server checksum from an outdated gameInitId (%d)\n", serverGameInitId );
@ -959,7 +959,7 @@ void idAsyncClient::ProcessReliableServerMessages( void ) {
#if ID_CLIENTINFO_TAGS
int checksum = info.Checksum();
int srv_checksum = msg.ReadLong();
int srv_checksum = msg.ReadInt();
if ( checksum != srv_checksum ) {
common->DPrintf( "SERVER_RELIABLE_MESSAGE_CLIENTINFO %d (haveBase: %s): != checksums srv: 0x%x local: 0x%x\n", clientNum, haveBase ? "true" : "false", checksum, srv_checksum );
info.Print();
@ -1001,7 +1001,7 @@ void idAsyncClient::ProcessReliableServerMessages( void ) {
case SERVER_RELIABLE_MESSAGE_DISCONNECT: {
int clientNum;
char string[MAX_STRING_CHARS];
clientNum = msg.ReadLong( );
clientNum = msg.ReadInt( );
ReadLocalizedServerString( msg, string, MAX_STRING_CHARS );
if ( clientNum == idAsyncClient::clientNum ) {
session->Stop();
@ -1016,7 +1016,7 @@ void idAsyncClient::ProcessReliableServerMessages( void ) {
}
case SERVER_RELIABLE_MESSAGE_APPLYSNAPSHOT: {
int sequence;
sequence = msg.ReadLong();
sequence = msg.ReadInt();
if ( !game->ClientApplySnapshot( clientNum, sequence ) ) {
session->Stop();
common->Error( "couldn't apply snapshot %d", sequence );
@ -1063,7 +1063,7 @@ void idAsyncClient::ProcessChallengeResponseMessage( const netadr_t from, const
return;
}
serverChallenge = msg.ReadLong();
serverChallenge = msg.ReadInt();
serverId = msg.ReadShort();
msg.ReadString( serverGameBase, MAX_STRING_CHARS );
msg.ReadString( serverGame, MAX_STRING_CHARS );
@ -1125,13 +1125,13 @@ void idAsyncClient::ProcessConnectResponseMessage( const netadr_t from, const id
common->Printf( "received connect response from %s\n", Sys_NetAdrToString( from ) );
channel.Init( from, clientId );
clientNum = msg.ReadLong();
clientNum = msg.ReadInt();
clientState = CS_CONNECTED;
lastPacketTime = -9999;
serverGameInitId = msg.ReadLong();
serverGameFrame = msg.ReadLong();
serverGameTime = msg.ReadLong();
serverGameInitId = msg.ReadInt();
serverGameFrame = msg.ReadInt();
serverGameTime = msg.ReadInt();
msg.ReadDeltaDict( serverSI, NULL );
InitGame( serverGameInitId, serverGameFrame, serverGameTime, serverSI );
@ -1178,8 +1178,8 @@ void idAsyncClient::ProcessInfoResponseMessage( const netadr_t from, const idBit
serverInfo.clients = 0;
serverInfo.adr = from;
serverInfo.challenge = msg.ReadLong(); // challenge
protocol = msg.ReadLong();
serverInfo.challenge = msg.ReadInt(); // challenge
protocol = msg.ReadInt();
if ( protocol != ASYNC_PROTOCOL_VERSION ) {
common->Printf( "server %s ignored - protocol %d.%d, expected %d.%d\n", Sys_NetAdrToString( serverInfo.adr ), protocol >> 16, protocol & 0xffff, ASYNC_PROTOCOL_MAJOR, ASYNC_PROTOCOL_MINOR );
return;
@ -1192,14 +1192,14 @@ void idAsyncClient::ProcessInfoResponseMessage( const netadr_t from, const idBit
}
for ( i = msg.ReadByte(); i < MAX_ASYNC_CLIENTS; i = msg.ReadByte() ) {
serverInfo.pings[ serverInfo.clients ] = msg.ReadShort();
serverInfo.rate[ serverInfo.clients ] = msg.ReadLong();
serverInfo.rate[ serverInfo.clients ] = msg.ReadInt();
msg.ReadString( serverInfo.nickname[ serverInfo.clients ], MAX_NICKLEN );
if ( verbose ) {
common->Printf( "client %2d: %s, ping = %d, rate = %d\n", i, serverInfo.nickname[ serverInfo.clients ], serverInfo.pings[ serverInfo.clients ], serverInfo.rate[ serverInfo.clients ] );
}
serverInfo.clients++;
}
serverInfo.OSMask = msg.ReadLong();
serverInfo.OSMask = msg.ReadInt();
index = serverList.InfoResponse( serverInfo );
common->Printf( "%d: server %s - protocol %d.%d - %s\n", index, Sys_NetAdrToString( serverInfo.adr ), protocol >> 16, protocol & 0xffff, serverInfo.serverInfo.GetString( "si_name" ) );
@ -1216,9 +1216,9 @@ void idAsyncClient::ProcessPrintMessage( const netadr_t from, const idBitMsg &ms
int game_opcode = ALLOW_YES;
const char *retpass;
opcode = msg.ReadLong();
opcode = msg.ReadInt();
if ( opcode == SERVER_PRINT_GAMEDENY ) {
game_opcode = msg.ReadLong();
game_opcode = msg.ReadInt();
}
ReadLocalizedServerString( msg, string, MAX_STRING_CHARS );
common->Printf( "%s\n", string );
@ -1393,7 +1393,7 @@ bool idAsyncClient::ValidatePureServerChecksums( const netadr_t from, const idBi
// pak checksums, in a 0-terminated list
numChecksums = 0;
do {
i = msg.ReadLong( );
i = msg.ReadInt( );
inChecksums[ numChecksums++ ] = i;
// just to make sure a broken message doesn't crash us
if ( numChecksums >= MAX_PURE_PAKS ) {
@ -1402,7 +1402,7 @@ bool idAsyncClient::ValidatePureServerChecksums( const netadr_t from, const idBi
}
} while ( i );
inChecksums[ numChecksums ] = 0;
inGamePakChecksum = msg.ReadLong();
inGamePakChecksum = msg.ReadInt();
fsPureReply_t reply = fileSystem->SetPureServerChecksums( inChecksums, inGamePakChecksum, missingChecksums, &missingGamePakChecksum );
switch ( reply ) {
@ -2195,7 +2195,7 @@ idAsyncClient::ProcessDownloadInfoMessage
*/
void idAsyncClient::ProcessDownloadInfoMessage( const netadr_t from, const idBitMsg &msg ) {
char buf[ MAX_STRING_CHARS ];
int srvDlRequest = msg.ReadLong();
int srvDlRequest = msg.ReadInt();
int infoType = msg.ReadByte();
int pakDl;
int pakIndex;
@ -2241,7 +2241,7 @@ void idAsyncClient::ProcessDownloadInfoMessage( const netadr_t from, const idBit
entry.filename = buf;
msg.ReadString( buf, MAX_STRING_CHARS );
entry.url = buf;
entry.size = msg.ReadLong();
entry.size = msg.ReadInt();
// checksums are not transmitted, we read them from the dl request we sent
entry.checksum = dlChecksums[ pakIndex ];
totalDlSize += entry.size;

2
neo/framework/async/AsyncNetwork.cpp
View file

@ -239,7 +239,7 @@ void idAsyncNetwork::ReadUserCmdDelta( const idBitMsg &msg, usercmd_t &cmd, cons
return;
}
cmd.gameTime = msg.ReadLong();
cmd.gameTime = msg.ReadInt();
cmd.buttons = msg.ReadByte();
cmd.mx = msg.ReadShort();
cmd.my = msg.ReadShort();

40
neo/framework/async/AsyncServer.cpp
View file

@ -1231,8 +1231,8 @@ void idAsyncServer::ProcessUnreliableClientMessage( int clientNum, const idBitMs
return;
}
acknowledgeSequence = msg.ReadLong();
clientGameInitId = msg.ReadLong();
acknowledgeSequence = msg.ReadInt();
clientGameInitId = msg.ReadInt();
// while loading a map the client may send empty messages to keep the connection alive
if ( clientGameInitId == GAME_INIT_ID_MAP_LOAD ) {
@ -1263,7 +1263,7 @@ void idAsyncServer::ProcessUnreliableClientMessage( int clientNum, const idBitMs
return;
}
client.acknowledgeSnapshotSequence = msg.ReadLong();
client.acknowledgeSnapshotSequence = msg.ReadInt();
if ( client.clientState == SCS_CONNECTED ) {
@ -1305,7 +1305,7 @@ void idAsyncServer::ProcessUnreliableClientMessage( int clientNum, const idBitMs
break;
}
case CLIENT_UNRELIABLE_MESSAGE_PINGRESPONSE: {
client.clientPing = realTime - msg.ReadLong();
client.clientPing = realTime - msg.ReadInt();
break;
}
case CLIENT_UNRELIABLE_MESSAGE_USERCMD: {
@ -1313,7 +1313,7 @@ void idAsyncServer::ProcessUnreliableClientMessage( int clientNum, const idBitMs
client.clientPrediction = msg.ReadShort();
// read user commands
clientGameFrame = msg.ReadLong();
clientGameFrame = msg.ReadInt();
numUsercmds = msg.ReadByte();
for ( last = NULL, i = clientGameFrame - numUsercmds + 1; i <= clientGameFrame; i++ ) {
index = i & ( MAX_USERCMD_BACKUP - 1 );
@ -1486,7 +1486,7 @@ void idAsyncServer::ProcessChallengeMessage( const netadr_t from, const idBitMsg
idBitMsg outMsg;
byte msgBuf[MAX_MESSAGE_SIZE];
clientId = msg.ReadLong();
clientId = msg.ReadInt();
oldest = 0;
oldestTime = 0x7fffffff;
@ -1678,7 +1678,7 @@ void idAsyncServer::ProcessConnectMessage( const netadr_t from, const idBitMsg &
char password[ 17 ];
int i, ichallenge, islot, OS, numClients;
protocol = msg.ReadLong();
protocol = msg.ReadInt();
OS = msg.ReadShort();
// check the protocol version
@ -1688,10 +1688,10 @@ void idAsyncServer::ProcessConnectMessage( const netadr_t from, const idBitMsg &
return;
}
clientDataChecksum = msg.ReadLong();
challenge = msg.ReadLong();
clientDataChecksum = msg.ReadInt();
challenge = msg.ReadInt();
clientId = msg.ReadShort();
clientRate = msg.ReadLong();
clientRate = msg.ReadInt();
// check the client data - only for non pure servers
if ( !sessLocal.mapSpawnData.serverInfo.GetInt( "si_pure" ) && clientDataChecksum != serverDataChecksum ) {
@ -1892,7 +1892,7 @@ bool idAsyncServer::VerifyChecksumMessage( int clientNum, const netadr_t *from,
// pak checksums, in a 0-terminated list
numChecksums = 0;
do {
i = msg.ReadLong( );
i = msg.ReadInt( );
checksums[ numChecksums++ ] = i;
// just to make sure a broken client doesn't crash us
if ( numChecksums >= MAX_PURE_PAKS ) {
@ -1904,7 +1904,7 @@ bool idAsyncServer::VerifyChecksumMessage( int clientNum, const netadr_t *from,
numChecksums--;
// code pak checksum
gamePakChecksum = msg.ReadLong( );
gamePakChecksum = msg.ReadInt( );
fileSystem->GetPureServerChecksums( serverChecksums, OS, &serverGamePakChecksum );
assert( serverChecksums[ 0 ] );
@ -1939,7 +1939,7 @@ void idAsyncServer::ProcessPureMessage( const netadr_t from, const idBitMsg &msg
int iclient, challenge, clientId;
idStr reply;
challenge = msg.ReadLong();
challenge = msg.ReadInt();
clientId = msg.ReadShort();
if ( ( iclient = ValidateChallenge( from, challenge, clientId ) ) == -1 ) {
@ -1971,7 +1971,7 @@ void idAsyncServer::ProcessReliablePure( int clientNum, const idBitMsg &msg ) {
byte msgBuf[MAX_MESSAGE_SIZE];
int clientGameInitId;
clientGameInitId = msg.ReadLong();
clientGameInitId = msg.ReadInt();
if ( clientGameInitId != gameInitId ) {
common->DPrintf( "client %d: ignoring reliable pure from an old gameInit (%d)\n", clientNum, clientGameInitId );
return;
@ -2070,7 +2070,7 @@ void idAsyncServer::ProcessGetInfoMessage( const netadr_t from, const idBitMsg &
common->DPrintf( "Sending info response to %s\n", Sys_NetAdrToString( from ) );
challenge = msg.ReadLong();
challenge = msg.ReadInt();
outMsg.Init( msgBuf, sizeof( msgBuf ) );
outMsg.WriteShort( CONNECTIONLESS_MESSAGE_ID );
@ -2686,9 +2686,9 @@ void idAsyncServer::ProcessDownloadRequestMessage( const netadr_t from, const id
int dlRequest;
int voidSlots = 0; // to count and verbose the right number of paks requested for downloads
challenge = msg.ReadLong();
challenge = msg.ReadInt();
clientId = msg.ReadShort();
dlRequest = msg.ReadLong();
dlRequest = msg.ReadInt();
if ( ( iclient = ValidateChallenge( from, challenge, clientId ) ) == -1 ) {
return;
@ -2700,7 +2700,7 @@ void idAsyncServer::ProcessDownloadRequestMessage( const netadr_t from, const id
}
// the first token of the pak names list passed to the game will be empty if no game pak is requested
dlGamePak = msg.ReadLong();
dlGamePak = msg.ReadInt();
if ( dlGamePak ) {
if ( !( dlSize[ 0 ] = fileSystem->ValidateDownloadPakForChecksum( dlGamePak, pakbuf, true ) ) ) {
common->Warning( "client requested unknown game pak 0x%x", dlGamePak );
@ -2715,7 +2715,7 @@ void idAsyncServer::ProcessDownloadRequestMessage( const netadr_t from, const id
numPaks = 1;
// read the checksums, build path names and pass that to the game code
dlPakChecksum = msg.ReadLong();
dlPakChecksum = msg.ReadInt();
while ( dlPakChecksum ) {
if ( !( dlSize[ numPaks ] = fileSystem->ValidateDownloadPakForChecksum( dlPakChecksum, pakbuf, false ) ) ) {
// we pass an empty token to the game so our list doesn't get offset
@ -2725,7 +2725,7 @@ void idAsyncServer::ProcessDownloadRequestMessage( const netadr_t from, const id
}
pakNames.Append( pakbuf );
numPaks++;
dlPakChecksum = msg.ReadLong();
dlPakChecksum = msg.ReadInt();
}
for ( i = 0; i < pakNames.Num(); i++ ) {

12
neo/framework/async/MsgChannel.cpp
View file

@ -104,7 +104,7 @@ bool idMsgQueue::Get( byte *data, int &size ) {
}
int sequence id_attribute((unused));
size = ReadShort();
sequence = ReadLong();
sequence = ReadInt();
ReadData( data, size );
assert( sequence == first );
first++;
@ -205,10 +205,10 @@ void idMsgQueue::WriteInt( int l ) {
/*
===============
idMsgQueue::ReadLong
idMsgQueue::ReadInt
===============
*/
int idMsgQueue::ReadLong( void ) {
int idMsgQueue::ReadInt( void ) {
return ReadByte() | ( ReadByte() << 8 ) | ( ReadByte() << 16 ) | ( ReadByte() << 24 );
}
@ -378,7 +378,7 @@ bool idMsgChannel::ReadMessageData( idBitMsg &out, const idBitMsg &msg ) {
out.BeginReading();
// read acknowledgement of sent reliable messages
reliableAcknowledge = out.ReadLong();
reliableAcknowledge = out.ReadInt();
// remove acknowledged reliable messages
while( reliableSend.GetFirst() <= reliableAcknowledge ) {
@ -394,7 +394,7 @@ bool idMsgChannel::ReadMessageData( idBitMsg &out, const idBitMsg &msg ) {
common->Printf( "%s: bad reliable message\n", Sys_NetAdrToString( remoteAddress ) );
return false;
}
reliableSequence = out.ReadLong();
reliableSequence = out.ReadInt();
if ( reliableSequence == reliableReceive.GetLast() + 1 ) {
reliableReceive.Add( out.GetData() + out.GetReadCount(), reliableMessageSize );
}
@ -554,7 +554,7 @@ bool idMsgChannel::Process( const netadr_t from, int time, idBitMsg &msg, int &s
UpdateIncomingRate( time, msg.GetSize() );
// get sequence numbers
sequence = msg.ReadLong();
sequence = msg.ReadInt();
// check for fragment information
if ( sequence & FRAGMENT_BIT ) {

2
neo/framework/async/MsgChannel.h
View file

@ -82,7 +82,7 @@ private:
void WriteShort( int s );
int ReadShort( void );
void WriteInt( int l );
int ReadLong( void );
int ReadInt( void );
void WriteData( const byte *data, const int size );
void ReadData( byte *data, const int size );
};

8
neo/game/Entity.cpp
View file

@ -4671,7 +4671,7 @@ idEntity::ReadColorFromSnapshot
void idEntity::ReadColorFromSnapshot( const idBitMsgDelta &msg ) {
idVec4 color;
UnpackColor( msg.ReadLong(), color );
UnpackColor( msg.ReadInt(), color );
renderEntity.shaderParms[ SHADERPARM_RED ] = color[0];
renderEntity.shaderParms[ SHADERPARM_GREEN ] = color[1];
renderEntity.shaderParms[ SHADERPARM_BLUE ] = color[2];
@ -4838,7 +4838,7 @@ bool idEntity::ClientReceiveEvent( int event, int time, const idBitMsg &msg ) {
common->DPrintf( "ent 0x%x: start sound shader too old (%d ms)\n", entityNumber, gameLocal.realClientTime - time );
return true;
}
index = gameLocal.ClientRemapDecl( DECL_SOUND, msg.ReadLong() );
index = gameLocal.ClientRemapDecl( DECL_SOUND, msg.ReadInt() );
if ( index >= 0 && index < declManager->GetNumDecls( DECL_SOUND ) ) {
shader = declManager->SoundByIndex( index, false );
channel = (s_channelType)msg.ReadByte();
@ -5289,8 +5289,8 @@ bool idAnimatedEntity::ClientReceiveEvent( int event, int time, const idBitMsg &
localOrigin[2] = msg.ReadFloat();
localNormal = msg.ReadDir( 24 );
localDir = msg.ReadDir( 24 );
damageDefIndex = gameLocal.ClientRemapDecl( DECL_ENTITYDEF, msg.ReadLong() );
materialIndex = gameLocal.ClientRemapDecl( DECL_MATERIAL, msg.ReadLong() );
damageDefIndex = gameLocal.ClientRemapDecl( DECL_ENTITYDEF, msg.ReadInt() );
materialIndex = gameLocal.ClientRemapDecl( DECL_MATERIAL, msg.ReadInt() );
const idDeclEntityDef *damageDef = static_cast<const idDeclEntityDef *>( declManager->DeclByIndex( DECL_ENTITYDEF, damageDefIndex ) );
const idMaterial *collisionMaterial = static_cast<const idMaterial *>( declManager->DeclByIndex( DECL_MATERIAL, materialIndex ) );
AddLocalDamageEffect( jointNum, localOrigin, localNormal, localDir, damageDef, collisionMaterial );

4
neo/game/Fx.cpp
View file

@ -738,8 +738,8 @@ void idEntityFx::ReadFromSnapshot( const idBitMsgDelta &msg ) {
GetPhysics()->ReadFromSnapshot( msg );
ReadBindFromSnapshot( msg );
fx_index = gameLocal.ClientRemapDecl( DECL_FX, msg.ReadLong() );
start_time = msg.ReadLong();
fx_index = gameLocal.ClientRemapDecl( DECL_FX, msg.ReadInt() );
start_time = msg.ReadInt();
if ( fx_index != -1 && start_time > 0 && !fxEffect && started < 0 ) {
spawnArgs.GetInt( "effect_lapse", "1000", max_lapse );

22
neo/game/Game_network.cpp
View file

@ -806,7 +806,7 @@ void idGameLocal::ServerProcessReliableMessage( int clientNum, const idBitMsg &m
break;
}
case GAME_RELIABLE_MESSAGE_VCHAT: {
int index = msg.ReadLong();
int index = msg.ReadInt();
bool team = msg.ReadBits( 1 ) != 0;
mpGame.ProcessVoiceChat( clientNum, team, index );
break;
@ -844,7 +844,7 @@ void idGameLocal::ServerProcessReliableMessage( int clientNum, const idBitMsg &m
event->spawnId = msg.ReadBits( 32 );
event->event = msg.ReadByte();
event->time = msg.ReadLong();
event->time = msg.ReadInt();
event->paramsSize = msg.ReadBits( idMath::BitsForInteger( MAX_EVENT_PARAM_SIZE ) );
if ( event->paramsSize ) {
@ -1011,7 +1011,7 @@ void idGameLocal::ClientReadSnapshot( int clientNum, int sequence, const int gam
#if ASYNC_WRITE_TAGS
idRandom tagRandom;
tagRandom.SetSeed( msg.ReadLong() );
tagRandom.SetSeed( msg.ReadInt() );
#endif
// read all entities from the snapshot
@ -1089,7 +1089,7 @@ void idGameLocal::ClientReadSnapshot( int clientNum, int sequence, const int gam
ent->snapshotBits = msg.GetNumBitsRead() - numBitsRead;
#if ASYNC_WRITE_TAGS
if ( msg.ReadLong() != tagRandom.RandomInt() ) {
if ( msg.ReadInt() != tagRandom.RandomInt() ) {
cmdSystem->BufferCommandText( CMD_EXEC_NOW, "writeGameState" );
if ( entityDefNumber >= 0 && entityDefNumber < declManager->GetNumDecls( DECL_ENTITYDEF ) ) {
classname = declManager->DeclByIndex( DECL_ENTITYDEF, entityDefNumber, false )->GetName();
@ -1128,7 +1128,7 @@ void idGameLocal::ClientReadSnapshot( int clientNum, int sequence, const int gam
sourceAreas[ i++ ] = 0;
}
for ( i = 0; i < idEntity::MAX_PVS_AREAS; i++ ) {
serverPVS[ i ] = msg.ReadLong();
serverPVS[ i ] = msg.ReadInt();
}
if ( memcmp( sourceAreas, serverPVS, idEntity::MAX_PVS_AREAS * sizeof( int ) ) ) {
common->Warning( "client PVS areas != server PVS areas, sequence 0x%x", sequence );
@ -1315,7 +1315,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
char name[MAX_STRING_CHARS];
type = msg.ReadByte();
index = msg.ReadLong();
index = msg.ReadInt();
msg.ReadString( name, sizeof( name ) );
const idDecl *decl = declManager->FindType( (declType_t)type, name, false );
@ -1329,7 +1329,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
}
case GAME_RELIABLE_MESSAGE_SPAWN_PLAYER: {
int client = msg.ReadByte();
int spawnId = msg.ReadLong();
int spawnId = msg.ReadInt();
if ( !entities[ client ] ) {
SpawnPlayer( client );
entities[ client ]->FreeModelDef();
@ -1363,7 +1363,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
break;
}
case GAME_RELIABLE_MESSAGE_SOUND_INDEX: {
int index = gameLocal.ClientRemapDecl( DECL_SOUND, msg.ReadLong() );
int index = gameLocal.ClientRemapDecl( DECL_SOUND, msg.ReadInt() );
if ( index >= 0 && index < declManager->GetNumDecls( DECL_SOUND ) ) {
const idSoundShader *shader = declManager->SoundByIndex( index );
mpGame.PlayGlobalSound( -1, SND_COUNT, shader->GetName() );
@ -1387,7 +1387,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
event->spawnId = msg.ReadBits( 32 );
event->event = msg.ReadByte();
event->time = msg.ReadLong();
event->time = msg.ReadInt();
event->paramsSize = msg.ReadBits( idMath::BitsForInteger( MAX_EVENT_PARAM_SIZE ) );
if ( event->paramsSize ) {
@ -1434,7 +1434,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
break;
}
case GAME_RELIABLE_MESSAGE_PORTALSTATES: {
int numPortals = msg.ReadLong();
int numPortals = msg.ReadInt();
assert( numPortals == gameRenderWorld->NumPortals() );
for ( int i = 0; i < numPortals; i++ ) {
gameRenderWorld->SetPortalState( (qhandle_t) (i+1), msg.ReadBits( NUM_RENDER_PORTAL_BITS ) );
@ -1442,7 +1442,7 @@ void idGameLocal::ClientProcessReliableMessage( int clientNum, const idBitMsg &m
break;
}
case GAME_RELIABLE_MESSAGE_PORTAL: {
qhandle_t portal = msg.ReadLong();
qhandle_t portal = msg.ReadInt();
int blockingBits = msg.ReadBits( NUM_RENDER_PORTAL_BITS );
assert( portal > 0 && portal <= gameRenderWorld->NumPortals() );
gameRenderWorld->SetPortalState( portal, blockingBits );

14
neo/game/Light.cpp
View file

@ -1100,14 +1100,14 @@ void idLight::ReadFromSnapshot( const idBitMsgDelta &msg ) {
Off();
}
}
UnpackColor( msg.ReadLong(), baseColor );
UnpackColor( msg.ReadInt(), baseColor );
// lightParentEntityNum = msg.ReadBits( GENTITYNUM_BITS );
/* // only helps prediction
UnpackColor( msg.ReadLong(), fadeFrom );
UnpackColor( msg.ReadLong(), fadeTo );
fadeStart = msg.ReadLong();
fadeEnd = msg.ReadLong();
UnpackColor( msg.ReadInt(), fadeFrom );
UnpackColor( msg.ReadInt(), fadeTo );
fadeStart = msg.ReadInt();
fadeEnd = msg.ReadInt();
*/
// FIXME: read renderLight.shader
@ -1115,14 +1115,14 @@ void idLight::ReadFromSnapshot( const idBitMsgDelta &msg ) {
renderLight.lightRadius[1] = msg.ReadFloat( 5, 10 );
renderLight.lightRadius[2] = msg.ReadFloat( 5, 10 );
UnpackColor( msg.ReadLong(), shaderColor );
UnpackColor( msg.ReadInt(), shaderColor );
renderLight.shaderParms[SHADERPARM_RED] = shaderColor[0];
renderLight.shaderParms[SHADERPARM_GREEN] = shaderColor[1];
renderLight.shaderParms[SHADERPARM_BLUE] = shaderColor[2];
renderLight.shaderParms[SHADERPARM_ALPHA] = shaderColor[3];
renderLight.shaderParms[SHADERPARM_TIMESCALE] = msg.ReadFloat( 5, 10 );
renderLight.shaderParms[SHADERPARM_TIMEOFFSET] = msg.ReadLong();
renderLight.shaderParms[SHADERPARM_TIMEOFFSET] = msg.ReadInt();
//renderLight.shaderParms[SHADERPARM_DIVERSITY] = msg.ReadFloat();
renderLight.shaderParms[SHADERPARM_MODE] = msg.ReadShort();

2
neo/game/Moveable.cpp
View file

@ -1182,7 +1182,7 @@ bool idExplodingBarrel::ClientReceiveEvent( int event, int time, const idBitMsg
switch( event ) {
case EVENT_EXPLODE:
if ( gameLocal.realClientTime - msg.ReadLong() < spawnArgs.GetInt( "explode_lapse", "1000" ) ) {
if ( gameLocal.realClientTime - msg.ReadInt() < spawnArgs.GetInt( "explode_lapse", "1000" ) ) {
ExplodingEffects( );
}
return true;

4
neo/game/MultiplayerGame.cpp
View file

@ -3388,7 +3388,7 @@ void idMultiplayerGame::ClientReadStartState( const idBitMsg &msg ) {
// read the state in preparation for reading snapshot updates
gameState = (idMultiplayerGame::gameState_t)msg.ReadByte();
matchStartedTime = msg.ReadLong( );
matchStartedTime = msg.ReadInt( );
startFragLimit = msg.ReadShort( );
while ( ( client = msg.ReadShort() ) != MAX_CLIENTS ) {
assert( gameLocal.entities[ client ] && gameLocal.entities[ client ]->IsType( idPlayer::Type ) );
@ -3409,5 +3409,5 @@ idMultiplayerGame::ClientReadWarmupTime
================
*/
void idMultiplayerGame::ClientReadWarmupTime( const idBitMsg &msg ) {
warmupEndTime = msg.ReadLong();
warmupEndTime = msg.ReadInt();
}

2
neo/game/Player.cpp
View file

@ -8187,7 +8187,7 @@ void idPlayer::ReadPlayerStateFromSnapshot( const idBitMsgDelta &msg ) {
int i, ammo;
bobCycle = msg.ReadByte();
stepUpTime = msg.ReadLong();
stepUpTime = msg.ReadInt();
stepUpDelta = msg.ReadFloat();
inventory.weapons = msg.ReadShort();
inventory.armor = msg.ReadByte();

2
neo/game/Projectile.cpp
View file

@ -1202,7 +1202,7 @@ bool idProjectile::ClientReceiveEvent( int event, int time, const idBitMsg &msg
collision.c.point[1] = msg.ReadFloat();
collision.c.point[2] = msg.ReadFloat();
collision.c.normal = msg.ReadDir( 24 );
int index = gameLocal.ClientRemapDecl( DECL_MATERIAL, msg.ReadLong() );
int index = gameLocal.ClientRemapDecl( DECL_MATERIAL, msg.ReadInt() );
collision.c.material = ( index != -1 ) ? static_cast<const idMaterial *>( declManager->DeclByIndex( DECL_MATERIAL, index ) ) : NULL;
velocity[0] = msg.ReadFloat( 5, 10 );
velocity[1] = msg.ReadFloat( 5, 10 );

2
neo/game/Weapon.cpp
View file

@ -2321,7 +2321,7 @@ bool idWeapon::ClientReceiveEvent( int event, int time, const idBitMsg &msg ) {
return true;
}
case EVENT_CHANGESKIN: {
int index = gameLocal.ClientRemapDecl( DECL_SKIN, msg.ReadLong() );
int index = gameLocal.ClientRemapDecl( DECL_SKIN, msg.ReadInt() );
renderEntity.customSkin = ( index != -1 ) ? static_cast<const idDeclSkin *>( declManager->DeclByIndex( DECL_SKIN, index ) ) : NULL;
UpdateVisuals();
if ( worldModel.GetEntity() ) {

2
neo/game/physics/Physics_AF.cpp
View file

@ -7971,7 +7971,7 @@ void idPhysics_AF::ReadFromSnapshot( const idBitMsgDelta &msg ) {
int i, num id_attribute((unused));
idCQuat quat;
current.atRest = msg.ReadLong();
current.atRest = msg.ReadInt();
current.noMoveTime = msg.ReadFloat();
current.activateTime = msg.ReadFloat();
current.pushVelocity[0] = msg.ReadDeltaFloat( 0.0f, AF_VELOCITY_EXPONENT_BITS, AF_VELOCITY_MANTISSA_BITS );

2
neo/game/physics/Physics_Monster.cpp
View file

@ -802,6 +802,6 @@ void idPhysics_Monster::ReadFromSnapshot( const idBitMsgDelta &msg ) {
current.pushVelocity[0] = msg.ReadDeltaFloat( 0.0f, MONSTER_VELOCITY_EXPONENT_BITS, MONSTER_VELOCITY_MANTISSA_BITS );
current.pushVelocity[1] = msg.ReadDeltaFloat( 0.0f, MONSTER_VELOCITY_EXPONENT_BITS, MONSTER_VELOCITY_MANTISSA_BITS );
current.pushVelocity[2] = msg.ReadDeltaFloat( 0.0f, MONSTER_VELOCITY_EXPONENT_BITS, MONSTER_VELOCITY_MANTISSA_BITS );
current.atRest = msg.ReadLong();
current.atRest = msg.ReadInt();
current.onGround = msg.ReadBits( 1 ) != 0;
}

4
neo/game/physics/Physics_Parametric.cpp
View file

@ -1106,8 +1106,8 @@ void idPhysics_Parametric::ReadFromSnapshot( const idBitMsgDelta &msg ) {
idVec3 linearStartValue, linearSpeed, linearBaseSpeed, startPos, endPos;
idAngles angularStartValue, angularSpeed, angularBaseSpeed, startAng, endAng;
current.time = msg.ReadLong();
current.atRest = msg.ReadLong();
current.time = msg.ReadInt();
current.atRest = msg.ReadInt();
current.origin[0] = msg.ReadFloat();
current.origin[1] = msg.ReadFloat();
current.origin[2] = msg.ReadFloat();

2
neo/game/physics/Physics_RigidBody.cpp
View file

@ -1504,7 +1504,7 @@ idPhysics_RigidBody::ReadFromSnapshot
void idPhysics_RigidBody::ReadFromSnapshot( const idBitMsgDelta &msg ) {
idCQuat quat, localQuat;
current.atRest = msg.ReadLong();
current.atRest = msg.ReadInt();
current.i.position[0] = msg.ReadFloat();
current.i.position[1] = msg.ReadFloat();
current.i.position[2] = msg.ReadFloat();

8
neo/idlib/BitMsg.h
View file

@ -113,7 +113,7 @@ public:
int ReadByte( void ) const;
int ReadShort( void ) const;
int ReadUShort( void ) const;
int ReadLong( void ) const;
int ReadInt( void ) const;
float ReadFloat( void ) const;
float ReadFloat( int exponentBits, int mantissaBits ) const;
float ReadAngle8( void ) const;
@ -376,7 +376,7 @@ ID_INLINE int idBitMsg::ReadUShort( void ) const {
return (unsigned short)ReadBits( 16 );
}
ID_INLINE int idBitMsg::ReadLong( void ) const {
ID_INLINE int idBitMsg::ReadInt( void ) const {
return ReadBits( 32 );
}
@ -479,7 +479,7 @@ public:
int ReadByte( void ) const;
int ReadShort( void ) const;
int ReadUShort( void ) const;
int ReadLong( void ) const;
int ReadInt( void ) const;
float ReadFloat( void ) const;
float ReadFloat( int exponentBits, int mantissaBits ) const;
float ReadAngle8( void ) const;
@ -622,7 +622,7 @@ ID_INLINE int idBitMsgDelta::ReadUShort( void ) const {
return (unsigned short)ReadBits( 16 );
}
ID_INLINE int idBitMsgDelta::ReadLong( void ) const {
ID_INLINE int idBitMsgDelta::ReadInt( void ) const {
return ReadBits( 32 );
}

6
neo/tools/debugger/DebuggerClient.cpp
View file

@ -194,7 +194,7 @@ void rvDebuggerClient::HandleBreak ( msg_t* msg )
mBreak = true;
// Line number
mBreakLineNumber = MSG_ReadLong ( msg );
mBreakLineNumber = MSG_ReadInt ( msg );
// Filename
MSG_ReadString ( msg, filename, MAX_PATH );
@ -263,7 +263,7 @@ void rvDebuggerClient::HandleInspectCallstack ( msg_t* msg )
entry->mFilename = temp;
// Line Number
entry->mLineNumber = MSG_ReadLong ( msg );
entry->mLineNumber = MSG_ReadInt ( msg );
// Add to list
mCallstack.Append ( entry );
@ -296,7 +296,7 @@ void rvDebuggerClient::HandleInspectThreads ( msg_t* msg )
entry->mName = temp;
// Thread ID
entry->mID = MSG_ReadLong ( msg );
entry->mID = MSG_ReadInt ( msg );
// Thread state
entry->mCurrent = MSG_ReadBits ( msg, 1 ) ? true : false;

6
neo/tools/debugger/DebuggerServer.cpp
View file

@ -268,8 +268,8 @@ void rvDebuggerServer::HandleAddBreakpoint ( msg_t* msg )
// Read the breakpoint info
onceOnly = MSG_ReadBits ( msg, 1 ) ? true : false;
lineNumber = MSG_ReadLong ( msg );
id = MSG_ReadLong ( msg );
lineNumber = MSG_ReadInt ( msg );
id = MSG_ReadInt ( msg );
MSG_ReadString ( msg, filename, MAX_PATH );
@ -295,7 +295,7 @@ void rvDebuggerServer::HandleRemoveBreakpoint ( msg_t* msg )
int id;
// ID that we are to remove
id = MSG_ReadLong ( msg );
id = MSG_ReadInt ( msg );
// Since breakpoints are used by both threads we need to
// protect them with a crit section