diff --git a/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp index 56e7ee85a..f4e1934e5 100644 --- a/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp @@ -324,7 +324,7 @@ void UIComponent_Tooltips::_SetTooltip(unsigned int iToolTipId, const std::wstri value[1].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[1].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_Base.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Base.cpp index 4948c4a60..606c552c8 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_Base.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_Base.cpp @@ -39,7 +39,7 @@ void UIControl_Base::tick() value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; @@ -63,7 +63,7 @@ void UIControl_Base::setLabel(const std::wstring &label, bool instant, bool forc value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; @@ -101,7 +101,7 @@ void UIControl_Base::setAllPossibleLabels(int labelCount, wchar_t labels[][256]) for (int i = 0; i < labelCount; ++i) { conv.push_back(convWstringToU16string(labels[i])); - stringVal[i].string = (IggyUTF16*)conv[i].c_str(); + stringVal[i].string = conv[i].c_str(); stringVal[i].length = (S32)conv[i].length(); value[i].type = IGGY_DATATYPE_string_UTF16; value[i].string16 = stringVal[i]; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_BitmapIcon.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_BitmapIcon.cpp index d3c784383..5b26008d5 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_BitmapIcon.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_BitmapIcon.cpp @@ -21,7 +21,7 @@ void UIControl_BitmapIcon::setTextureName(const std::wstring &iconName) const std::u16string convName = convWstringToU16string(iconName); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convName.c_str(); + stringVal.string = convName.c_str(); stringVal.length = convName.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp index bad06125c..332a097eb 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp @@ -29,7 +29,7 @@ void UIControl_Button::init(const std::wstring &label, int id) value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp index 95a8b9fa1..ee186dcc0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp @@ -101,7 +101,7 @@ void UIControl_ButtonList::addItem(const std::wstring &label, int data) const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; @@ -156,7 +156,7 @@ void UIControl_ButtonList::setButtonLabel(int iButtonId, const std::wstring &lab const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[1].type = IGGY_DATATYPE_string_UTF16; value[1].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp index 4c7d02c24..d558b84fd 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp @@ -34,7 +34,7 @@ void UIControl_CheckBox::init(const std::wstring &label, int id, bool checked) value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_DLCList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_DLCList.cpp index 0c133f341..0a34a776f 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_DLCList.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_DLCList.cpp @@ -42,7 +42,7 @@ void UIControl_DLCList::addItem(const std::wstring &label, bool showTick, int iI const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16 *)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = (S32)convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp index 28f273988..ae52fda6c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp @@ -28,7 +28,7 @@ void UIControl_DynamicLabel::addText(const std::wstring &text, bool bLastEntry) IggyDataValue value[2]; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convText.c_str(); + stringVal.string = convText.c_str(); stringVal.length = convText.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_Label.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Label.cpp index 1f43dfe39..011e1bca1 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_Label.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_Label.cpp @@ -28,7 +28,7 @@ void UIControl_Label::init(const std::wstring &label) value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_initFunc , 1 , value ); diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp index 64c4c55bb..ffac378c1 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp @@ -56,7 +56,7 @@ void UIControl_LeaderboardList::setupTitles(const std::wstring &rank, const std: const std::u16string convRank = convWstringToU16string(rank); IggyStringUTF16 stringVal0; - stringVal0.string = (IggyUTF16*)convRank.c_str(); + stringVal0.string = convRank.c_str(); stringVal0.length = convRank.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal0; @@ -64,7 +64,7 @@ void UIControl_LeaderboardList::setupTitles(const std::wstring &rank, const std: const std::u16string convGamertag = convWstringToU16string(gamertag); IggyStringUTF16 stringVal1; - stringVal1.string = (IggyUTF16*)convGamertag.c_str(); + stringVal1.string = convGamertag.c_str(); stringVal1.length = convGamertag.length(); value[1].type = IGGY_DATATYPE_string_UTF16; value[1].string16 = stringVal1; @@ -132,7 +132,7 @@ void UIControl_LeaderboardList::addDataSet(bool bLast, int iId, int iRank, const const std::u16string convGamertag = convWstringToU16string(gamertag); IggyStringUTF16 stringVal0; - stringVal0.string = (IggyUTF16*)convGamertag.c_str(); + stringVal0.string = convGamertag.c_str(); stringVal0.length = convGamertag.length(); value[3].type = IGGY_DATATYPE_string_UTF16; value[3].string16 = stringVal0; @@ -143,7 +143,7 @@ void UIControl_LeaderboardList::addDataSet(bool bLast, int iId, int iRank, const const std::u16string convCol0 = convWstringToU16string(col0); IggyStringUTF16 stringVal1; - stringVal1.string = (IggyUTF16*)convCol0.c_str(); + stringVal1.string = convCol0.c_str(); stringVal1.length = convCol0.length(); value[5].type = IGGY_DATATYPE_string_UTF16; value[5].string16 = stringVal1; @@ -157,7 +157,7 @@ void UIControl_LeaderboardList::addDataSet(bool bLast, int iId, int iRank, const const std::u16string convCol1 = convWstringToU16string(col1); IggyStringUTF16 stringVal2; - stringVal2.string = (IggyUTF16*)convCol1.c_str(); + stringVal2.string = convCol1.c_str(); stringVal2.length = convCol1.length(); value[6].type = IGGY_DATATYPE_string_UTF16; value[6].string16 = stringVal2; @@ -172,7 +172,7 @@ void UIControl_LeaderboardList::addDataSet(bool bLast, int iId, int iRank, const const std::u16string convCol2 = convWstringToU16string(col2); IggyStringUTF16 stringVal3; - stringVal3.string = (IggyUTF16*)convCol2.c_str(); + stringVal3.string = convCol2.c_str(); stringVal3.length = convCol2.length(); value[7].type = IGGY_DATATYPE_string_UTF16; value[7].string16 = stringVal3; @@ -187,7 +187,7 @@ void UIControl_LeaderboardList::addDataSet(bool bLast, int iId, int iRank, const const std::u16string convCol3 = convWstringToU16string(col3); IggyStringUTF16 stringVal4; - stringVal4.string = (IggyUTF16*)convCol3.c_str(); + stringVal4.string = convCol3.c_str(); stringVal4.length = convCol3.length(); value[8].type = IGGY_DATATYPE_string_UTF16; value[8].string16 = stringVal4; @@ -202,7 +202,7 @@ void UIControl_LeaderboardList::addDataSet(bool bLast, int iId, int iRank, const const std::u16string convCol4 = convWstringToU16string(col4); IggyStringUTF16 stringVal5; - stringVal5.string = (IggyUTF16*)convCol4.c_str(); + stringVal5.string = convCol4.c_str(); stringVal5.length = convCol4.length(); value[9].type = IGGY_DATATYPE_string_UTF16; value[9].string16 = stringVal5; @@ -217,7 +217,7 @@ void UIControl_LeaderboardList::addDataSet(bool bLast, int iId, int iRank, const const std::u16string convCol5 = convWstringToU16string(col5); IggyStringUTF16 stringVal6; - stringVal6.string = (IggyUTF16*)convCol5.c_str(); + stringVal6.string = convCol5.c_str(); stringVal6.length = convCol5.length(); value[10].type = IGGY_DATATYPE_string_UTF16; value[10].string16 = stringVal6; @@ -232,7 +232,7 @@ void UIControl_LeaderboardList::addDataSet(bool bLast, int iId, int iRank, const const std::u16string convCol6 = convWstringToU16string(col6); IggyStringUTF16 stringVal7; - stringVal7.string = (IggyUTF16*)convCol6.c_str(); + stringVal7.string = convCol6.c_str(); stringVal7.length = convCol6.length(); value[11].type = IGGY_DATATYPE_string_UTF16; value[11].string16 = stringVal7; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_PlayerList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_PlayerList.cpp index 4dec188ed..29257bfc0 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_PlayerList.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_PlayerList.cpp @@ -22,7 +22,7 @@ void UIControl_PlayerList::addItem(const std::wstring &label, int iPlayerIcon, i const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = (S32)convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_Progress.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Progress.cpp index 8f0da8be5..0ae7d9e69 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_Progress.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_Progress.cpp @@ -38,7 +38,7 @@ void UIControl_Progress::init(const std::wstring &label, int id, int min, int ma value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_SaveList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_SaveList.cpp index ff9353300..0fb1988df 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_SaveList.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_SaveList.cpp @@ -62,7 +62,7 @@ void UIControl_SaveList::addItem(const std::string &label, const std::wstring &i const std::u16string convName = convWstringToU16string(iconName); IggyStringUTF16 stringVal2; - stringVal2.string = (IggyUTF16*)convName.c_str(); + stringVal2.string = convName.c_str(); stringVal2.length = convName.length(); value[2].type = IGGY_DATATYPE_string_UTF16; value[2].string16 = stringVal2; @@ -77,7 +77,7 @@ void UIControl_SaveList::addItem(const std::wstring &label, const std::wstring & const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = (S32)convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; @@ -88,7 +88,7 @@ void UIControl_SaveList::addItem(const std::wstring &label, const std::wstring & const std::u16string convName = convWstringToU16string(iconName); IggyStringUTF16 stringVal2; - stringVal2.string = (IggyUTF16*)convName.c_str(); + stringVal2.string = convName.c_str(); stringVal2.length = convName.length(); value[2].type = IGGY_DATATYPE_string_UTF16; value[2].string16 = stringVal2; @@ -106,7 +106,7 @@ void UIControl_SaveList::setTextureName(int iId, const std::wstring &iconName) const std::u16string convName = convWstringToU16string(iconName); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convName.c_str(); + stringVal.string = convName.c_str(); stringVal.length = convName.length(); value[1].type = IGGY_DATATYPE_string_UTF16; value[1].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp index 6e5bb0596..dfc733540 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp @@ -37,7 +37,7 @@ void UIControl_Slider::init(const std::wstring &label, int id, int min, int max, value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_SpaceIndicatorBar.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_SpaceIndicatorBar.cpp index 016bc8eb5..aefd28394 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_SpaceIndicatorBar.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_SpaceIndicatorBar.cpp @@ -38,7 +38,7 @@ void UIControl_SpaceIndicatorBar::init(const std::wstring &label, int id, __int6 value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp index 89074f69c..19bd91b74 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp @@ -32,7 +32,7 @@ void UIControl_TextInput::init(const std::wstring &label, int id) value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp index 502274c54..bcdb1637d 100644 --- a/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp @@ -35,7 +35,7 @@ void UIControl_TexturePackList::init(const std::wstring &label, int id) value[0].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].string16 = stringVal; @@ -69,7 +69,7 @@ void UIControl_TexturePackList::addPack(int id, const std::wstring &textureName) value[1].type = IGGY_DATATYPE_string_UTF16; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convName.c_str(); + stringVal.string = convName.c_str(); stringVal.length = convName.length(); value[1].string16 = stringVal; IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_addPackFunc ,2 , value ); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp index 97f5a25b4..336a25b12 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp @@ -363,7 +363,7 @@ void UIScene_AnvilMenu::setCostLabel(const std::wstring &label, bool canAfford) const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp index 74fbde892..424f6b133 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp @@ -645,7 +645,7 @@ void UIScene_Credits::setNextLabel(const std::wstring &label, ECreditTextTypes s const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp index 419eb2164..c521ba049 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp @@ -129,7 +129,7 @@ void UIScene_EndPoem::tick() const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp index 58761023e..b1883b4ed 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp @@ -536,7 +536,7 @@ void UIScene_HUD::SetDragonLabel(const std::wstring &label) IggyDataValue value[1]; const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; @@ -567,7 +567,7 @@ void UIScene_HUD::SetSelectedLabel(const std::wstring &label) IggyDataValue value[1]; const std::u16string convLabel = convWstringToU16string(label); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; @@ -742,7 +742,7 @@ void UIScene_HUD::SetDisplayName(const std::wstring &displayName) IggyDataValue value[1]; IggyStringUTF16 stringVal; const std::u16string convName = convWstringToU16string(displayName); - stringVal.string = (IggyUTF16*)convName.c_str(); + stringVal.string = convName.c_str(); stringVal.length = convName.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp index 027b669de..4def5c2fc 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp @@ -312,7 +312,7 @@ void UIScene_HowToPlay::StartPage( EHowToPlayPage ePage ) { conv.push_back(convWstringToU16string(paragraphs[i])); - stringVal[i].string = (IggyUTF16 *)conv[i].c_str(); + stringVal[i].string = conv[i].c_str(); stringVal[i].length = conv[i].length(); value[i+1].type = IGGY_DATATYPE_string_UTF16; value[i+1].string16 = stringVal[i]; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InventoryMenu.cpp index 60b327fb1..7a94452fc 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InventoryMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InventoryMenu.cpp @@ -304,7 +304,7 @@ void UIScene_InventoryMenu::updateEffectsDisplay() const std::u16string convString = convWstringToU16string(effectString); IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convString.c_str(); + stringVal.string = convString.c_str(); stringVal.length = convString.length(); value[1].type = IGGY_DATATYPE_string_UTF16; value[1].string16 = stringVal; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.cpp index 832db8031..6cae9aaa3 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.cpp @@ -27,7 +27,7 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye std::wstring label = L"Abc"; IggyStringUTF16 stringVal; const std::u16string convLabel = convWstringToU16string(label); - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); IggyDataValue result; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp index f1551f9b6..2111c2e34 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp @@ -1370,7 +1370,7 @@ void UIScene_SkinSelectMenu::setLeftLabel(const std::wstring &label) IggyDataValue value[1]; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; @@ -1391,7 +1391,7 @@ void UIScene_SkinSelectMenu::setCentreLabel(const std::wstring &label) IggyDataValue value[1]; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; @@ -1412,7 +1412,7 @@ void UIScene_SkinSelectMenu::setRightLabel(const std::wstring &label) IggyDataValue value[1]; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convLabel.c_str(); + stringVal.string = convLabel.c_str(); stringVal.length = convLabel.length(); value[0].type = IGGY_DATATYPE_string_UTF16; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp index d446b2368..619a22bf3 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp @@ -261,7 +261,7 @@ void UIScene_TradingMenu::setOfferDescription(const std::wstring &name, std::vec IggyDataValue value[1]; IggyStringUTF16 stringVal; - stringVal.string = (IggyUTF16*)convName.c_str(); + stringVal.string = convName.c_str(); stringVal.length = convName.length(); value[0].type = IGGY_DATATYPE_string_UTF16; value[0].string16 = stringVal;