Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dmuratshin 9 years ago
parent
commit
5673b9bb20
3 changed files with 3 additions and 3 deletions
  1. 1 1
      oxygine/src/Box9Sprite.cpp
  2. 1 1
      oxygine/src/Box9Sprite.h
  3. 1 1
      oxygine/src/Sprite.cpp

+ 1 - 1
oxygine/src/Box9Sprite.cpp

@@ -125,7 +125,7 @@ namespace oxygine
         return Actor::getDestRect();
         return Actor::getDestRect();
     }
     }
 
 
-    bool Box9Sprite::isOn(const Vector2 &localPosition, float localScale)
+    bool Box9Sprite::isOn(const Vector2& localPosition, float localScale)
     {
     {
         return Actor::isOn(localPosition, localScale);
         return Actor::isOn(localPosition, localScale);
     }
     }

+ 1 - 1
oxygine/src/Box9Sprite.h

@@ -32,7 +32,7 @@ namespace oxygine
         void setVerticalGuides(float x1, float x2);
         void setVerticalGuides(float x1, float x2);
         void setHorizontalGuides(float y1, float y2);
         void setHorizontalGuides(float y1, float y2);
 
 
-        bool isOn(const Vector2 &localPosition, float localScale) OVERRIDE;
+        bool isOn(const Vector2& localPosition, float localScale) OVERRIDE;
 
 
         std::string dump(const dumpOptions&) const;
         std::string dump(const dumpOptions&) const;
 
 

+ 1 - 1
oxygine/src/Sprite.cpp

@@ -308,7 +308,7 @@ namespace oxygine
         node.set_name("Sprite");
         node.set_name("Sprite");
     }
     }
 
 
-    Vector2 attr2Vector2(const pugi::xml_attribute &attr, const Vector2& def)
+    Vector2 attr2Vector2(const pugi::xml_attribute& attr, const Vector2& def)
     {
     {
         if (!attr)
         if (!attr)
             return def;
             return def;