dmuratshin 9 years ago
parent
commit
980f6fb720

+ 13 - 13
oxygine/src/DebugActor.cpp

@@ -70,19 +70,19 @@ namespace oxygine
         getStage()->addChild(DebugActor::instance);
     }
 
-	void DebugActor::toggle()
-	{
-		if (!DebugActor::instance)
-		{ 
-			show();
-			return;
-		}
-
-		if (DebugActor::instance->_getStage())
-			hide();
-		else
-			show();
-	}
+    void DebugActor::toggle()
+    {
+        if (!DebugActor::instance)
+        {
+            show();
+            return;
+        }
+
+        if (DebugActor::instance->_getStage())
+            hide();
+        else
+            show();
+    }
 
     void DebugActor::hide()
     {

+ 1 - 1
oxygine/src/DebugActor.h

@@ -22,7 +22,7 @@ namespace oxygine
         static Resources* resSystem;
         static void initialize();
         static void show();
-		static void toggle();
+        static void toggle();
         static void hide();
         static void release();
         static void setCorner(int corner);

+ 3 - 1
oxygine/src/Tween.h

@@ -35,6 +35,8 @@ namespace oxygine
     class UpdateState;
     class TweenOptions;
 
+    const int TWEEN_COMPLETE_DT = std::numeric_limits<int>::max() / 2;
+
 
     DECLARE_SMART(Tween, spTween);
 
@@ -141,7 +143,7 @@ namespace oxygine
         void setDetachActor(bool detach) { _detach = detach; }
 
         /**immediately completes tween, calls doneCallback and mark tween as completed and removes self from Actor. If tween has infinity loops (=-1) then do nothing*/
-        virtual void complete(timeMS deltaTime = std::numeric_limits<int>::max() / 2);
+        virtual void complete(timeMS deltaTime = TWEEN_COMPLETE_DT);
 
         /**removes self from Actor, complete callback not called*/
         void remove();

+ 1 - 1
oxygine/src/core/android/HttpRequestJavaTask.cpp

@@ -39,7 +39,7 @@ namespace oxygine
         JNI_NOT_NULL(jRelease);
         env->CallStaticObjectMethod(_jHttpRequestsClass, jRelease);
     }
-    
+
     HttpRequestJavaTask::HttpRequestJavaTask(): _handle(0)
     {
 

+ 1 - 1
oxygine/src/core/ios/ios.h

@@ -8,7 +8,7 @@ namespace oxygine
     {
         std::string getSupportFolder();
     }
-    
+
     class Image;