Backport applicable parts of trunk r9947 to 0.5.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9953 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 207523fd19..664438935a 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1985,7 +1985,7 @@ int choose_ability_menu(const std::vector<talent>& talents)
         {
             MenuEntry* me = new MenuEntry(_describe_talent(talents[i]),
                                           MEL_ITEM, 1, talents[i].hotkey);
-            me->data = reinterpret_cast<void*>(numbers+i);
+            me->data = &numbers[i];
             abil_menu.add_entry(me);
         }
     }
@@ -1999,7 +1999,7 @@ int choose_ability_menu(const std::vector<talent>& talents)
             {
                 MenuEntry* me = new MenuEntry(_describe_talent(talents[i]),
                                               MEL_ITEM, 1, talents[i].hotkey);
-                me->data = reinterpret_cast<void*>(numbers+i);
+                me->data = &numbers[i];
                 abil_menu.add_entry(me);
             }
         }
@@ -2015,12 +2015,12 @@ int choose_ability_menu(const std::vector<talent>& talents)
 
         ASSERT(sel.size() == 1);
         ASSERT(sel[0]->hotkeys.size() == 1);
-        int selected = *(reinterpret_cast<int*>(sel[0]->data));
+        int selected = *(static_cast<int*>(sel[0]->data));
 
         if (abil_menu.menu_action == Menu::ACT_EXAMINE)
             _print_talent_description(talents[selected]);
         else
-            return (*(reinterpret_cast<int*>(sel[0]->data)));
+            return (*(static_cast<int*>(sel[0]->data)));
     }
 }