Changeset 2503 for code/branches/presentation/src/orxonox/objects/pickup

Timestamp:

Dec 17, 2008, 10:51:07 AM (16 years ago)

Author:

rgrieder

Message:

Updated msvc files.
Maybe fixed a bug in:
if (condition); Note the semicolon
{

dosomething();

}

Location:

code/branches/presentation/src/orxonox/objects/pickup

Files:

• BaseItem.cc (modified) (1 diff)
• PickupSpawner.cc (modified) (2 diffs)
• ShipEquipment.cc (modified) (2 diffs)
• Turbo.cc (modified) (1 diff)

code/branches/presentation/src/orxonox/objects/pickup/BaseItem.cc

@@ -3 +3 @@
 
 
+#include "OrxonoxStableHeaders.h"
 #include "BaseItem.h"
 #include "core/CoreIncludes.h"

code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.cc

@@ +1 @@
+#include "OrxonoxStableHeaders.h"
 #include "PickupSpawner.h"
 #include "BaseItem.h"
@@ -110 +111 @@
         SUPER(PickupSpawner, changedActivity);
 
-        for (std::set<WorldEntity*>::iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); ++it)
+        for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); ++it)
                 (*it)->setVisible(this->isActive());
 }

code/branches/presentation/src/orxonox/objects/pickup/ShipEquipment.cc

@@ +1 @@
+#include "OrxonoxStableHeaders.h"
 #include "BaseItem.h"
 #include "ShipEquipment.h"
@@ -27 +28 @@
                 COUT(3) << "SWAP?" <<  endl;
                 //Abfrage- irgendne ifschleife...
-                if((checkSlot(item)->dropped(player))==true);
+                if((checkSlot(item)->dropped(player))==true)
                 {
                         Equipment.insert ( std::pair<std::string, BaseItem*>(item->getName(),item) );

code/branches/presentation/src/orxonox/objects/pickup/Turbo.cc

@@ +1 @@
+#include "OrxonoxStableHeaders.h"
 #include "Turbo.h"