Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5917 for code/branches


Ignore:
Timestamp:
Oct 9, 2009, 4:44:50 PM (15 years ago)
Author:
scheusso
Message:

missing parts of last commit

Location:
code/branches/core5/src/orxonox
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core5/src/orxonox/Test.cc

    r5738 r5917  
    6363    setConfigValues();
    6464    registerVariables();
    65                 setObjectMode(0x3);
     65                setSyncMode(0x3);
    6666        }
    6767
  • code/branches/core5/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

    r5738 r5917  
    4343        this->worldEntityOwner_ = creator;
    4444        // suppress synchronisation
    45         this->setObjectMode(0x0);
     45        this->setSyncMode(0x0);
    4646    }
    4747
  • code/branches/core5/src/orxonox/gametypes/Gametype.cc

    r5827 r5917  
    3333#include "core/ConfigValueIncludes.h"
    3434#include "core/GameMode.h"
     35#include "core/ConsoleCommand.h"
    3536
    3637#include "infos/PlayerInfo.h"
     
    7879        else
    7980            this->scoreboard_ = 0;
     81       
     82        /* HACK HACK HACK */
     83        this->hackAddBots_ = createConsoleCommand( createFunctor(&Gametype::addBots, this), "hackAddBots");
     84        this->hackKillBots_ = createConsoleCommand( createFunctor(&Gametype::killBots, this), "hackKillBots");
     85        CommandExecutor::addConsoleCommandShortcut( this->hackAddBots_ );
     86        CommandExecutor::addConsoleCommandShortcut( this->hackKillBots_ );
     87        /* HACK HACK HACK */
    8088    }
    8189   
     
    8391    {
    8492        if (this->isInitialized())
     93        {
    8594            this->gtinfo_->destroy();
     95            if( this->hackAddBots_ )
     96                delete this->hackAddBots_;
     97            if( this->hackKillBots_ )
     98                delete this->hackKillBots_;
     99        }
    86100    }
    87101
  • code/branches/core5/src/orxonox/gametypes/Gametype.h

    r5806 r5917  
    184184            // Config Values
    185185            std::string scoreboardTemplate_;
     186           
     187            /* HACK HACK HACK */
     188            ConsoleCommand* hackAddBots_;
     189            ConsoleCommand* hackKillBots_;
     190            /* HACK HACK HACK */
    186191    };
    187192}
  • code/branches/core5/src/orxonox/items/MultiStateEngine.cc

    r5801 r5917  
    9191            if (this->getShip()->hasLocalController())
    9292            {
    93                 this->setObjectMode(ObjectDirection::Bidirectional);
     93                this->setSyncMode(ObjectDirection::Bidirectional);
    9494
    9595                const Vector3& direction = this->getDirection();
  • code/branches/core5/src/orxonox/weaponsystem/WeaponSlot.cc

    r5738 r5917  
    4646        this->weapon_ = 0;
    4747
    48         this->setObjectMode(0x0);
     48        this->setSyncMode(0x0);
    4949    }
    5050
Note: See TracChangeset for help on using the changeset viewer.