Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2821


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

renamed TeamGametype to TeamDeathmatch.

Location:
code/branches/miniprojects/src/orxonox/objects/gametypes
Files:
1 edited
2 moved

Legend:

Unmodified
Added
Removed
  • code/branches/miniprojects/src/orxonox/objects/gametypes/CMakeLists.txt

    r2820 r2821  
    22  Gametype.cc
    33  Deathmatch.cc
    4   TeamGametype.cc
     4  TeamDeathmatch.cc
    55)
  • code/branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.cc

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.cc1874-2276,​2278-2400
      /code/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.cc2506-2658
      /code/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.cc2662-2708
      /code/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.cc1802-1808
      /code/branches/core3/src/orxonox/objects/gametypes/TeamGametype.cc1572-1739
      /code/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.cc1580
      /code/branches/gui/src/orxonox/objects/gametypes/TeamGametype.cc1635-1723
      /code/branches/input/src/orxonox/objects/gametypes/TeamGametype.cc1629-1636
      /code/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.cc2372-2411
      /code/branches/network/src/orxonox/objects/gametypes/TeamGametype.cc2356
      /code/branches/network64/src/orxonox/objects/gametypes/TeamGametype.cc2210-2355
      /code/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.cc1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.cc2171-2479
      /code/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.cc2117-2385
      /code/branches/physics/src/orxonox/objects/gametypes/TeamGametype.cc1912-2055,​2107-2439
      /code/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.cc2436-2457
      /code/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.cc1926-2086,​2127
      /code/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.cc2107-2497
      /code/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.cc2369-2652,​2654-2660
      /code/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.cc1894-2088
      /code/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.cc2107-2259
      /code/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.cc1295-1953,​1955
      /code/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.cc1925-2094
      /code/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.cc2107-2488
    r2820 r2821  
    2828
    2929#include "OrxonoxStableHeaders.h"
    30 #include "TeamGametype.h"
     30#include "TeamDeathmatch.h"
    3131
    3232#include "core/CoreIncludes.h"
     
    3737namespace orxonox
    3838{
    39     CreateUnloadableFactory(TeamGametype);
     39    CreateUnloadableFactory(TeamDeathmatch);
    4040
    41     TeamGametype::TeamGametype(BaseObject* creator) : Deathmatch(creator)
     41    TeamDeathmatch::TeamDeathmatch(BaseObject* creator) : Deathmatch(creator)
    4242    {
    43         RegisterObject(TeamGametype);
     43        RegisterObject(TeamDeathmatch);
    4444
    4545        this->teams_ = 2;
     
    4848    }
    4949
    50     void TeamGametype::setConfigValues()
     50    void TeamDeathmatch::setConfigValues()
    5151    {
    5252        SetConfigValue(teams_, 2);
     
    6464    }
    6565
    66     void TeamGametype::playerEntered(PlayerInfo* player)
     66    void TeamDeathmatch::playerEntered(PlayerInfo* player)
    6767    {
    6868        Deathmatch::playerEntered(player);
     
    8888    }
    8989
    90     bool TeamGametype::playerLeft(PlayerInfo* player)
     90    bool TeamDeathmatch::playerLeft(PlayerInfo* player)
    9191    {
    9292        bool valid_player = Deathmatch::playerLeft(player);
     
    9898    }
    9999
    100     bool TeamGametype::allowPawnHit(Pawn* victim, Pawn* originator)
     100    bool TeamDeathmatch::allowPawnHit(Pawn* victim, Pawn* originator)
    101101    {
    102102        return (!this->pawnsAreInTheSameTeam(victim, originator));
    103103    }
    104104
    105     bool TeamGametype::allowPawnDamage(Pawn* victim, Pawn* originator)
     105    bool TeamDeathmatch::allowPawnDamage(Pawn* victim, Pawn* originator)
    106106    {
    107107        return (!this->pawnsAreInTheSameTeam(victim, originator));
    108108    }
    109109
    110     bool TeamGametype::allowPawnDeath(Pawn* victim, Pawn* originator)
     110    bool TeamDeathmatch::allowPawnDeath(Pawn* victim, Pawn* originator)
    111111    {
    112112        return (!this->pawnsAreInTheSameTeam(victim, originator));
    113113    }
    114114
    115     SpawnPoint* TeamGametype::getBestSpawnPoint(PlayerInfo* player) const
     115    SpawnPoint* TeamDeathmatch::getBestSpawnPoint(PlayerInfo* player) const
    116116    {
    117117        int desiredTeamNr = -1;
     
    153153    }
    154154
    155     void TeamGametype::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
     155    void TeamDeathmatch::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
    156156    {
    157157        if (!player)
     
    177177    }
    178178
    179     bool TeamGametype::pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2)
     179    bool TeamDeathmatch::pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2)
    180180    {
    181181        if (pawn1 && pawn2)
  • 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.