Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4442 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Jun 1, 2005, 10:07:53 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: command node removed from source files

Location:
orxonox/trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/Makefile.am

    r4429 r4442  
    2222
    2323orxonox_SOURCES= orxonox.cc \
    24                  command_node.cc \
    2524                 util/loading/game_loader.cc \
    2625                 util/track/track_manager.cc \
     
    8281noinst_HEADERS = orxonox.h \
    8382                 ability.h \
    84                  command_node.h \
    8583                 action_listener.h \
    8684                 defs/message_structures.h \
  • orxonox/trunk/src/Makefile.in

    r4438 r4442  
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    55 am_orxonox_OBJECTS = orxonox.$(OBJEXT) command_node.$(OBJEXT) \
    56         game_loader.$(OBJEXT) track_manager.$(OBJEXT) \
    57         track_node.$(OBJEXT) animation.$(OBJEXT) animation3d.$(OBJEXT) \
     55am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \
     56        track_manager.$(OBJEXT) track_node.$(OBJEXT) \
     57        animation.$(OBJEXT) animation3d.$(OBJEXT) \
    5858        animation_player.$(OBJEXT) event.$(OBJEXT) \
    5959        event_handler.$(OBJEXT) event_listener.$(OBJEXT) \
     
    8888@AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
    8989@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Po \
    90 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
    91 @AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/event.Po \
    92 @AMDEP_TRUE@    ./$(DEPDIR)/event_handler.Po \
     90@AMDEP_TRUE@    ./$(DEPDIR)/curve.Po ./$(DEPDIR)/environment.Po \
     91@AMDEP_TRUE@    ./$(DEPDIR)/event.Po ./$(DEPDIR)/event_handler.Po \
    9392@AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Po \
    9493@AMDEP_TRUE@    ./$(DEPDIR)/factory.Po ./$(DEPDIR)/game_loader.Po \
     
    259258
    260259orxonox_SOURCES = orxonox.cc \
    261                  command_node.cc \
    262260                 util/loading/game_loader.cc \
    263261                 util/track/track_manager.cc \
     
    319317noinst_HEADERS = orxonox.h \
    320318                 ability.h \
    321                  command_node.h \
    322319                 action_listener.h \
    323320                 defs/message_structures.h \
     
    488485@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/campaign.Po@am__quote@
    489486@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/character_attributes.Po@am__quote@
    490 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_node.Po@am__quote@
    491487@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
    492488@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
  • orxonox/trunk/src/orxonox.cc

    r4408 r4442  
    3030
    3131#include "world.h"
    32 #include "command_node.h"
    3332#include "ini_parser.h"
    3433#include "game_loader.h"
     
    5857
    5958  this->world = NULL;
    60   this->localinput = NULL;
    6159  this->resourceManager = NULL;
    6260  this->objectManager = NULL;
     61  this->eventHandler = NULL;
    6362
    6463  this->argc = 0;
     
    7473  Orxonox::singletonRef = NULL;
    7574  if( world != NULL) delete world;
    76   if( localinput != NULL) delete localinput;
    7775  delete GraphicsEngine::getInstance(); // deleting the Graphics
    7876  delete ResourceManager::getInstance(); // deletes the Resource Manager
     
    164162int Orxonox::initInput()
    165163{
    166   // create localinput
    167   localinput = new CommandNode(configfilename);
    168 
    169164  this->eventHandler = EventHandler::getInstance();
    170165  this->eventHandler->init();
     
    301296 
    302297
    303 /**
    304    \brief handle keyboard commands that are not meant for WorldEntities
    305    \param cmd: the command to handle
    306    \return true if the command was handled by the system or false if it may be passed to the WorldEntities
    307 */
    308 bool Orxonox::systemCommand(Command* cmd)
    309 {
    310   /*
    311   if( !strcmp( cmd->cmd, "quit"))
    312     {
    313       if( !cmd->bUp) this->gameLoader->stop();
    314       return true;
    315     }
    316   return false;
    317   */
    318   return false;
    319 }
    320 
    321298
    322299void Orxonox::process(const Event &event)
    323300{}
    324301
    325 /**
    326    \brief retrieve a pointer to the local CommandNode
    327    \return a pointer to localinput
    328 */
    329 CommandNode* Orxonox::getLocalInput()
    330 {
    331   return localinput;
    332 }
    333302
    334303
  • orxonox/trunk/src/orxonox.h

    r4408 r4442  
    1212
    1313
    14 class CommandNode;
    1514class WorldEntity;
    1615class World;
     
    3332  char configfilename[256];   //!< Filename of the configuration-file.
    3433  World* world;               //!< Reference to the current running world.
    35   CommandNode* localinput;    //!< Command Handler
    3634  SDL_Surface* screen;        //!< The current Screen
    3735  GameLoader* gameLoader;     //!< The gameLoader
     
    6563
    6664  void graphicsHandler (SDL_Event* event);
    67   bool systemCommand (Command* cmd);
    6865  void process(const Event  &event);
    6966
    7067  int init (int argc, char** argv);
    7168 
    72   CommandNode* getLocalInput();
     69
    7370  World* getWorld();
    7471  SDL_Surface* getScreen ();
  • orxonox/trunk/src/story_entities/world.cc

    r4438 r4442  
    5050#include "fields.h"
    5151
    52 #include "command_node.h"
    5352#include "glmenu_imagescreen.h"
    5453#include "list.h"
     
    418417 
    419418  // bind input
    420   Orxonox *orx = Orxonox::getInstance ();
    421   orx->getLocalInput()->bind (localPlayer);
    422 
    423419  this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_UP);
    424420  this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_DOWN);
     
    696692  this->bPause = false;
    697693  this->pilotNode = NULL;
    698   CommandNode* cn = Orxonox::getInstance()->getLocalInput();
    699   cn->addToWorld(this);
    700   cn->enable(true);
    701694}
    702695
Note: See TracChangeset for help on using the changeset viewer.