Correct "bottom" vs "top" message.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2492 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-11-01 23:17:13 +00:00
parent b2dd45c17f
commit 96161cd129
+3 -3
View File
@@ -197,7 +197,7 @@ PacketHandler_Fleet(NetConnection *conn, const Packet_Fleet *packet) {
if (conn->stateFlags.handshake.localOk) { if (conn->stateFlags.handshake.localOk) {
Netplay_cancelConfirmation(conn); Netplay_cancelConfirmation(conn);
confirmationCancelled(battleStateData->meleeState, player); confirmationCancelled(battleStateData->meleeState, conn->player);
} }
for (i = 0; i < numShips; i++) { for (i = 0; i < numShips; i++) {
@@ -231,14 +231,14 @@ PacketHandler_TeamName(NetConnection *conn, const Packet_TeamName *packet) {
return -1; return -1;
} }
side = localSide(conn, (NetplaySide) packet->side);
battleStateData = (BattleStateData *) NetConnection_getStateData(conn); battleStateData = (BattleStateData *) NetConnection_getStateData(conn);
if (conn->stateFlags.handshake.localOk) { if (conn->stateFlags.handshake.localOk) {
Netplay_cancelConfirmation(conn); Netplay_cancelConfirmation(conn);
confirmationCancelled(battleStateData->meleeState, side); confirmationCancelled(battleStateData->meleeState, conn->player);
} }
side = localSide(conn, (NetplaySide) packet->side);
nameLen = packetLength((const Packet *) packet) nameLen = packetLength((const Packet *) packet)
- sizeof (Packet_TeamName) - 1; - sizeof (Packet_TeamName) - 1;
// The -1 is for not counting the terminating '\0'. // The -1 is for not counting the terminating '\0'.