1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-05-27 20:38:52 +00:00
parent 921394b24c
commit f92f70c78d
39 changed files with 167 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/client.cpp
+17 -14
View File
@@ -1736,6 +1736,7 @@ void start_battle ( void )
}
//SOLDIERTYPE *pSoldier = MercPtrs[ 0 ];
Assert(pSoldier);
UINT8 ubGroupID = pSoldier->ubGroupID;
GROUP *pGroup;
@@ -3376,7 +3377,7 @@ void send_disarm_explosive(UINT32 sGridNo, UINT32 uiWorldItem, UINT8 ubID)
#ifdef JA2BETAVERSION
CHAR tmpMPDbgString[512];
sprintf(tmpMPDbgString,"MP - send_disarm_explosive ( MPTeam : %i , uiWorldIndex : %i , uiPreRandomIndex : %i , sGridNo : %i )\n",disarm.ubMPTeamIndex, disarm.uiWorldItemIndex , disarm.uiPreRandomIndex );
sprintf(tmpMPDbgString,"MP - send_disarm_explosive ( MPTeam : %i , uiWorldIndex : %i , uiPreRandomIndex : %i , sGridNo : %i )\n", disarm.ubMPTeamIndex, disarm.uiWorldItemIndex , disarm.uiPreRandomIndex, disarm.sGridNo);
MPDebugMsg(tmpMPDbgString);
gfMPDebugOutputRandoms = true;
#endif
@@ -3842,9 +3843,9 @@ void send_death( SOLDIERTYPE *pSoldier )
}
SOLDIERTYPE * pAttacker=MercPtrs[ nDeath.attacker_id ];
INT8 pA_bTeam;
INT8 pA_bTeam=CLIENT_NUM;
CHAR16 pA_name[ 10 ];
INT8 pS_bTeam;
INT8 pS_bTeam=CLIENT_NUM;
CHAR16 pS_name[ 10 ];
// OJW - 20081222
@@ -3915,23 +3916,25 @@ void send_death( SOLDIERTYPE *pSoldier )
client->RPC("sendDEATH",(const char*)&nDeath, (int)sizeof(death_struct)*8, HIGH_PRIORITY, RELIABLE, 0, UNASSIGNED_SYSTEM_ADDRESS, true, 0, UNASSIGNED_NETWORK_ID,0);
// print kill notice to screen
if (pSoldier->bTeam==1)
if (pSoldier && pSoldier->bTeam==1)
ScreenMsg( FONT_YELLOW, MSG_MPSYSTEM, MPClientMessage[67]);
else
ScreenMsg( FONT_LTGREEN, MSG_MPSYSTEM, MPClientMessage[28],pS_name,(pS_bTeam),client_names[(pS_bTeam-1)],pA_name,(pA_bTeam),client_names[(pA_bTeam-1)] );
#ifdef JA2BETAVERSION
char s_name[10];
char a_name[10];
WideCharToMultiByte(CP_UTF8,0,pS_name,-1, s_name,10,NULL,NULL);
WideCharToMultiByte(CP_UTF8,0,pA_name,-1, a_name,10,NULL,NULL);
if (pSoldier) {
char s_name[10];
char a_name[10];
WideCharToMultiByte(CP_UTF8,0,pS_name,-1, s_name,10,NULL,NULL);
WideCharToMultiByte(CP_UTF8,0,pA_name,-1, a_name,10,NULL,NULL);
if (pSoldier->bTeam==1)
MPDebugMsg( String ( "MPDEBUG SEND - Enemy AI #%d was killed by ('%s' - %d) (client %d - '%s')\n",nDeath.soldier_id,a_name,nDeath.attacker_id,pA_bTeam,client_names[pA_bTeam-1]) );
else if (pAttacker->bTeam==1)
MPDebugMsg( String ( "MPDEBUG SEND - '%s' (client %d - '%S') was killed by '%s' (client %d - '%s')\n",s_name,pS_bTeam,client_names[(pS_bTeam-1)],a_name,pA_bTeam,"Queens Army") );
else
MPDebugMsg( String ( "MPDEBUG SEND - '%s' (client %d - '%S') was killed by '%s' (client %d - '%s')\n",s_name,pS_bTeam,client_names[(pS_bTeam-1)],a_name,pA_bTeam,client_names[(pA_bTeam-1)]) );
if (pSoldier->bTeam==1)
MPDebugMsg( String ( "MPDEBUG SEND - Enemy AI #%d was killed by ('%s' - %d) (client %d - '%s')\n",nDeath.soldier_id,a_name,nDeath.attacker_id,pA_bTeam,client_names[pA_bTeam-1]) );
else if (pAttacker->bTeam==1)
MPDebugMsg( String ( "MPDEBUG SEND - '%s' (client %d - '%S') was killed by '%s' (client %d - '%s')\n",s_name,pS_bTeam,client_names[(pS_bTeam-1)],a_name,pA_bTeam,"Queens Army") );
else
MPDebugMsg( String ( "MPDEBUG SEND - '%s' (client %d - '%S') was killed by '%s' (client %d - '%s')\n",s_name,pS_bTeam,client_names[(pS_bTeam-1)],a_name,pA_bTeam,client_names[(pA_bTeam-1)]) );
}
#endif
}
Multiplayer/server.cpp
+4
View File
@@ -238,6 +238,7 @@ void sendHIT(RPCParameters *rpcParameters)
else if (team == 0)
team = CLIENT_NUM-1; // this case should not be possible, including as a precaution
Assert(team<5); // FIXME
gMPPlayerStats[team].hits++;
server->RPC("recieveHIT",(const char*)rpcParameters->input, (*rpcParameters).numberOfBitsOfData, HIGH_PRIORITY, RELIABLE, 0, rpcParameters->sender, true, 0, UNASSIGNED_NETWORK_ID,0);
@@ -386,6 +387,7 @@ void sendhitSTRUCT(RPCParameters *rpcParameters)
else if (team == 0)
team = CLIENT_NUM-1; // this case should not be possible, including as a precaution
Assert(team<5); // FIXME
gMPPlayerStats[team].misses++;
}
@@ -410,6 +412,7 @@ void sendhitWINDOW(RPCParameters *rpcParameters)
else if (team == 0)
team = CLIENT_NUM-1; // this case should not be possible, including as a precaution
Assert(team<5); // FIXME
gMPPlayerStats[team].misses++;
}
@@ -433,6 +436,7 @@ void sendMISS(RPCParameters *rpcParameters)
else if (team == 0)
team = CLIENT_NUM-1; // this case should not be possible, including as a precaution
Assert(team<5); // FIXME
gMPPlayerStats[team].misses++;
}