Mercurial > mm7

comparison Items.cpp @ 1843:2e6d3cd052e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some char* cast removal + adding const_casts where appropriate
author Grumpy7
date Sun, 13 Oct 2013 07:18:03 +0200
parents 211dfe2d8db1
children dd9d4b7c1199
comparison
equal deleted inserted replaced
1842:175bf8da83d9 1843:2e6d3cd052e0
2822 case 70:v30 = pSkillNames[34]; break; 2822 case 70:v30 = pSkillNames[34]; break;
2823 case 71:v30 = pSkillNames[35]; break; 2823 case 71:v30 = pSkillNames[35]; break;
2824 default: 2824 default:
2825 v30 = pGlobalTXT_LocalizationStrings[127]; //"No Text!" 2825 v30 = pGlobalTXT_LocalizationStrings[127]; //"No Text!"
2826 } 2826 }
2827 pShopOptions[dword_F8B1DC] = (char *)v30; 2827 pShopOptions[dword_F8B1DC] = const_cast<char *>(v30);
2828 ++dword_F8B1DC; 2828 ++dword_F8B1DC;
2829 CreateButtonInColumn(i+1, v29); 2829 CreateButtonInColumn(i+1, v29);
2830 } 2830 }
2831 pDialogueWindow->_41D08F_set_keyboard_control_group(i, 1, 0, 2); 2831 pDialogueWindow->_41D08F_set_keyboard_control_group(i, 1, 0, 2);
2832 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton; 2832 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;