From 96161cd12971be0b4ba5a256c52ecfd214e35e40 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Wed, 1 Nov 2006 23:17:13 +0000 Subject: [PATCH] Correct "bottom" vs "top" message. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2492 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/netplay/packethandlers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sc2/src/sc2code/netplay/packethandlers.c b/sc2/src/sc2code/netplay/packethandlers.c index 267e92be1..3a21901b8 100644 --- a/sc2/src/sc2code/netplay/packethandlers.c +++ b/sc2/src/sc2code/netplay/packethandlers.c @@ -197,7 +197,7 @@ PacketHandler_Fleet(NetConnection *conn, const Packet_Fleet *packet) { if (conn->stateFlags.handshake.localOk) { Netplay_cancelConfirmation(conn); - confirmationCancelled(battleStateData->meleeState, player); + confirmationCancelled(battleStateData->meleeState, conn->player); } for (i = 0; i < numShips; i++) { @@ -231,14 +231,14 @@ PacketHandler_TeamName(NetConnection *conn, const Packet_TeamName *packet) { return -1; } - side = localSide(conn, (NetplaySide) packet->side); battleStateData = (BattleStateData *) NetConnection_getStateData(conn); if (conn->stateFlags.handshake.localOk) { Netplay_cancelConfirmation(conn); - confirmationCancelled(battleStateData->meleeState, side); + confirmationCancelled(battleStateData->meleeState, conn->player); } + side = localSide(conn, (NetplaySide) packet->side); nameLen = packetLength((const Packet *) packet) - sizeof (Packet_TeamName) - 1; // The -1 is for not counting the terminating '\0'.