Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1556 for code/trunk


Ignore:
Timestamp:
Jun 6, 2008, 9:18:04 PM (17 years ago)
Author:
landauf
Message:

now it's tested on tardis… fixed a small typo.\n additionally removed two warnings in server.cc and orxonox.cc

Location:
code/trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/core/input/InputInterfaces.h

    r1555 r1556  
    3939#include "src/ois/OISKeyboard.h"
    4040#include "src/ois/OISMouse.h"
    41 #include "src/ois/OISJoystick.h"
     41#include "src/ois/OISJoyStick.h"
    4242#include "util/Math.h"
    4343
  • code/trunk/src/network/Server.cc

    r1548 r1556  
    220220            COUT(3) << "Server: could not elaborate" << std::endl;
    221221        }
     222        break;
     223      default:
    222224        break;
    223225      }
  • code/trunk/src/orxonox/Orxonox.cc

    r1535 r1556  
    417417    float renderTime = 0.0f;
    418418    float frameTime = 0.0f;
    419     clock_t time = 0;
     419//    clock_t time = 0;
    420420
    421421    //Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();
Note: See TracChangeset for help on using the changeset viewer.