Changeset 10721 for code/branches/fabienHS15/src/orxonox

Timestamp:

Oct 29, 2015, 11:27:32 PM (9 years ago)

Author:

fvultier

Message:

 

Location:

code/branches/fabienHS15/src/orxonox

Files:

• overlays/OrxonoxOverlay.h (modified) (1 diff)
• weaponsystem/Munition.cc (modified) (1 diff)

code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.h

@@ -65 +65 @@
           only for displaying a picture).
         - Reacts to changes of the window aspect
-        - Last but not least: On demand you can tell the overlay to automatically resale to correct for
+        - Last but not least: On demand you can tell the overlay to automatically rescale to correct for
           aspect distortion. E.g. if you play 1024x768 you wouldn't want a round object to be oval.
           Remark: This can (due to the Ogre::Overlay transformation order) only work for angle that are

code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc

@@ -302 +302 @@
                 }
 
-                // If we reached the limit, reduze both magazines and munition to the maximum
+                // If we reached the limit, reduce both magazines and munition to the maximum
                 if (this->magazines_ >= this->maxMagazines_)
                 {
-                    this->magazines_ = this->maxMagazines_ - 1;
+                    this->magazines_ = this->maxMagazines_;
                     magazine->munition_ = this->maxMunitionPerMagazine_;
                 }