[Orxonox-commit 1141] r5862 - in code/branches/core5/src/orxonox: . interfaces worldentities/pawns

landauf at orxonox.net landauf at orxonox.net
Fri Oct 2 21:11:35 CEST 2009


Author: landauf
Date: 2009-10-02 21:11:35 +0200 (Fri, 02 Oct 2009)
New Revision: 5862

Removed:
   code/branches/core5/src/orxonox/interfaces/PawnListener.h
Modified:
   code/branches/core5/src/orxonox/OrxonoxPrereqs.h
   code/branches/core5/src/orxonox/interfaces/InterfaceCompilation.cc
   code/branches/core5/src/orxonox/worldentities/pawns/Pawn.cc
Log:
removed PawnListener

Modified: code/branches/core5/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/core5/src/orxonox/OrxonoxPrereqs.h	2009-10-02 18:58:27 UTC (rev 5861)
+++ code/branches/core5/src/orxonox/OrxonoxPrereqs.h	2009-10-02 19:11:35 UTC (rev 5862)
@@ -115,7 +115,6 @@
     // interfaces
     class GametypeMessageListener;
     class NotificationListener;
-    class PawnListener;
     class PlayerTrigger;
     class RadarListener;
     class RadarViewable;

Modified: code/branches/core5/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/branches/core5/src/orxonox/interfaces/InterfaceCompilation.cc	2009-10-02 18:58:27 UTC (rev 5861)
+++ code/branches/core5/src/orxonox/interfaces/InterfaceCompilation.cc	2009-10-02 19:11:35 UTC (rev 5862)
@@ -33,7 +33,6 @@
 */
 
 #include "GametypeMessageListener.h"
-#include "PawnListener.h"
 #include "PlayerTrigger.h"
 #include "RadarListener.h"
 #include "Rewardable.h"
@@ -53,17 +52,6 @@
     }
 
     //----------------------------
-    // PawnListener
-    //----------------------------
-    /**
-        @brief Constructor for the PawnListener.
-    */
-    PawnListener::PawnListener()
-    {
-        RegisterRootObject(PawnListener);
-    }
-
-    //----------------------------
     // RadarListener
     //----------------------------
     RadarListener::RadarListener()

Deleted: code/branches/core5/src/orxonox/interfaces/PawnListener.h
===================================================================
--- code/branches/core5/src/orxonox/interfaces/PawnListener.h	2009-10-02 18:58:27 UTC (rev 5861)
+++ code/branches/core5/src/orxonox/interfaces/PawnListener.h	2009-10-02 19:11:35 UTC (rev 5862)
@@ -1,47 +0,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Fabian 'x3n' Landau
- *   Co-authors:
- *      ...
- *
- */
-
-#ifndef _PawnListener_H__
-#define _PawnListener_H__
-
-#include "OrxonoxPrereqs.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
-    class _OrxonoxExport PawnListener : virtual public OrxonoxClass
-    {
-        public:
-            PawnListener();
-            virtual ~PawnListener() {}
-
-            virtual void destroyedPawn(Pawn* pawn) = 0;
-    };
-}
-
-#endif /* _PawnListener_H__ */

Modified: code/branches/core5/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/core5/src/orxonox/worldentities/pawns/Pawn.cc	2009-10-02 18:58:27 UTC (rev 5861)
+++ code/branches/core5/src/orxonox/worldentities/pawns/Pawn.cc	2009-10-02 19:11:35 UTC (rev 5862)
@@ -35,7 +35,6 @@
 #include "core/XMLPort.h"
 #include "network/NetworkFunction.h"
 
-#include "interfaces/PawnListener.h"
 #include "PawnManager.h"
 #include "infos/PlayerInfo.h"
 #include "gametypes/Gametype.h"
@@ -92,9 +91,6 @@
     {
         if (this->isInitialized())
         {
-            for (ObjectList<PawnListener>::iterator it = ObjectList<PawnListener>::begin(); it != ObjectList<PawnListener>::end(); ++it)
-                it->destroyedPawn(this);
-
             if (this->weaponSystem_)
                 this->weaponSystem_->destroy();
         }




More information about the Orxonox-commit mailing list