2
0
dmuratshin 8 жил өмнө
parent
commit
6befcce8c2

+ 4 - 4
examples/Demo/src/TestCamera.h

@@ -80,12 +80,12 @@ public:
             else
             {
                 touch* p1, *p2;
-                for (auto& t : _touches)
+				for (std::map<int, touch>::iterator i = _touches.begin(); i != _touches.end(); ++i)
                 {
-                    if (t.first == te->index)
-                        p1 = &t.second;
+                    if (i->first == te->index)
+                        p1 = &i->second;
                     else
-                        p2 = &t.second;
+                        p2 = &i->second;
                 }
 
                 Vector2 center = (p1->current + p2->current) / 2;

+ 2 - 0
oxygine/src/Actor.cpp

@@ -427,10 +427,12 @@ namespace oxygine
             originalLocalScale = me->__localScale;
             me->localPosition = parent2local(originalLocalPos);
             me->__localScale *= _transform.a;
+#ifdef OX_HAS_CPP11
             if (me->__localScale == NAN)
             {
                 OX_ASSERT(0);
             }
+#endif
         }
 
         event->phase = Event::phase_capturing;