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

List:       bzflag-commits
Subject:    SF.net SVN: bzflag: [16639] branches/v2_0branch/bzflag
From:       JeffM2501 () users ! sourceforge ! net
Date:       2008-02-24 18:59:12
Message-ID: E1JTM48-0007NS-Qd () sc8-pr-svn2 ! sourceforge ! net
[Download RAW message or body]

Revision: 16639
          http://bzflag.svn.sourceforge.net/bzflag/?rev=16639&view=rev
Author:   JeffM2501
Date:     2008-02-24 10:59:12 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
whitespace and eventlog fixes.

Modified Paths:
--------------
    branches/v2_0branch/bzflag/include/WorldEventManager.h
    branches/v2_0branch/bzflag/include/bzfsAPI.h
    branches/v2_0branch/bzflag/src/bzfs/WorldEventManager.cxx
    branches/v2_0branch/bzflag/src/bzfs/bzfs.cxx

Modified: branches/v2_0branch/bzflag/include/WorldEventManager.h
===================================================================
--- branches/v2_0branch/bzflag/include/WorldEventManager.h	2008-02-24 17:22:19 UTC \
                (rev 16638)
+++ branches/v2_0branch/bzflag/include/WorldEventManager.h	2008-02-24 18:59:12 UTC \
(rev 16639) @@ -39,6 +39,7 @@
 	void removeEvent ( bz_eEventType eventType, bz_EventHandler* theEvent );
 	tvEventList getEventList ( bz_eEventType eventType);
 	void callEvents ( bz_eEventType eventType, bz_EventData	*eventData );
+	void callEvents ( bz_EventData	*eventData );
 
 	int getEventCount ( bz_eEventType eventType );
 protected:

Modified: branches/v2_0branch/bzflag/include/bzfsAPI.h
===================================================================
--- branches/v2_0branch/bzflag/include/bzfsAPI.h	2008-02-24 17:22:19 UTC (rev 16638)
+++ branches/v2_0branch/bzflag/include/bzfsAPI.h	2008-02-24 18:59:12 UTC (rev 16639)
@@ -24,19 +24,19 @@
 /* JUST THIS ONE FILE */
 
 #ifdef _WIN32
-	#ifdef INSIDE_BZ
-		#define BZF_API __declspec( dllexport )
-	#else
-		#define BZF_API __declspec( dllimport )
-	#endif
-	#define BZF_PLUGIN_CALL
-	#ifndef strcasecmp
-		#define strcasecmp stricmp
-	#endif
+#ifdef INSIDE_BZ
+#define BZF_API __declspec( dllexport )
 #else
-	#define BZF_API
-	#define BZF_PLUGIN_CALL extern "C"
+#define BZF_API __declspec( dllimport )
 #endif
+#define BZF_PLUGIN_CALL
+#ifndef strcasecmp
+#define strcasecmp stricmp
+#endif
+#else
+#define BZF_API
+#define BZF_PLUGIN_CALL extern "C"
+#endif
 
 #define BZ_API_VERSION	16
 
@@ -49,47 +49,48 @@
 
 typedef enum
 {
-	bz_eNullEvent = 0,
-	bz_eCaptureEvent,
-	bz_ePlayerDieEvent,
-	bz_ePlayerSpawnEvent,
-	bz_eZoneEntryEvent,
-	bz_eZoneExitEvent,
-	bz_ePlayerJoinEvent,
-	bz_ePlayerPartEvent,
-	bz_eChatMessageEvent,
-	bz_eUnknownSlashCommand,
-	bz_eGetPlayerSpawnPosEvent,
-	bz_eGetAutoTeamEvent,
-	bz_eAllowPlayer,
-	bz_eTickEvent,
-	bz_eGetWorldEvent,
-	bz_eGetPlayerInfoEvent,
-	bz_eAllowSpawn,
-	bz_eListServerUpdateEvent,
-	bz_eBanEvent,
-	bz_eHostBanEvent,
-	bz_eKickEvent,
-	bz_eKillEvent,
-	bz_ePlayerPausedEvent,
-	bz_eMessageFilteredEvent,
-	bz_eGameStartEvent,
-	bz_eGameEndEvent,
-	bz_eSlashCommandEvent,
-	bz_ePlayerAuthEvent,
-	bz_eServerMsgEvent,
-	bz_eShotFiredEvent,
-	bz_ePlayerUpdateEvent,
-	bz_eNetDataSendEvent,
-	bz_eNetDataReceveEvent,
-	bz_eLogingEvent,
-	bz_eShotEndedEvent,
-	bz_eFlagTransferredEvent,
-	bz_eFlagGrabbedEvent,
-	bz_eFlagDroppedEvent,
-	bz_eFlagResetEvent,
-	bz_eAllowCTFCapEvent,
-	bz_eLastEvent    //this is never used as an event, just show it's the last one
+  bz_eNullEvent = 0,
+  bz_eCaptureEvent,
+  bz_ePlayerDieEvent,
+  bz_ePlayerSpawnEvent,
+  bz_eZoneEntryEvent,
+  bz_eZoneExitEvent,
+  bz_ePlayerJoinEvent,
+  bz_ePlayerPartEvent,
+  bz_eChatMessageEvent,
+  bz_eUnknownSlashCommand,
+  bz_eGetPlayerSpawnPosEvent,
+  bz_eGetAutoTeamEvent,
+  bz_eAllowPlayer,
+  bz_eTickEvent,
+  bz_eGetWorldEvent,
+  bz_eGetPlayerInfoEvent,
+  bz_eAllowSpawn,
+  bz_eListServerUpdateEvent,
+  bz_eBanEvent,
+  bz_eHostBanEvent,
+  bz_eKickEvent,
+  bz_eKillEvent,
+  bz_ePlayerPausedEvent,
+  bz_eMessageFilteredEvent,
+  bz_eGameStartEvent,
+  bz_eGameEndEvent,
+  bz_eSlashCommandEvent,
+  bz_ePlayerAuthEvent,
+  bz_eServerMsgEvent,
+  bz_eShotFiredEvent,
+  bz_ePlayerUpdateEvent,
+  bz_eNetDataSendEvent,
+  bz_eNetDataReceveEvent,
+  bz_eLogingEvent,
+  bz_eShotEndedEvent,
+  bz_eFlagTransferredEvent,
+  bz_eFlagGrabbedEvent,
+  bz_eFlagDroppedEvent,
+  bz_eFlagResetEvent,
+  bz_eAllowCTFCapEvent,
+  bz_eMsgDebugEvent,
+  bz_eLastEvent    //this is never used as an event, just show it's the last one
 }bz_eEventType;
 
 // permision #defines
@@ -155,16 +156,16 @@
 
 typedef enum
 {
-	eNoTeam = -1,
-	eRogueTeam = 0,
-	eRedTeam,
-	eGreenTeam,
-	eBlueTeam,
-	ePurpleTeam,
-	eRabbitTeam,
-	eHunterTeam,
-	eObservers,
-	eAdministrators
+  eNoTeam = -1,
+  eRogueTeam = 0,
+  eRedTeam,
+  eGreenTeam,
+  eBlueTeam,
+  ePurpleTeam,
+  eRabbitTeam,
+  eHunterTeam,
+  eObservers,
+  eAdministrators
 }bz_eTeamType;
 
 #define BZ_SERVER		-2
@@ -178,146 +179,146 @@
 
 typedef enum
 {
-	eFFAGame= 0,
-	eCTFGame,
-	eRabbitGame
+  eFFAGame= 0,
+  eCTFGame,
+  eRabbitGame
 }bz_eGameType;
 
 //utility classes
 class BZF_API bzApiString
 {
 public:
-	bzApiString();
-	bzApiString(const char* c);
-	bzApiString(const std::string &s);
-	bzApiString(const bzApiString &r);
+  bzApiString();
+  bzApiString(const char* c);
+  bzApiString(const std::string &s);
+  bzApiString(const bzApiString &r);
 
-	~bzApiString();
+  ~bzApiString();
 
-	bzApiString& operator = ( const bzApiString& r );
-	bzApiString& operator = ( const std::string& r );
-	bzApiString& operator = ( const char* r );
+  bzApiString& operator = ( const bzApiString& r );
+  bzApiString& operator = ( const std::string& r );
+  bzApiString& operator = ( const char* r );
 
-	bool operator == ( const bzApiString&r );
-	bool operator == ( const std::string& r );
-	bool operator == ( const char* r );
+  bool operator == ( const bzApiString&r );
+  bool operator == ( const std::string& r );
+  bool operator == ( const char* r );
 
-	bool operator != ( const bzApiString&r );
-	bool operator != ( const std::string& r );
-	bool operator != ( const char* r );
+  bool operator != ( const bzApiString&r );
+  bool operator != ( const std::string& r );
+  bool operator != ( const char* r );
 
-	unsigned int size ( void ) const;
+  unsigned int size ( void ) const;
 
-	const char* c_str(void) const;
+  const char* c_str(void) const;
 
-	void format(const char* fmt, ...);
+  void format(const char* fmt, ...);
 
-	void replaceAll ( const char* target, const char* with );
+  void replaceAll ( const char* target, const char* with );
 
-	void tolower ( void );
-	void toupper ( void );
-	void urlEncode ( void );
+  void tolower ( void );
+  void toupper ( void );
+  void urlEncode ( void );
 
 protected:
-	class dataBlob;
+  class dataBlob;
 
-	dataBlob	*data;
+  dataBlob	*data;
 };
 
- class BZF_API bzAPIIntList
- {
- public:
-	 bzAPIIntList();
-	 bzAPIIntList(const bzAPIIntList	&r);
-	 bzAPIIntList(const std::vector<int>	&r);
+class BZF_API bzAPIIntList
+{
+public:
+  bzAPIIntList();
+  bzAPIIntList(const bzAPIIntList	&r);
+  bzAPIIntList(const std::vector<int>	&r);
 
-	 ~bzAPIIntList();
+  ~bzAPIIntList();
 
-	 void push_back ( int value );
-	 int get ( unsigned int i );
+  void push_back ( int value );
+  int get ( unsigned int i );
 
-	 const int& operator[] (unsigned int i) const;
-	 bzAPIIntList& operator = ( const bzAPIIntList& r );
-	 bzAPIIntList& operator = ( const std::vector<int>& r );
+  const int& operator[] (unsigned int i) const;
+  bzAPIIntList& operator = ( const bzAPIIntList& r );
+  bzAPIIntList& operator = ( const std::vector<int>& r );
 
-	 unsigned int size ( void );
-	 void clear ( void );
+  unsigned int size ( void );
+  void clear ( void );
 
- protected:
-	 class dataBlob;
+protected:
+  class dataBlob;
 
-	 dataBlob *data;
- };
+  dataBlob *data;
+};
 
- BZF_API bzAPIIntList* bz_newIntList ( void );
- BZF_API void bz_deleteIntList( bzAPIIntList * l );
+BZF_API bzAPIIntList* bz_newIntList ( void );
+BZF_API void bz_deleteIntList( bzAPIIntList * l );
 
- class BZF_API bzAPIFloatList
- {
- public:
-	 bzAPIFloatList();
-	 bzAPIFloatList(const bzAPIFloatList	&r);
-	 bzAPIFloatList(const std::vector<float>	&r);
+class BZF_API bzAPIFloatList
+{
+public:
+  bzAPIFloatList();
+  bzAPIFloatList(const bzAPIFloatList	&r);
+  bzAPIFloatList(const std::vector<float>	&r);
 
-	 ~bzAPIFloatList();
+  ~bzAPIFloatList();
 
-	 void push_back ( float value );
-	 float get ( unsigned int i );
+  void push_back ( float value );
+  float get ( unsigned int i );
 
-	 const float& operator[] (unsigned int i) const;
-	 bzAPIFloatList& operator = ( const bzAPIFloatList& r );
-	 bzAPIFloatList& operator = ( const std::vector<float>& r );
+  const float& operator[] (unsigned int i) const;
+  bzAPIFloatList& operator = ( const bzAPIFloatList& r );
+  bzAPIFloatList& operator = ( const std::vector<float>& r );
 
-	 unsigned int size ( void );
-	 void clear ( void );
+  unsigned int size ( void );
+  void clear ( void );
 
- protected:
-	 class dataBlob;
+protected:
+  class dataBlob;
 
-	 dataBlob *data;
- };
+  dataBlob *data;
+};
 
- BZF_API bzAPIFloatList* bz_newFloatList ( void );
- BZF_API void bz_deleteFloatList( bzAPIFloatList * l );
+BZF_API bzAPIFloatList* bz_newFloatList ( void );
+BZF_API void bz_deleteFloatList( bzAPIFloatList * l );
 
- class BZF_API bzAPIStringList
- {
- public:
-	 bzAPIStringList();
-	 bzAPIStringList(const bzAPIStringList	&r);
-	 bzAPIStringList(const std::vector<std::string>	&r);
+class BZF_API bzAPIStringList
+{
+public:
+  bzAPIStringList();
+  bzAPIStringList(const bzAPIStringList	&r);
+  bzAPIStringList(const std::vector<std::string>	&r);
 
-	 ~bzAPIStringList();
+  ~bzAPIStringList();
 
-	 void push_back ( const bzApiString &value );
-	 void push_back ( const std::string &value );
-	 bzApiString get ( unsigned int i );
+  void push_back ( const bzApiString &value );
+  void push_back ( const std::string &value );
+  bzApiString get ( unsigned int i );
 
-	 const bzApiString& operator[] (unsigned int i) const;
-	 bzAPIStringList& operator = ( const bzAPIStringList& r );
-	 bzAPIStringList& operator = ( const std::vector<std::string>& r );
+  const bzApiString& operator[] (unsigned int i) const;
+  bzAPIStringList& operator = ( const bzAPIStringList& r );
+  bzAPIStringList& operator = ( const std::vector<std::string>& r );
 
-	 unsigned int size ( void );
-	 void clear ( void );
+  unsigned int size ( void );
+  void clear ( void );
 
-	 void tokenize ( const char* in, const char* delims, int maxTokens = 0, bool \
                useQuotes = false);
- protected:
-	 class dataBlob;
+  void tokenize ( const char* in, const char* delims, int maxTokens = 0, bool \
useQuotes = false); +protected:
+  class dataBlob;
 
-	 dataBlob *data;
- };
+  dataBlob *data;
+};
 
- BZF_API bzAPIStringList* bz_newStringList ( void );
- BZF_API void bz_deleteStringList( bzAPIStringList * l );
+BZF_API bzAPIStringList* bz_newStringList ( void );
+BZF_API void bz_deleteStringList( bzAPIStringList * l );
 
 // event data types
 class bz_EventData
 {
 public:
-	bz_EventData(){eventType = bz_eNullEvent;}
-	virtual ~bz_EventData(){};
+  bz_EventData(){eventType = bz_eNullEvent;}
+  virtual ~bz_EventData(){};
 
-	bz_eEventType	eventType;
+  bz_eEventType	eventType;
 };
 
 class bz_CTFCaptureEventData : public bz_EventData
@@ -344,585 +345,585 @@
 class bz_PlayerDieEventData : public bz_EventData
 {
 public:
-	bz_PlayerDieEventData()
-	{
-		eventType = bz_ePlayerDieEvent;
-		playerID = -1;
-		team = eNoTeam;
-		killerID = -1;
-		killerTeam = eNoTeam;
+  bz_PlayerDieEventData()
+  {
+    eventType = bz_ePlayerDieEvent;
+    playerID = -1;
+    team = eNoTeam;
+    killerID = -1;
+    killerTeam = eNoTeam;
 
-		pos[0] = pos[1] = pos[2] = 0.0f;
-		rot = 0.0f;
-		time = 0.0;
-	}
-	virtual ~bz_PlayerDieEventData(){};
+    pos[0] = pos[1] = pos[2] = 0.0f;
+    rot = 0.0f;
+    time = 0.0;
+  }
+  virtual ~bz_PlayerDieEventData(){};
 
-	int playerID;
-	bz_eTeamType team;
-	int killerID;
-	bz_eTeamType killerTeam;
-	bzApiString flagKilledWith;
-        int shotID;
+  int playerID;
+  bz_eTeamType team;
+  int killerID;
+  bz_eTeamType killerTeam;
+  bzApiString flagKilledWith;
+  int shotID;
 
-	float pos[3];
-	float rot;
-	double time;
+  float pos[3];
+  float rot;
+  double time;
 };
 
 class bz_PlayerSpawnEventData : public bz_EventData
 {
 public:
-	bz_PlayerSpawnEventData()
-	{
-		eventType = bz_ePlayerSpawnEvent;
-		playerID = -1;
-		team = eNoTeam;
+  bz_PlayerSpawnEventData()
+  {
+    eventType = bz_ePlayerSpawnEvent;
+    playerID = -1;
+    team = eNoTeam;
 
-		pos[0] = pos[1] = pos[2] = 0.0f;
-		rot = 0.0f;
-		time = 0.0;
-	}
+    pos[0] = pos[1] = pos[2] = 0.0f;
+    rot = 0.0f;
+    time = 0.0;
+  }
 
-	virtual ~bz_PlayerSpawnEventData(){};
+  virtual ~bz_PlayerSpawnEventData(){};
 
-	int playerID;
-	bz_eTeamType team;
+  int playerID;
+  bz_eTeamType team;
 
-	float pos[3];
-	float rot;
-	double time;
+  float pos[3];
+  float rot;
+  double time;
 };
 
 class bz_ChatEventData : public bz_EventData
 {
 public:
-	bz_ChatEventData()
-	{
-		eventType = bz_eChatMessageEvent;
+  bz_ChatEventData()
+  {
+    eventType = bz_eChatMessageEvent;
 
-		from = -1;
-		to = -1;
-		time = 0.0;
-		team = eNoTeam;
-	}
+    from = -1;
+    to = -1;
+    time = 0.0;
+    team = eNoTeam;
+  }
 
-	virtual ~bz_ChatEventData(){};
+  virtual ~bz_ChatEventData(){};
 
-	int from;
-	int to;
-	bz_eTeamType	team;
-	bzApiString message;
+  int from;
+  int to;
+  bz_eTeamType	team;
+  bzApiString message;
 
-	double time;
+  double time;
 };
 
 class bz_PlayerJoinPartEventData : public bz_EventData
 {
 public:
-	bz_PlayerJoinPartEventData()
-	{
-		eventType = bz_ePlayerJoinEvent;
+  bz_PlayerJoinPartEventData()
+  {
+    eventType = bz_ePlayerJoinEvent;
 
-		playerID = -1;
-		team = eNoTeam;
-		time = 0.0;
-	}
-	virtual ~bz_PlayerJoinPartEventData(){};
+    playerID = -1;
+    team = eNoTeam;
+    time = 0.0;
+  }
+  virtual ~bz_PlayerJoinPartEventData(){};
 
-	int playerID;
-	bz_eTeamType team;
+  int playerID;
+  bz_eTeamType team;
 
-	bzApiString callsign;
-	bzApiString email;
-	bool verified;
-	bzApiString globalUser;
-	bzApiString ipAddress;
-	bzApiString reason;
+  bzApiString callsign;
+  bzApiString email;
+  bool verified;
+  bzApiString globalUser;
+  bzApiString ipAddress;
+  bzApiString reason;
 
-	double time;
+  double time;
 };
 
 class bz_UnknownSlashCommandEventData : public bz_EventData
 {
 public:
-	bz_UnknownSlashCommandEventData()
-	{
-		eventType = bz_eUnknownSlashCommand;
-		from = -1;
-		handled = false;
-		time = 0;
-	}
+  bz_UnknownSlashCommandEventData()
+  {
+    eventType = bz_eUnknownSlashCommand;
+    from = -1;
+    handled = false;
+    time = 0;
+  }
 
-	virtual ~bz_UnknownSlashCommandEventData(){};
+  virtual ~bz_UnknownSlashCommandEventData(){};
 
-	int from;
+  int from;
 
-	bool handled;
-	bzApiString message;
+  bool handled;
+  bzApiString message;
 
-	double time;
+  double time;
 };
 
 class  bz_GetPlayerSpawnPosEventData : public bz_EventData
 {
 public:
-	bz_GetPlayerSpawnPosEventData()
-	{
-		eventType = bz_eGetPlayerSpawnPosEvent;
-		playerID = -1;
-		team = eNoTeam;
+  bz_GetPlayerSpawnPosEventData()
+  {
+    eventType = bz_eGetPlayerSpawnPosEvent;
+    playerID = -1;
+    team = eNoTeam;
 
-		handled = false;
+    handled = false;
 
-		pos[0] = pos[1] = pos[2] = 0.0f;
-		rot = 0.0f;
-		time = 0.0;
-	}
+    pos[0] = pos[1] = pos[2] = 0.0f;
+    rot = 0.0f;
+    time = 0.0;
+  }
 
-	virtual ~bz_GetPlayerSpawnPosEventData(){};
+  virtual ~bz_GetPlayerSpawnPosEventData(){};
 
-	int playerID;
-	bz_eTeamType team;
+  int playerID;
+  bz_eTeamType team;
 
-	bool handled;
+  bool handled;
 
-	float pos[3];
-	float rot;
-	double time;
+  float pos[3];
+  float rot;
+  double time;
 };
 
 class bz_AllowPlayerEventData : public bz_EventData
 {
 public:
-	bz_AllowPlayerEventData()
-	{
-		eventType = bz_eAllowPlayer;
-		playerID = -1;
-		allow = true;
-		time = 0.0;
-	}
+  bz_AllowPlayerEventData()
+  {
+    eventType = bz_eAllowPlayer;
+    playerID = -1;
+    allow = true;
+    time = 0.0;
+  }
 
-	virtual ~bz_AllowPlayerEventData(){};
+  virtual ~bz_AllowPlayerEventData(){};
 
-	int playerID;
-	bzApiString callsign;
-	bzApiString ipAddress;
+  int playerID;
+  bzApiString callsign;
+  bzApiString ipAddress;
 
-	bzApiString reason;
+  bzApiString reason;
 
-	bool allow;
+  bool allow;
 
-	double time;
+  double time;
 };
 
 class bz_TickEventData : public bz_EventData
 {
 public:
-	bz_TickEventData()
-	{
-		eventType = bz_eTickEvent;
-		time = 0.0;
-	}
-	virtual ~bz_TickEventData(){};
+  bz_TickEventData()
+  {
+    eventType = bz_eTickEvent;
+    time = 0.0;
+  }
+  virtual ~bz_TickEventData(){};
 
-	double time;
+  double time;
 };
 
 class bz_GenerateWorldEventData : public bz_EventData
 {
 public:
-	bz_GenerateWorldEventData()
-	{
-		eventType = bz_eGetWorldEvent;
-		generated = false;
-		openFFA = rabbit = ctf = false;
-		eventTime = 0.0;
+  bz_GenerateWorldEventData()
+  {
+    eventType = bz_eGetWorldEvent;
+    generated = false;
+    openFFA = rabbit = ctf = false;
+    eventTime = 0.0;
 
-	}
-	virtual ~bz_GenerateWorldEventData(){};
-	
-	bool generated;
-	bool ctf;
-	bool rabbit;
-	bool openFFA;
+  }
+  virtual ~bz_GenerateWorldEventData(){};
 
-	bzApiString	worldFile;
+  bool generated;
+  bool ctf;
+  bool rabbit;
+  bool openFFA;
 
-	double eventTime;
+  bzApiString	worldFile;
+
+  double eventTime;
 };
 
 class bz_GetPlayerInfoEventData : public bz_EventData
 {
 public:
-	bz_GetPlayerInfoEventData()
-	{
-		eventType = bz_eGetPlayerInfoEvent;
-		playerID = -1;
-		team = eNoTeam;
-		admin = false;
-		verified = false;
-		registered = false;
-		time = 0.0;
-	}
-	virtual ~bz_GetPlayerInfoEventData(){};
+  bz_GetPlayerInfoEventData()
+  {
+    eventType = bz_eGetPlayerInfoEvent;
+    playerID = -1;
+    team = eNoTeam;
+    admin = false;
+    verified = false;
+    registered = false;
+    time = 0.0;
+  }
+  virtual ~bz_GetPlayerInfoEventData(){};
 
-	int playerID;
-	bzApiString callsign;
-	bzApiString ipAddress;
+  int playerID;
+  bzApiString callsign;
+  bzApiString ipAddress;
 
-	bz_eTeamType team;
+  bz_eTeamType team;
 
-	bool admin;
-	bool verified;
-	bool registered;
-	double time;
+  bool admin;
+  bool verified;
+  bool registered;
+  double time;
 };
 
 class bz_GetAutoTeamEventData : public bz_EventData
 {
 public:
-	bz_GetAutoTeamEventData()
-	{
-		playeID = -1;
-		team = eNoTeam;
-		handled = false;
-	}
+  bz_GetAutoTeamEventData()
+  {
+    playeID = -1;
+    team = eNoTeam;
+    handled = false;
+  }
 
-	virtual ~bz_GetAutoTeamEventData(){};
+  virtual ~bz_GetAutoTeamEventData(){};
 
-	int playeID;
-	bzApiString callsign;
-	bz_eTeamType team;
+  int playeID;
+  bzApiString callsign;
+  bz_eTeamType team;
 
-	bool handled;
+  bool handled;
 };
 
 class  bz_AllowSpawnData : public bz_EventData
 {
 public:
-	bz_AllowSpawnData()
-	{
-		eventType = bz_eAllowSpawn;
-		playerID = -1;
-		team = eNoTeam;
+  bz_AllowSpawnData()
+  {
+    eventType = bz_eAllowSpawn;
+    playerID = -1;
+    team = eNoTeam;
 
-		handled = false;
-		allow = true;
+    handled = false;
+    allow = true;
 
-		time = 0.0;
-	}
+    time = 0.0;
+  }
 
-	virtual ~bz_AllowSpawnData(){};
+  virtual ~bz_AllowSpawnData(){};
 
-	int playerID;
-	bz_eTeamType team;
+  int playerID;
+  bz_eTeamType team;
 
-	bool handled;
-	bool allow;
-	double time;
+  bool handled;
+  bool allow;
+  double time;
 };
 
 class  bz_ListServerUpdateEvent : public bz_EventData
 {
 public:
-	bz_ListServerUpdateEvent()
-	{
-		eventType = bz_eListServerUpdateEvent;
-		handled = false;
-		time = 0.0;
-	}
+  bz_ListServerUpdateEvent()
+  {
+    eventType = bz_eListServerUpdateEvent;
+    handled = false;
+    time = 0.0;
+  }
 
-	virtual ~bz_ListServerUpdateEvent(){};
+  virtual ~bz_ListServerUpdateEvent(){};
 
-	bzApiString		address;
-	bzApiString		description;
-	bzApiString		groups;
+  bzApiString		address;
+  bzApiString		description;
+  bzApiString		groups;
 
-	bool handled;
-	double time;
+  bool handled;
+  double time;
 };
 
 class bz_BanEventData : public bz_EventData
 {
 public:
-	bz_BanEventData()
-	{
-		eventType = bz_eBanEvent;
-		bannerID = -1;
-		banneeID = -1;
-		duration = -1;
-	}
-	virtual ~bz_BanEventData(){};
+  bz_BanEventData()
+  {
+    eventType = bz_eBanEvent;
+    bannerID = -1;
+    banneeID = -1;
+    duration = -1;
+  }
+  virtual ~bz_BanEventData(){};
 
-	int bannerID;
-	int banneeID;
-	int duration;
-	bzApiString ipAddress;
-	bzApiString reason;
+  int bannerID;
+  int banneeID;
+  int duration;
+  bzApiString ipAddress;
+  bzApiString reason;
 };
 
 class bz_HostBanEventData : public bz_EventData
 {
 public:
-	bz_HostBanEventData()
-	{
-		eventType = bz_eHostBanEvent;
-		bannerID = -1;
-		duration = -1;
-	}
-	virtual ~bz_HostBanEventData(){};
+  bz_HostBanEventData()
+  {
+    eventType = bz_eHostBanEvent;
+    bannerID = -1;
+    duration = -1;
+  }
+  virtual ~bz_HostBanEventData(){};
 
-	int bannerID;
-	int duration;
-	bzApiString hostPattern;
-	bzApiString reason;
+  int bannerID;
+  int duration;
+  bzApiString hostPattern;
+  bzApiString reason;
 };
 
 class bz_KickEventData : public bz_EventData
 {
 public:
-	bz_KickEventData()
-	{
-		eventType = bz_eKickEvent;
-		kickerID = -1;
-		kickedID = -1;
-	}
-	virtual ~bz_KickEventData(){};
+  bz_KickEventData()
+  {
+    eventType = bz_eKickEvent;
+    kickerID = -1;
+    kickedID = -1;
+  }
+  virtual ~bz_KickEventData(){};
 
-	int kickerID;
-	int kickedID;
-	bzApiString reason;
+  int kickerID;
+  int kickedID;
+  bzApiString reason;
 };
 
 class bz_KillEventData : public bz_EventData
 {
 public:
-	bz_KillEventData()
-	{
-		eventType = bz_eKillEvent;
-		killerID = -1;
-		killedID = -1;
-	}
-	virtual ~bz_KillEventData(){};
+  bz_KillEventData()
+  {
+    eventType = bz_eKillEvent;
+    killerID = -1;
+    killedID = -1;
+  }
+  virtual ~bz_KillEventData(){};
 
-	int killerID;
-	int killedID;
-	bzApiString reason;
+  int killerID;
+  int killedID;
+  bzApiString reason;
 };
 
 class bz_PlayerPausedEventData : public bz_EventData
 {
 public:
-	bz_PlayerPausedEventData()
-	{
-		eventType = bz_ePlayerPausedEvent;
-		player = -1;
-		time = 0.0;
-		pause = false;
-	}
-	virtual ~bz_PlayerPausedEventData(){};
+  bz_PlayerPausedEventData()
+  {
+    eventType = bz_ePlayerPausedEvent;
+    player = -1;
+    time = 0.0;
+    pause = false;
+  }
+  virtual ~bz_PlayerPausedEventData(){};
 
-	int player;
-	double time;
-	bool pause;
+  int player;
+  double time;
+  bool pause;
 };
 
 class bz_MessageFilteredEventData : public bz_EventData
 {
 public:
-	bz_MessageFilteredEventData()
-	{
-		eventType = bz_eMessageFilteredEvent;
-		player = -1;
-		time = 0.0;
-	}
-	virtual ~bz_MessageFilteredEventData(){};
+  bz_MessageFilteredEventData()
+  {
+    eventType = bz_eMessageFilteredEvent;
+    player = -1;
+    time = 0.0;
+  }
+  virtual ~bz_MessageFilteredEventData(){};
 
-	int player;
-	double time;
+  int player;
+  double time;
 
-	bzApiString		rawMessage;
-	bzApiString		filteredMessage;
+  bzApiString		rawMessage;
+  bzApiString		filteredMessage;
 };
 
 class bz_GameStartEndEventData : public bz_EventData
 {
 public:
-	bz_GameStartEndEventData()
-	{
-		eventType = bz_eGameStartEvent;
-		time = 0.0;
-		duration = 0.0;
-	}
-	virtual ~bz_GameStartEndEventData(){};
+  bz_GameStartEndEventData()
+  {
+    eventType = bz_eGameStartEvent;
+    time = 0.0;
+    duration = 0.0;
+  }
+  virtual ~bz_GameStartEndEventData(){};
 
-	double time;
-	double duration;
+  double time;
+  double duration;
 };
 
 class bz_SlashCommandEventData : public bz_EventData
 {
 public:
-	bz_SlashCommandEventData()
-	{
-		eventType = bz_eSlashCommandEvent;
-		from = -1;
-		time = 0;
-	}
+  bz_SlashCommandEventData()
+  {
+    eventType = bz_eSlashCommandEvent;
+    from = -1;
+    time = 0;
+  }
 
-	virtual ~bz_SlashCommandEventData(){};
+  virtual ~bz_SlashCommandEventData(){};
 
-	int from;
+  int from;
 
-	bzApiString message;
+  bzApiString message;
 
-	double time;
+  double time;
 };
 
 
 class bz_PlayerAuthEventData : public bz_EventData
 {
 public:
-	bz_PlayerAuthEventData()
-	{
-		eventType = bz_ePlayerAuthEvent;
-		playerID = -1;
-	}
+  bz_PlayerAuthEventData()
+  {
+    eventType = bz_ePlayerAuthEvent;
+    playerID = -1;
+  }
 
-	virtual ~bz_PlayerAuthEventData(){};
+  virtual ~bz_PlayerAuthEventData(){};
 
-	int playerID;
+  int playerID;
 };
 
 class bz_ServerMsgEventData : public bz_EventData
 {
 public:
-	bz_ServerMsgEventData()
-	{
-		eventType = bz_eServerMsgEvent;
+  bz_ServerMsgEventData()
+  {
+    eventType = bz_eServerMsgEvent;
 
-		to = -1;
-		time = 0.0;
-		team = eNoTeam;
-	}
+    to = -1;
+    time = 0.0;
+    team = eNoTeam;
+  }
 
-	virtual ~bz_ServerMsgEventData(){};
+  virtual ~bz_ServerMsgEventData(){};
 
-	int to;
-	bz_eTeamType team;
-	bzApiString message;
+  int to;
+  bz_eTeamType team;
+  bzApiString message;
 
-	double time;
+  double time;
 };
 
 class bz_ShotFiredEventData : public bz_EventData
 {
 public:
-	bz_ShotFiredEventData()
-	{
-		eventType = bz_eShotFiredEvent;
-		pos[0] = pos[1] = pos[2] = 0;
-		changed = false;
-		playerID = -1;
-	}
+  bz_ShotFiredEventData()
+  {
+    eventType = bz_eShotFiredEvent;
+    pos[0] = pos[1] = pos[2] = 0;
+    changed = false;
+    playerID = -1;
+  }
 
-	virtual ~bz_ShotFiredEventData(){};
+  virtual ~bz_ShotFiredEventData(){};
 
-	bool		changed;
-	float		pos[3];
-	bzApiString	type;
-	int		playerID;
+  bool		changed;
+  float		pos[3];
+  bzApiString	type;
+  int		playerID;
 };
 
 class bz_PlayerUpdateEventData : public bz_EventData
 {
 public:
-	bz_PlayerUpdateEventData()
-	{
-		eventType = bz_ePlayerUpdateEvent;
-		pos[0] = pos[1] = pos[2] = 0;
-		velocity[0] = velocity[1] = velocity[2] = 0;
-		azimuth = angVel = 0.0f;
-		phydrv = 0;
-		time = 0;
-		playerID = -1;
-	}
+  bz_PlayerUpdateEventData()
+  {
+    eventType = bz_ePlayerUpdateEvent;
+    pos[0] = pos[1] = pos[2] = 0;
+    velocity[0] = velocity[1] = velocity[2] = 0;
+    azimuth = angVel = 0.0f;
+    phydrv = 0;
+    time = 0;
+    playerID = -1;
+  }
 
-	virtual ~bz_PlayerUpdateEventData(){};
+  virtual ~bz_PlayerUpdateEventData(){};
 
-	float	pos[3];
-	float	velocity[3];
-	float	azimuth;	
-	float	angVel;
-	int	phydrv;		
-	int	playerID;
+  float	pos[3];
+  float	velocity[3];
+  float	azimuth;	
+  float	angVel;
+  int	phydrv;		
+  int	playerID;
 
-	double time;
+  double time;
 };
 
 class bz_NetTransferEventData : public bz_EventData
 {
 public:
-	bz_NetTransferEventData()
-	{
-	  eventType = bz_eNetDataReceveEvent;
-	  send = false;
-	  udp = false;
-	  iSize = 0;
-	  data = NULL;
-	  playerID = -1;
+  bz_NetTransferEventData()
+  {
+    eventType = bz_eNetDataReceveEvent;
+    send = false;
+    udp = false;
+    iSize = 0;
+    data = NULL;
+    playerID = -1;
 
-	  time = 0;
-	}
+    time = 0;
+  }
 
-	virtual ~bz_NetTransferEventData(){};
+  virtual ~bz_NetTransferEventData(){};
 
-	bool send;
-	bool udp;
-	unsigned int iSize;
+  bool send;
+  bool udp;
+  unsigned int iSize;
 
-	int	    playerID;
-	double time;
+  int	    playerID;
+  double time;
 
-	// DON'T CHANGE THIS!!!
-	unsigned char* data;
+  // DON'T CHANGE THIS!!!
+  unsigned char* data;
 };
 
 class bz_LogingEventData : public bz_EventData
 {
 public:
-	bz_LogingEventData()
-	{
-		eventType = bz_eLogingEvent;
-		level = 0;
-		time = 0;
-	}
+  bz_LogingEventData()
+  {
+    eventType = bz_eLogingEvent;
+    level = 0;
+    time = 0;
+  }
 
-	virtual ~bz_LogingEventData(){};
+  virtual ~bz_LogingEventData(){};
 
-	double time;
-	int level;
-	bzApiString message;
+  double time;
+  int level;
+  bzApiString message;
 };
 
 class bz_ShotEndedEventData : public bz_EventData
 {
 public:
 
-	bz_ShotEndedEventData()
-	{
-		eventType = bz_eShotEndedEvent;
-		playerID = -1;
-		shotID = -1;
-		explode = false;
-	}
+  bz_ShotEndedEventData()
+  {
+    eventType = bz_eShotEndedEvent;
+    playerID = -1;
+    shotID = -1;
+    explode = false;
+  }
 
-	virtual ~bz_ShotEndedEventData(){};
+  virtual ~bz_ShotEndedEventData(){};
 
-	int playerID;
-	int shotID;
-	bool explode;
+  int playerID;
+  int shotID;
+  bool explode;
 };
 
 
@@ -943,7 +944,7 @@
     flagType = NULL;
     action = ContinueSteal;
   }
-  
+
   virtual ~bz_FlagTransferredEventData(){};
 
   int fromPlayerID;
@@ -956,42 +957,42 @@
 {
 public:
 
-	bz_FlagGrabbedEventData()
-	{
-		eventType = bz_eFlagGrabbedEvent;
-		playerID = -1;
-		flagID = -1;
-		pos[0] = pos[1] = pos[2] = 0;
-	}
+  bz_FlagGrabbedEventData()
+  {
+    eventType = bz_eFlagGrabbedEvent;
+    playerID = -1;
+    flagID = -1;
+    pos[0] = pos[1] = pos[2] = 0;
+  }
 
-	virtual ~bz_FlagGrabbedEventData(){};
+  virtual ~bz_FlagGrabbedEventData(){};
 
-	int playerID;
-	int flagID;
+  int playerID;
+  int flagID;
 
-	const char *flagType;
-	float	pos[3];
+  const char *flagType;
+  float	pos[3];
 };
 
 class bz_FlagDroppedEventData : public bz_EventData
 {
 public:
 
-	bz_FlagDroppedEventData()
-	{
-	  eventType = bz_eFlagDroppedEvent;
-	  playerID = -1;
-	  flagID = -1;
-	  pos[0] = pos[1] = pos[2] = 0;
-	}
+  bz_FlagDroppedEventData()
+  {
+    eventType = bz_eFlagDroppedEvent;
+    playerID = -1;
+    flagID = -1;
+    pos[0] = pos[1] = pos[2] = 0;
+  }
 
-	virtual ~bz_FlagDroppedEventData(){};
+  virtual ~bz_FlagDroppedEventData(){};
 
-	int playerID;
-	int flagID;
+  int playerID;
+  int flagID;
 
-	const char *flagType;
-	float	pos[3];
+  const char *flagType;
+  float	pos[3];
 };
 
 class bz_FlagResetEventData : public bz_EventData
@@ -1035,18 +1036,36 @@
   float	    pos[3];
   float	    rot;
   double    time;
-  
+
   bool	    allow;
 };
 
+class bz_MsgDebugEventData : public bz_EventData
+{
+public:
+  bz_MsgDebugEventData()
+  {
+    eventType = bz_eMsgDebugEvent;
+    receive = true;
+    time = 0.0;
+  }
+  virtual ~bz_MsgDebugEventData(){};
 
+  char code[2];
+  size_t len;
+  unsigned char* msg;
+
+  double    time;
+  bool	    receive;
+};
+
 // event handler callback
 class bz_EventHandler
 {
 public:
-	virtual ~bz_EventHandler(){};
-	virtual void process ( bz_EventData *eventData ) = 0;
-	virtual bool autoDelete ( void ) { return false; }	// only set this to true if you \
are internal to the bzfs module ( on windows ) +  virtual ~bz_EventHandler(){};
+  virtual void process ( bz_EventData *eventData ) = 0;
+  virtual bool autoDelete ( void ) { return false; }	// only set this to true if you \
are internal to the bzfs module ( on windows )  };
 
 BZF_API bool bz_registerEvent ( bz_eEventType eventType, bz_EventHandler* \
eventHandler ); @@ -1076,62 +1095,62 @@
 class bz_PlayerRecord
 {
 public:
-	bz_PlayerRecord()
-	{
-		playerID = -1;
-		team = eNoTeam;
+  bz_PlayerRecord()
+  {
+    playerID = -1;
+    team = eNoTeam;
 
-		pos[0] = pos[1] = pos[2] = 0;
-		rot = 0;
+    pos[0] = pos[1] = pos[2] = 0;
+    rot = 0;
 
-		spawned = false;
-		verified = false;
-		globalUser = false;
-		admin = false;
-		op=false;
+    spawned = false;
+    verified = false;
+    globalUser = false;
+    admin = false;
+    op=false;
 
-		lag = 0;
+    lag = 0;
 
-		wins = 0;
-		losses = 0;
-		bzID = "";
-	}
+    wins = 0;
+    losses = 0;
+    bzID = "";
+  }
 
-	~bz_PlayerRecord(){};
+  ~bz_PlayerRecord(){};
 
-	void update ( void ){bz_updatePlayerData(this);}	// call to update with current \
data +  void update ( void ){bz_updatePlayerData(this);}	// call to update with \
current data  
-	bool hasPerm ( const char* perm ){return bz_hasPerm(playerID,perm);}
-	bool grantPerm ( const char* perm ){return bz_grantPerm(playerID,perm);}
-	bool revokePerm ( const char* perm ){return bz_revokePerm(playerID,perm);}
+  bool hasPerm ( const char* perm ){return bz_hasPerm(playerID,perm);}
+  bool grantPerm ( const char* perm ){return bz_grantPerm(playerID,perm);}
+  bool revokePerm ( const char* perm ){return bz_revokePerm(playerID,perm);}
 
-	int playerID;
-	bzApiString callsign;
-	bzApiString email;
+  int playerID;
+  bzApiString callsign;
+  bzApiString email;
 
-	bz_eTeamType team;
+  bz_eTeamType team;
 
-	float pos[3];
-	float rot;
+  float pos[3];
+  float rot;
 
-	bzApiString ipAddress;
+  bzApiString ipAddress;
 
-	bzApiString currentFlag;
-	bzAPIStringList flagHistory;
+  bzApiString currentFlag;
+  bzAPIStringList flagHistory;
 
-	bool spawned;
-	bool verified;
-	bool globalUser;
-        bzApiString bzID;
-	bool admin;
-	bool op;
-	bzAPIStringList groups;
+  bool spawned;
+  bool verified;
+  bool globalUser;
+  bzApiString bzID;
+  bool admin;
+  bool op;
+  bzAPIStringList groups;
 
-	int lag;
+  int lag;
 
-	int wins;
-	int losses;
-	int teamKills;
+  int wins;
+  int losses;
+  int teamKills;
 };
 
 BZF_API bool bz_setPlayerOperator ( int playerId );
@@ -1162,13 +1181,13 @@
 
 typedef struct
 {
-	int year;
-	int month;
-	int day;
-	int hour;
-	int minute;
-	int second;
-	bool daylightSavings;
+  int year;
+  int month;
+  int day;
+  int hour;
+  int minute;
+  int second;
+  bool daylightSavings;
 }bz_localTime;
 
 BZF_API void bz_getLocaltime ( bz_localTime	*ts );
@@ -1229,8 +1248,8 @@
 class bz_CustomSlashCommandHandler
 {
 public:
-	virtual ~bz_CustomSlashCommandHandler(){};
-	virtual bool handle ( int playerID, bzApiString command, bzApiString message, \
bzAPIStringList *params ) = 0; +  virtual ~bz_CustomSlashCommandHandler(){};
+  virtual bool handle ( int playerID, bzApiString command, bzApiString message, \
bzAPIStringList *params ) = 0;  
 };
 
@@ -1258,56 +1277,56 @@
 // world
 typedef struct
 {
-	bool	driveThru;
-	bool	shootThru;
+  bool	driveThru;
+  bool	shootThru;
 }bz_WorldObjectOptions;
 
 typedef struct
 {
-	bzApiString		texture;
-	bool		useAlpha;
-	bool		useColorOnTexture;
-	bool		useSphereMap;
-	int			combineMode;
+  bzApiString		texture;
+  bool		useAlpha;
+  bool		useColorOnTexture;
+  bool		useSphereMap;
+  int			combineMode;
 }bz_MaterialTexture;
 
 class BZF_API bzAPITextureList
 {
 public:
-	bzAPITextureList();
-	bzAPITextureList(const bzAPITextureList	&r);
+  bzAPITextureList();
+  bzAPITextureList(const bzAPITextureList	&r);
 
-	~bzAPITextureList();
+  ~bzAPITextureList();
 
-	void push_back ( bz_MaterialTexture &value );
-	bz_MaterialTexture get ( unsigned int i );
+  void push_back ( bz_MaterialTexture &value );
+  bz_MaterialTexture get ( unsigned int i );
 
-	const bz_MaterialTexture& operator[] (unsigned int i) const;
-	bzAPITextureList& operator = ( const bzAPITextureList& r );
+  const bz_MaterialTexture& operator[] (unsigned int i) const;
+  bzAPITextureList& operator = ( const bzAPITextureList& r );
 
-	unsigned int size ( void );
-	void clear ( void );
+  unsigned int size ( void );
+  void clear ( void );
 
 protected:
-	class dataBlob;
+  class dataBlob;
 
-	dataBlob *data;
+  dataBlob *data;
 };
 
 typedef struct bz_MaterialInfo
 {
-	bzApiString name;
-	bzAPITextureList textures;
+  bzApiString name;
+  bzAPITextureList textures;
 
-	float		ambient[4];
-	float		diffuse[4];
-	float		specular[4];
-	float		emisive[4];
-	float		shine;
+  float		ambient[4];
+  float		diffuse[4];
+  float		specular[4];
+  float		emisive[4];
+  float		shine;
 
-	float		alphaThresh;
-	bool		culling;
-	bool		sorting;
+  float		alphaThresh;
+  bool		culling;
+  bool		sorting;
 }bz_MaterialInfo;
 
 // have bz make you a new material
@@ -1332,15 +1351,15 @@
 
 typedef struct bz_CustomMapObjectInfo
 {
-	bzApiString name;
-	bzAPIStringList data;
+  bzApiString name;
+  bzAPIStringList data;
 }bz_CustomMapObjectInfo;
 
 class bz_CustomMapObjectHandler
 {
 public:
-	virtual ~bz_CustomMapObjectHandler(){};
-	virtual bool handle ( bzApiString object, bz_CustomMapObjectInfo *data ) = 0;
+  virtual ~bz_CustomMapObjectHandler(){};
+  virtual bool handle ( bzApiString object, bz_CustomMapObjectInfo *data ) = 0;
 
 };
 
@@ -1359,8 +1378,8 @@
 class bz_APIPluginHandler
 {
 public:
-	virtual ~bz_APIPluginHandler(){};
-	virtual bool handle ( bzApiString plugin, bzApiString param ) = 0;
+  virtual ~bz_APIPluginHandler(){};
+  virtual bool handle ( bzApiString plugin, bzApiString param ) = 0;
 };
 // custom pluginHandler
 BZF_API bool bz_registerCustomPluginHandler ( const char* extension, \
bz_APIPluginHandler * handler ); @@ -1385,10 +1404,10 @@
 class bz_URLHandler
 {
 public:
-	virtual ~bz_URLHandler(){};
-	virtual void done ( const char* URL, void * data, unsigned int size, bool complete \
                ) = 0;
-	virtual void timeout ( const char* /*URL*/, int /*errorCode*/ ){};
-	virtual void error ( const char* /*URL*/, int /*errorCode*/, const char * \
/*errorString*/ ){}; +  virtual ~bz_URLHandler(){};
+  virtual void done ( const char* URL, void * data, unsigned int size, bool complete \
) = 0; +  virtual void timeout ( const char* /*URL*/, int /*errorCode*/ ){};
+  virtual void error ( const char* /*URL*/, int /*errorCode*/, const char * \
/*errorString*/ ){};  };
 
 BZF_API bool bz_addURLJob ( const char* URL, bz_URLHandler* handler = NULL, const \
char* postData = NULL );

Modified: branches/v2_0branch/bzflag/src/bzfs/WorldEventManager.cxx
===================================================================
--- branches/v2_0branch/bzflag/src/bzfs/WorldEventManager.cxx	2008-02-24 17:22:19 UTC \
                (rev 16638)
+++ branches/v2_0branch/bzflag/src/bzfs/WorldEventManager.cxx	2008-02-24 18:59:12 UTC \
(rev 16639) @@ -25,81 +25,92 @@
 
 WorldEventManager::~WorldEventManager()
 {
-	tmEventTypeList::iterator eventItr = eventList.begin();
-	while (eventItr != eventList.end())
-	{
-		tvEventList::iterator itr = eventItr->second.begin();
-		while ( itr != eventItr->second.end() )
-		{
-			if ((*itr) && (*itr)->autoDelete())
-				delete (*itr);
-			*itr = NULL;
+  tmEventTypeList::iterator eventItr = eventList.begin();
+  while (eventItr != eventList.end())
+  {
+    tvEventList::iterator itr = eventItr->second.begin();
+    while ( itr != eventItr->second.end() )
+    {
+      if ((*itr) && (*itr)->autoDelete())
+	delete (*itr);
+      *itr = NULL;
 
-			itr++;
-		}
-		eventItr++;
-	}
+      itr++;
+    }
+    eventItr++;
+  }
 }
 
 void WorldEventManager::addEvent ( bz_eEventType eventType, bz_EventHandler* \
theEvent )  {
-	if (!theEvent)
-		return;
+  if (!theEvent)
+    return;
 
-	if (eventList.find(eventType) == eventList.end())
-	{
-		tvEventList newList;
-		eventList[eventType] = newList;
-	}
+  if (eventList.find(eventType) == eventList.end())
+  {
+    tvEventList newList;
+    eventList[eventType] = newList;
+  }
 
-	eventList.find(eventType)->second.push_back(theEvent);
+  eventList.find(eventType)->second.push_back(theEvent);
 }
 
 void WorldEventManager::removeEvent ( bz_eEventType eventType, bz_EventHandler* \
theEvent )  {
-	if (!theEvent)
-		return;
+  if (!theEvent)
+    return;
 
-	tmEventTypeList::iterator eventTypeItr = eventList.find(eventType);
-	if (eventTypeItr == eventList.end())
-		return;
+  tmEventTypeList::iterator eventTypeItr = eventList.find(eventType);
+  if (eventTypeItr == eventList.end())
+    return;
 
-	tvEventList::iterator itr = eventTypeItr->second.begin();
-	while (itr != eventTypeItr->second.end())
-	{
-		if (*itr == theEvent)
-			itr = eventTypeItr->second.erase(itr);
-		else
-			itr++;
-	}
+  tvEventList::iterator itr = eventTypeItr->second.begin();
+  while (itr != eventTypeItr->second.end())
+  {
+    if (*itr == theEvent)
+      itr = eventTypeItr->second.erase(itr);
+    else
+      itr++;
+  }
 }
 
 tvEventList WorldEventManager::getEventList ( bz_eEventType eventType)
 {
-	tvEventList	eList;
+  tvEventList	eList;
 
-	tmEventTypeList::iterator itr = eventList.find(eventType);
-	if ( itr == eventList.end() )
-		return eList;
+  tmEventTypeList::iterator itr = eventList.find(eventType);
+  if ( itr == eventList.end() )
+    return eList;
 
-	eList = itr->second;
-	return eList;
+  eList = itr->second;
+  return eList;
 }
 
-void WorldEventManager::callEvents ( bz_eEventType eventType, \
bz_EventData	*eventData ) +void WorldEventManager::callEvents ( bz_eEventType \
eventType, bz_EventData  *eventData )  {
-	if (!eventData || getEventCount(eventType)==0 )
-		return;
+  if (!eventData || getEventCount(eventType)==0 )
+    return;
 
-	tvEventList	eList = getEventList(eventType);
+  tvEventList	eList = getEventList(eventType);
 
-	for ( unsigned int i = 0; i < eList.size(); i++)
-		eList[i]->process(eventData);
+  for ( unsigned int i = 0; i < eList.size(); i++)
+    eList[i]->process(eventData);
 }
 
+void WorldEventManager::callEvents (  bz_EventData  *eventData )
+{
+  if (!eventData || getEventCount(eventData->eventType)==0 )
+    return;
+
+  tvEventList	eList = getEventList(eventData->eventType);
+
+  for ( unsigned int i = 0; i < eList.size(); i++)
+    eList[i]->process(eventData);
+}
+
 int WorldEventManager::getEventCount ( bz_eEventType eventType )
 {
-	return (int)getEventList(eventType).size();
+  return (int)getEventList(eventType).size();
 }
 
 

Modified: branches/v2_0branch/bzflag/src/bzfs/bzfs.cxx
===================================================================
--- branches/v2_0branch/bzflag/src/bzfs/bzfs.cxx	2008-02-24 17:22:19 UTC (rev 16638)
+++ branches/v2_0branch/bzflag/src/bzfs/bzfs.cxx	2008-02-24 18:59:12 UTC (rev 16639)
@@ -3619,6 +3619,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;
+
+  worldEventManager.callEvents(&eventData);
+
   switch (code) {
     // player joining
     case MsgEnter: {


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] 

Configure | About | News | Add a list | Sponsored by KoreLogic