Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 23, 2009, 1:04:52 AM (15 years ago)
Author:
landauf
Message:

renamed TeamGametype to TeamDeathmatch.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.h

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.h1874-2276,​2278-2400
      /code/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.h2506-2658
      /code/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.h2662-2708
      /code/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.h1802-1808
      /code/branches/core3/src/orxonox/objects/gametypes/TeamGametype.h1572-1739
      /code/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.h1580
      /code/branches/gui/src/orxonox/objects/gametypes/TeamGametype.h1635-1723
      /code/branches/input/src/orxonox/objects/gametypes/TeamGametype.h1629-1636
      /code/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.h2372-2411
      /code/branches/network/src/orxonox/objects/gametypes/TeamGametype.h2356
      /code/branches/network64/src/orxonox/objects/gametypes/TeamGametype.h2210-2355
      /code/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.h1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.h2171-2479
      /code/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.h2117-2385
      /code/branches/physics/src/orxonox/objects/gametypes/TeamGametype.h1912-2055,​2107-2439
      /code/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.h2436-2457
      /code/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.h1926-2086,​2127
      /code/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.h2107-2497
      /code/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.h2369-2652,​2654-2660
      /code/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.h1894-2088
      /code/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.h2107-2259
      /code/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.h1295-1953,​1955
      /code/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.h1925-2094
      /code/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.h2107-2488
    r2820 r2821  
    2727 */
    2828
    29 #ifndef _TeamGametype_H__
    30 #define _TeamGametype_H__
     29#ifndef _TeamDeathmatch_H__
     30#define _TeamDeathmatch_H__
    3131
    3232#include "OrxonoxPrereqs.h"
     
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport TeamGametype : public Deathmatch
     40    class _OrxonoxExport TeamDeathmatch : public Deathmatch
    4141    {
    4242        public:
    43             TeamGametype(BaseObject* creator);
    44             virtual ~TeamGametype() {}
     43            TeamDeathmatch(BaseObject* creator);
     44            virtual ~TeamDeathmatch() {}
    4545
    4646            void setConfigValues();
     
    6565}
    6666
    67 #endif /* _TeamGametype_H__ */
     67#endif /* _TeamDeathmatch_H__ */
Note: See TracChangeset for help on using the changeset viewer.