[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bzflag-commits
Subject:    SF.net SVN: bzflag: [16645]
From:       bryjen () users ! sourceforge ! net
Date:       2008-02-26 2:26:41
Message-ID: E1JTpWj-0001Ot-Pa () sc8-pr-svn2 ! sourceforge ! net
[Download RAW message or body]

Revision: 16645
          http://bzflag.svn.sourceforge.net/bzflag/?rev=16645&view=rev
Author:   bryjen
Date:     2008-02-25 18:26:41 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
unshadow variable

Modified Paths:
--------------
    branches/v2_0branch/bzflag/src/bzfs/bzfs.cxx

Modified: branches/v2_0branch/bzflag/src/bzfs/bzfs.cxx
===================================================================
--- branches/v2_0branch/bzflag/src/bzfs/bzfs.cxx	2008-02-25 04:50:54 UTC (rev 16644)
+++ branches/v2_0branch/bzflag/src/bzfs/bzfs.cxx	2008-02-26 02:26:41 UTC (rev 16645)
@@ -3638,15 +3638,15 @@
 	  }
   }
 
-  bz_MsgDebugEventData eventData;
-  eventData.code[0] = ((char*)&code)[0];
-  eventData.code[1] = ((char*)&code)[1];
-  eventData.time = TimeKeeper::getCurrent().getSeconds();
-  eventData.len = (size_t)len;
-  eventData.msg = (unsigned char*)buf;
-  eventData.playerID = playerData->getIndex();
+  bz_MsgDebugEventData debugEventData;
+  debugEventData.code[0] = ((char*)&code)[0];
+  debugEventData.code[1] = ((char*)&code)[1];
+  debugEventData.time = TimeKeeper::getCurrent().getSeconds();
+  debugEventData.len = (size_t)len;
+  debugEventData.msg = (unsigned char*)buf;
+  debugEventData.playerID = playerData->getIndex();
 
-  worldEventManager.callEvents(&eventData);
+  worldEventManager.callEvents(&debugEventData);
 
   switch (code) {
     // player joining
@@ -4032,22 +4032,22 @@
 	return;
       }
 
-      bz_FlagTransferredEventData eventData;
+      bz_FlagTransferredEventData ftEventData;
 
-      eventData.fromPlayerID = fromData->player.getPlayerIndex();
-      eventData.toPlayerID = toData->player.getPlayerIndex();
-      eventData.flagType = NULL;
-      eventData.action = eventData.ContinueSteal;
+      ftEventData.fromPlayerID = fromData->player.getPlayerIndex();
+      ftEventData.toPlayerID = toData->player.getPlayerIndex();
+      ftEventData.flagType = NULL;
+      ftEventData.action = ftEventData.ContinueSteal;
 
-      worldEventManager.callEvents(bz_eFlagTransferredEvent,&eventData);
+      worldEventManager.callEvents(bz_eFlagTransferredEvent,&ftEventData);
 
-      if (eventData.action != eventData.CancelSteal) {
+      if (ftEventData.action != ftEventData.CancelSteal) {
         int oFlagIndex = toData->player.getFlag();
         if (oFlagIndex >= 0)
           zapFlag (*FlagInfo::get(oFlagIndex));
       }
 
-      if (eventData.action == eventData.ContinueSteal) {
+      if (ftEventData.action == ftEventData.ContinueSteal) {
         void *obufStart = getDirectMessageBuffer();
         void *obuf = nboPackUByte(obufStart, from);
         obuf = nboPackUByte(obuf, to);
@@ -4155,15 +4155,15 @@
 		}
 	// tell the API that they moved.
 
-	bz_PlayerUpdateEventData eventData;
-	memcpy(eventData.pos,state.pos,sizeof(float)*3);
-	memcpy(eventData.velocity,state.velocity,sizeof(float)*3);
-	eventData.angVel = state.angVel;
-	eventData.azimuth = state.azimuth;
-	eventData.phydrv = state.phydrv;
-	eventData.time = TimeKeeper::getCurrent().getSeconds();
-	eventData.playerID = id;
-	worldEventManager.callEvents(bz_ePlayerUpdateEvent,&eventData);
+	bz_PlayerUpdateEventData puEventData;
+	memcpy(puEventData.pos,state.pos,sizeof(float)*3);
+	memcpy(puEventData.velocity,state.velocity,sizeof(float)*3);
+	puEventData.angVel = state.angVel;
+	puEventData.azimuth = state.azimuth;
+	puEventData.phydrv = state.phydrv;
+	puEventData.time = TimeKeeper::getCurrent().getSeconds();
+	puEventData.playerID = id;
+	worldEventManager.callEvents(bz_ePlayerUpdateEvent,&puEventData);
 
       // silently drop old packet
       if (state.order <= playerData->lastState.order) {


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
BZFlag-commits mailing list
BZFlag-commits@lists.SourceForge.net
https://lists.SourceForge.net/lists/listinfo/bzflag-commits
irc: #BZFlag @ irc.freenode.net


[prev in list] [next in list] [prev in thread] [next in thread]