Changeset 2020

Timestamp:

Oct 27, 2008, 11:44:20 AM (16 years ago)

Author:

rgrieder

Message:

• Updated msvc files
• Changed iterator to const_iterator for stl iterator in constant member functions (msvc reports a build error otherwise)
• Added linkage again to BLANKSTRING: The whole idea about it was to give "" an address in the memory so we can return that address. static const variables however don't have a linkage and therefore no address, so it's equivalent to writing "". Fortunately, at least msvc (gcc too I guess) is clever enough to artificially create a real symbol, so it did work without the linkage.

Location:

code/branches/objecthierarchy

Files:

• src/orxonox/objects/gametypes/Gametype.cc (modified) (2 diffs)
• src/util/String.cc (modified) (1 diff)
• src/util/String.h (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (7 diffs)

code/branches/objecthierarchy/src/orxonox/objects/gametypes/Gametype.cc

@@ -143 +143 @@
             unsigned int randomspawn = (unsigned int)rnd(this->spawnpoints_.size());
             unsigned int index = 0;
-            for (std::set<SpawnPoint*>::iterator it = this->spawnpoints_.begin(); it != this->spawnpoints_.end(); ++it)
+            for (std::set<SpawnPoint*>::const_iterator it = this->spawnpoints_.begin(); it != this->spawnpoints_.end(); ++it)
             {
                 if (index == randomspawn)
@@ -156 +156 @@
     void Gametype::assignDefaultPawnsIfNeeded() const
     {
-        for (std::set<PlayerInfo*>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
+        for (std::set<PlayerInfo*>::const_iterator it = this->players_.begin(); it != this->players_.end(); ++it)
         {
             if (!(*it)->getControllableEntity() && (!(*it)->isReadyToSpawn() || !this->bStarted_))

code/branches/objecthierarchy/src/util/String.cc

@@ -39 +39 @@
 #include "Convert.h"
 #include "Math.h"
+
+std::string BLANKSTRING("");
 
 std::string getUniqueNumberString()

code/branches/objecthierarchy/src/util/String.h

@@ -40 +40 @@
 #include <sstream>
 
-_UtilExport static const std::string BLANKSTRING = "";
+extern _UtilExport std::string BLANKSTRING;
 _UtilExport std::string getUniqueNumberString();
 

code/branches/objecthierarchy/visual_studio/vc8/orxonox.vcproj

@@ -155 +155 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\LevelManager.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\Main.cc"
                                 >
@@ -214 +218 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\Scene.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Script.cc"
                                         >
@@ -242 +250 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\SpawnPoint.cc"
                                                 >
                                         </File>
@@ -268 +280 @@
                                         Name="infos"
                                         >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\infos\HumanPlayer.cc"
+                                                >
+                                        </File>
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\infos\Info.cc"
@@ -507 +523 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\LevelManager.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\OrxonoxPrereqs.h"
                                 >
@@ -550 +570 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\Scene.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Script.h"
                                         >
@@ -578 +602 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\worldentities\PositionableEntity.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\SpawnPoint.h"
                                                 >
                                         </File>