diff UI/UICharacter.cpp @ 1980:c1c74df0a33e

changing most of auto types to their actual types
author Grumpy7
date Wed, 30 Oct 2013 00:47:37 -0700
parents 2233efdc8d00
children 33787c8938a5
line wrap: on
line diff
--- a/UI/UICharacter.cpp	Mon Oct 28 22:16:42 2013 -0700
+++ b/UI/UICharacter.cpp	Wed Oct 30 00:47:37 2013 -0700
@@ -479,15 +479,15 @@
   int num_skills_drawn = 0;
   for (int i = 0; i < skill_list_size; ++i)
   {
-    auto skill = (PLAYER_SKILL_TYPE)skill_list[i];
+    PLAYER_SKILL_TYPE skill = (PLAYER_SKILL_TYPE)skill_list[i];
     for (uint j = 0; j < pGUIWindow_CurrentMenu->uNumControls; ++j)
     {
-      auto v8 = pGUIWindow_CurrentMenu->pControlsHead;
+      GUIButton* v8 = pGUIWindow_CurrentMenu->pControlsHead;
 
       for (int v7 = j; v7 > 0; --v7)
         v8 = v8->pNext;
 
-      auto v9 = v8->field_1C;
+      int v9 = v8->field_1C;
       if ((short)(v8->field_1C) >= 0)
         continue;
       if ( (v9 & 0x7FFF) != skill )
@@ -496,8 +496,8 @@
       ++num_skills_drawn;
       y_offset = v8->uY;
 
-      auto skill_value = player->pActiveSkills[skill];
-      auto skill_level = skill_value & 0x3F;
+      ushort skill_value = player->pActiveSkills[skill];
+      int skill_level = skill_value & 0x3F;
 
       uint skill_color = 0;
       uint skill_mastery_color = 0;
@@ -1613,7 +1613,7 @@
 
 static void CharacterUI_DrawItem(int x, int y, ItemGen *item, int id)
 {
-  auto item_texture = pIcons_LOD->LoadTexturePtr(item->GetIconName(), TEXTURE_16BIT_PALETTE);
+  Texture* item_texture = pIcons_LOD->LoadTexturePtr(item->GetIconName(), TEXTURE_16BIT_PALETTE);
 
   if (item->uAttributes & 0xF0) // enchant animation
   {
@@ -1769,7 +1769,7 @@
   memset(byte_5111F6.data(), 0, sizeof(byte_5111F6));
   for (uint i = 0; i < 4; ++i)
   {
-    auto player = &pParty->pPlayers[i];
+    Player* player = &pParty->pPlayers[i];
 
     if (player->HasItem(ITEM_ARTIFACT_GOVERNORS_ARMOR, 1))    byte_5111F6[0] = 1;
     if (player->HasItem(ITEM_ARTIFACT_YORUBA, 1))             byte_5111F6[1] = 1;