[Orxonox-commit 3912] r8586 - in code/branches/presentation/src/modules: docking tetris

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-25 23:07:46 +0200 (Wed, 25 May 2011)
New Revision: 8586

Modified:
   code/branches/presentation/src/modules/docking/DockingController.h
   code/branches/presentation/src/modules/docking/DockingPrereqs.h
   code/branches/presentation/src/modules/tetris/Tetris.cc
Log:
Fixed MSVC build (dllexport problems) and warnings.

Modified: code/branches/presentation/src/modules/docking/DockingController.h
===================================================================
--- code/branches/presentation/src/modules/docking/DockingController.h	2011-05-25 21:06:31 UTC (rev 8585)
+++ code/branches/presentation/src/modules/docking/DockingController.h	2011-05-25 21:07:46 UTC (rev 8586)
@@ -38,7 +38,7 @@
 
 namespace orxonox
 {
-    class _OrxonoxExport DockingController : public ArtificialController, public Tickable
+    class _DockingExport DockingController : public ArtificialController, public Tickable
     {
         public:
             DockingController(BaseObject* creator);

Modified: code/branches/presentation/src/modules/docking/DockingPrereqs.h
===================================================================
--- code/branches/presentation/src/modules/docking/DockingPrereqs.h	2011-05-25 21:06:31 UTC (rev 8585)
+++ code/branches/presentation/src/modules/docking/DockingPrereqs.h	2011-05-25 21:07:46 UTC (rev 8586)
@@ -42,8 +42,8 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Docking_STATIC_BUILD)
-#  ifdef Docking_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(DOCKING_STATIC_BUILD)
+#  ifdef DOCKING_SHARED_BUILD
 #    define _DockingExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )

Modified: code/branches/presentation/src/modules/tetris/Tetris.cc
===================================================================
--- code/branches/presentation/src/modules/tetris/Tetris.cc	2011-05-25 21:06:31 UTC (rev 8585)
+++ code/branches/presentation/src/modules/tetris/Tetris.cc	2011-05-25 21:07:46 UTC (rev 8586)
@@ -126,9 +126,9 @@
     {
         assert(stone);
 
-        if(position.y < this->center_->getStoneSize()/2.0) //!< If the stone has reached the bottom of the level
+        if(position.y < this->center_->getStoneSize()/2.0f) //!< If the stone has reached the bottom of the level
         {
-            stone->setPosition(Vector3(stone->getPosition().x, this->center_->getStoneSize()/2.0, stone->getPosition().z));
+            stone->setPosition(Vector3(stone->getPosition().x, this->center_->getStoneSize()/2.0f, stone->getPosition().z));
             return false;
         }
 
@@ -256,8 +256,8 @@
         
         // Attach the stone to the Centerpoint and set the position of the stone to be at the top middle.
         this->center_->attach(stone);
-        float xPos = (this->center_->getWidth()/2 + ((this->center_->getWidth() % 2)*2-1)/2.0)*this->center_->getStoneSize();
-        float yPos = (this->center_->getHeight()-0.5)*this->center_->getStoneSize();
+        float xPos = (this->center_->getWidth()/2 + ((this->center_->getWidth() % 2)*2-1)/2.0f)*this->center_->getStoneSize();
+        float yPos = (this->center_->getHeight()-0.5f)*this->center_->getStoneSize();
         stone->setPosition(xPos, yPos, 0.0f);
         stone->setGame(this);
     }