Changeset 10970 for code/branches/presentationHS15/src/modules

Timestamp:

Dec 11, 2015, 3:26:20 PM (9 years ago)

Author:

maxima

Message:

Merged campaign and presentation. Everything seems to work fine.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/modules/docking/DockingController.cc (modified) (1 diff)
• src/modules/overlays/hud/HUDRadar.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/MineGun.cc (modified) (1 diff)

code/branches/presentationHS15/src/modules/docking/DockingController.cc

@@ -61 +61 @@
 
         float distance = (this->dock_->getWorldPosition() - entity->getPosition()).length();
-        Vector2 coord = get2DViewcoordinates(     // I don't understand this too
+        Vector2 coord = get2DViewCoordinates(     // I don't understand this too
             entity->getPosition(),
             entity->getOrientation() * WorldEntity::FRONT,

code/branches/presentationHS15/src/modules/overlays/hud/HUDRadar.cc

@@ -240 +240 @@
             }
             else
-                coord = get2DViewcoordinates(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition());
+                coord = get2DViewCoordinates(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition());
 
             coord *= math::pi / 3.5f; // small adjustment to make it fit the texture

code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc

@@ -58 +58 @@
         this->setMunitionName("MineMunition");
         this->setDefaultSound("sounds/mineactivate.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_MineGun";
     }