Fix actions with zero duration on NDK 16. (#18596)

tiagomartines11 · minggo · commit 2c025d804879 · 2018-01-02T10:35:54.000+08:00
diff --git a/cocos/2d/CCActionInterval.cpp b/cocos/2d/CCActionInterval.cpp
@@ -126,9 +126,9 @@ void ActionInterval::step(float dt)
     }
     
     
-    float updateDt = MAX (0,                                  // needed for rewind. elapsed could be negative
-                           MIN(1, _elapsed / _duration)
-                           );
+    float updateDt = std::max(0.0f,                                  // needed for rewind. elapsed could be negative
+                              std::min(1.0f, _elapsed / _duration)
+                              );
 
     if (sendUpdateEventToScript(updateDt, this)) return;
     

Original file line number	Diff line number	Diff line change
`@@ -126,9 +126,9 @@ void ActionInterval::step(float dt)`
`126`	`126`	`}`
`127`	`127`
`128`	`128`
`129`		`- float updateDt = MAX (0, // needed for rewind. elapsed could be negative`
`130`		`- MIN(1, _elapsed / _duration)`
`131`		`- );`
	`129`	`+ float updateDt = std::max(0.0f, // needed for rewind. elapsed could be negative`
	`130`	`+ std::min(1.0f, _elapsed / _duration)`
	`131`	`+ );`
`132`	`132`
`133`	`133`	`if (sendUpdateEventToScript(updateDt, this)) return;`
`134`	`134`