summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrien Nader <adrien@notk.org>2012-01-10 20:40:12 +0100
committerAdrien Nader <adrien@notk.org>2012-01-10 20:40:12 +0100
commit461d84b036601b0effe312bbe26645861a97a331 (patch)
tree4085b6c51c5d947ca0a9017f2907c569883074e4
parent4956b937442d0b5810d8cf6b5117e6b41f2509ce (diff)
parent8dd0c98c3d15508cb8676d04c9b4e19b014f2ac4 (diff)
Merge branch 'jean/game/client' into adrien/game/clientadrien/game/client_textadrien/game/client
-rw-r--r--game/client/FPS/FPS.vcproj8
-rw-r--r--game/client/FPS/Player.cpp1
-rw-r--r--game/client/FPS/options.h4
3 files changed, 10 insertions, 3 deletions
diff --git a/game/client/FPS/FPS.vcproj b/game/client/FPS/FPS.vcproj
index c607649..57d6e52 100644
--- a/game/client/FPS/FPS.vcproj
+++ b/game/client/FPS/FPS.vcproj
@@ -206,6 +206,10 @@
Name="World"
>
<File
+ RelativePath=".\options.h"
+ >
+ </File>
+ <File
RelativePath=".\World.cpp"
>
</File>
@@ -217,6 +221,10 @@
Name="Altitude"
>
<File
+ RelativePath=".\HeightFunction.cpp"
+ >
+ </File>
+ <File
RelativePath=".\HeightFunction.h"
>
</File>
diff --git a/game/client/FPS/Player.cpp b/game/client/FPS/Player.cpp
index 87caf02..eff961c 100644
--- a/game/client/FPS/Player.cpp
+++ b/game/client/FPS/Player.cpp
@@ -21,7 +21,6 @@ Player::~Player(void)
*/
void Player::RotatePLayer(float Xmove)
{
- //mBody->setOrientation(Ogre::Quaternion(Ogre::Degree(Xmove * -0.2), Vector3::UNIT_Y));
mNode->yaw(Ogre::Degree(Xmove * -0.2), Ogre::Node::TS_LOCAL);
mBody->setOrientation(mNode->getOrientation());
}
diff --git a/game/client/FPS/options.h b/game/client/FPS/options.h
index d46e305..45e66b8 100644
--- a/game/client/FPS/options.h
+++ b/game/client/FPS/options.h
@@ -1,7 +1,7 @@
#ifndef __OPTIONS_H_
#define __OPTIONS_H_
-#ifdef MSC_VER
+#ifdef _MSC_VER
#define DISABLE_WARNINGS
#define ENABLE_WARNINGS
@@ -22,6 +22,6 @@
#define PRAGMA(x) _Pragma(#x)
-#endif
+#endif /* _MSC_VER */
#endif /* __OPTIONS_H_ */