Changeset 601 for code/branches/FICN/src/orxonox/orxonox.cc

Timestamp:

Dec 17, 2007, 10:31:38 PM (16 years ago)

Author:

dumenim

Message:

blub

File:

• code/branches/FICN/src/orxonox/orxonox.cc (modified) (6 diffs)

code/branches/FICN/src/orxonox/orxonox.cc

@@ -87 +87 @@
   {
     public:
-      OrxListener(OIS::Keyboard *keyboard, OIS::Mouse *mouse, audio::AudioManager*  auMan, SpaceshipSteering* steering)
+      OrxListener(OIS::Keyboard *keyboard, OIS::Mouse *mouse, audio::AudioManager*  auMan, SpaceshipSteering* steering, gameMode mode)
       : mKeyboard(keyboard), mMouse(mouse)
       {
 
 
-
+        mode_=mode;
         speed = 250;
         loop = 100;
@@ -162 +162 @@
         //if(mKeyboard->isKeyDown(OIS::KC_ESCAPE))
           //cout << "maximal MouseX: " << maxMouseX << "\tminMouseX: " << minMouseX << endl;
+        if(mode_==SERVER)
+          server_g->tick(evt.timeSinceLastFrame);
         usleep(10);
         return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
@@ -181 +183 @@
 
     private:
+      gameMode mode_;
       float speed;
       float rotate;
@@ -276 +279 @@
     switch(mode_){
     case PRESENTATION:
+      //ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
+      //std::cout << "could not add framelistener" << std::endl;
       server_g->open();
       break;
@@ -369 +374 @@
     if(!ogre_->load()) die(/* unable to load */);
     // add network framelistener
-    ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
   }
 
@@ -536 +540 @@
 
     //if(mode_!=CLIENT) // just a hack ------- remove this in future
-      frameListener_ = new OrxListener(keyboard_, mouse_, auMan_, steering_);
+      frameListener_ = new OrxListener(keyboard_, mouse_, auMan_, steering_, mode_);
     ogre_->getRoot()->addFrameListener(frameListener_);
   }