Changeset 1206 for code/trunk

Timestamp:

Apr 30, 2008, 3:20:13 PM (17 years ago)

Author:

rgrieder

Message:

• bugfix that didn't actually fix a bug, but deleting an object that doesn't exist is never good: orxonoxHUD_ = 0 in Orxonox constructor.

Location:

code/trunk

Files:

• src/orxonox/Orxonox.cc (modified) (1 diff)
• visual_studio/core_properties.vsprops (modified) (1 diff)
• visual_studio/orxonox_properties.vsprops (modified) (1 diff)

code/trunk/src/orxonox/Orxonox.cc

@@ -157 +157 @@
   Orxonox::Orxonox()
   {
+    this->mode_ = STANDALONE;
+    this->serverIp_ = "";
     this->ogre_ = &GraphicsEngine::getSingleton();
     this->timer_ = 0;
     this->dataPath_ = "";
     this->auMan_ = 0;
+    this->orxonoxHUD_ = 0;
     this->inputHandler_ = 0;
     // turn on frame smoothing by setting a value different from 0

code/trunk/visual_studio/core_properties.vsprops

@@ -12 +12 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="OgreMain$(CSS).lib OIS$(CS).lib lua51$(CS).lib"
+                AdditionalDependencies="OgreMain$(CSS).lib ois-1.2.0$(CS).lib lua-5.1$(CS).lib"
         />
 </VisualStudioPropertySheet>

code/trunk/visual_studio/orxonox_properties.vsprops

@@ -14 +14 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="OgreMain$(CSS).lib OIS$(CS).lib"
+                AdditionalDependencies="OgreMain$(CSS).lib ois-1.2.0$(CS).lib"
                 OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
                 IgnoreDefaultLibraryNames=""