Changeset 2461

Timestamp:

Dec 15, 2008, 1:02:48 AM (16 years ago)

Author:

rgrieder

Message:

• Updated msvc files
• temporary solution for a super function caller that doesn't work with msvc.

Location:

code/branches/objecthierarchy2

Files:

• src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (8 diffs)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -109 +109 @@
     void ControllableEntity::changedGametype()
     {
-        SUPER(ControllableEntity, changedGametype);
+        //SUPER(ControllableEntity, changedGametype);
+        WorldEntity::changedGametype();
 
         this->gtinfo_ = 0;

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

@@ -167 +167 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\PawnManager.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\PlayerManager.cc"
                                 >
@@ -273 +277 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\ExplosionChunk.cc"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\worldentities\FadingBillboard.cc"
                                                 >
@@ -354 +362 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\infos\Bot.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\infos\GametypeInfo.cc"
                                                 >
                                         </File>
@@ -743 +755 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\GametypeStatus.cc"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\overlays\hud\HUDBar.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\HUDHealthBar.cc"
                                                 >
                                         </File>
@@ -859 +879 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\PawnManager.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\PlayerManager.h"
                                 >
@@ -942 +966 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\worldentities\ControllableEntity.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\worldentities\ExplosionChunk.h"
                                                 >
                                         </File>
@@ -1029 +1057 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\infos\GametypeInfo.h"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\infos\HumanPlayer.h"
                                                 >
@@ -1269 +1301 @@
                                         </File>
                                         <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\GametypeStatus.h"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\overlays\hud\HUDBar.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\hud\HUDHealthBar.h"
                                                 >
                                         </File>