From 414f1d425233fb33e3aea9756d58fd94e8d53414 Mon Sep 17 00:00:00 2001
From: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue, 21 Jun 2016 16:46:27 -0700
Subject: [PATCH] fix: little menu fixes

does not execute `dynamic_cast<>` in release mode
uses for(:) instead of the old way
---
 cocos/2d/CCMenu.cpp | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/cocos/2d/CCMenu.cpp b/cocos/2d/CCMenu.cpp
index 1b7b581099..4129042df2 100644
--- a/cocos/2d/CCMenu.cpp
+++ b/cocos/2d/CCMenu.cpp
@@ -238,10 +238,9 @@ void Menu::onExit()
 
 void Menu::removeChild(Node* child, bool cleanup)
 {
-    MenuItem *menuItem = dynamic_cast<MenuItem*>(child);
-    CCASSERT(menuItem != nullptr, "Menu only supports MenuItem objects as children");
+    CCASSERT(dynamic_cast<MenuItem*>(child) != nullptr, "Menu only supports MenuItem objects as children");
     
-    if (_selectedItem == menuItem)
+    if (_selectedItem == child)
     {
         _selectedItem = nullptr;
     }
@@ -266,8 +265,8 @@ bool Menu::onTouchBegan(Touch* touch, Event* event)
             return false;
         }
     }
-    
     _selectedItem = this->getItemForTouch(touch, camera);
+
     if (_selectedItem)
     {
         _state = Menu::State::TRACKING_TOUCH;
@@ -559,21 +558,18 @@ void Menu::alignItemsInRowsWithArray(const ValueVector& columns)
 MenuItem* Menu::getItemForTouch(Touch *touch, const Camera *camera)
 {
     Vec2 touchLocation = touch->getLocation();
-    if (!_children.empty())
+    for (const auto &item: _children)
     {
-        for (auto iter = _children.crbegin(); iter != _children.crend(); ++iter)
+        MenuItem* child = dynamic_cast<MenuItem*>(item);
+        if (nullptr == child || false == child->isVisible() || false == child->isEnabled())
         {
-            MenuItem* child = dynamic_cast<MenuItem*>(*iter);
-            if (nullptr == child || false == child->isVisible() || false == child->isEnabled())
-            {
-                continue;
-            }
-            Rect rect;
-            rect.size = child->getContentSize();
-            if (isScreenPointInRect(touchLocation, camera, child->getWorldToNodeTransform(), rect, nullptr))
-            {
-                return child;
-            }
+            continue;
+        }
+        Rect rect;
+        rect.size = child->getContentSize();
+        if (isScreenPointInRect(touchLocation, camera, child->getWorldToNodeTransform(), rect, nullptr))
+        {
+            return child;
         }
     }
     return nullptr;