Changeset 8586 for code/branches/presentation

Timestamp:

May 25, 2011, 11:07:46 PM (13 years ago)

Author:

rgrieder

Message:

Fixed MSVC build (dllexport problems) and warnings.

Location:

code/branches/presentation/src/modules

Files:

• docking/DockingController.h (modified) (1 diff)
• docking/DockingPrereqs.h (modified) (1 diff)
• tetris/Tetris.cc (modified) (2 diffs)

code/branches/presentation/src/modules/docking/DockingController.h

@@ -39 +39 @@
 namespace orxonox
 {
-    class _OrxonoxExport DockingController : public ArtificialController, public Tickable
+    class _DockingExport DockingController : public ArtificialController, public Tickable
     {
         public:

code/branches/presentation/src/modules/docking/DockingPrereqs.h

@@ -43 +43 @@
 //-----------------------------------------------------------------------
 
-#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

code/branches/presentation/src/modules/tetris/Tetris.cc

@@ -127 +127 @@
         assert(stone);
 
-        if(position.y < this->center_->getStoneSize()/2.0) //!< If the stone has reached the bottom of the level
-        {
-            stone->setPosition(Vector3(stone->getPosition().x, this->center_->getStoneSize()/2.0, stone->getPosition().z));
+        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.0f, stone->getPosition().z));
             return false;
         }
@@ -257 +257 @@
         // 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);