Do not use shared_str directly on printf

OpenXRay · Sep 24, 2018 · 2c243df · 2c243df
1 parent 6d2f0f9
commit 2c243df
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/xrGame/GameObject.cpp b/src/xrGame/GameObject.cpp
@@ -465,7 +465,7 @@ BOOL CGameObject::net_Spawn(CSE_Abstract* DC)
         //R_ASSERT(Level().Objects.net_Find(E->ID) == nullptr);
         if (Level().Objects.net_Find(E->ID) != nullptr)
         {
-            GEnv.ScriptEngine->script_log(LuaMessageType::Error, "CGameObject:net_Spawn() | Level().Objects.net_Find(E->ID) != nullptr (This mean object already exist on level by this ID) ID=%s s_name=%s", E->ID, E->s_name);
+            GEnv.ScriptEngine->script_log(LuaMessageType::Error, "CGameObject:net_Spawn() | Level().Objects.net_Find(E->ID) != nullptr (This mean object already exist on level by this ID) ID=%s s_name=%s", E->ID, E->s_name.c_str());
             return false;
         }
     }

diff --git a/src/xrGame/ini_table_loader.h b/src/xrGame/ini_table_loader.h
@@ -106,7 +106,7 @@ typename CSIni_Table::ITEM_TABLE& CSIni_Table::table()
             T_INI_LOADER::IdToIndex((*i).first, type_max<typename T_INI_LOADER::index_type>);
 
         if (type_max<typename T_INI_LOADER::index_type> == cur_index)
-            xrDebug::Fatal(DEBUG_INFO, "wrong community %s in section [%s]", (*i).first, table_sect);
+            xrDebug::Fatal(DEBUG_INFO, "wrong community %s in section [%s]", (*i).first.c_str(), table_sect);
 
         (*m_pTable)[cur_index].resize(cur_table_width);
         for (std::size_t j = 0; j < cur_table_width; j++)

diff --git a/src/xrGame/ui/UIInvUpgradeProperty.cpp b/src/xrGame/ui/UIInvUpgradeProperty.cpp
@@ -175,7 +175,7 @@ void UIInvUpgPropertiesWnd::init_from_xml(LPCSTR xml_name)
         property_id._set((*ib).first);
         if (!ui_property->init_property(property_id))
         {
-            Msg("! Invalid property <%s> in inventory upgrade manager!", property_id);
+            Msg("! Invalid property <%s> in inventory upgrade manager!", property_id.c_str());
             continue;
         }
 

diff --git a/src/xrGame/ui/UITalkWnd.cpp b/src/xrGame/ui/UITalkWnd.cpp
@@ -261,7 +261,7 @@ void CUITalkWnd::AskQuestion()
         {
             string128 s;
             xr_sprintf(s, "ID = [%s] of selected question is out of range of available dialogs ",
-                UITalkDialogWnd->m_ClickedQuestionID);
+                UITalkDialogWnd->m_ClickedQuestionID.c_str());
             VERIFY2(FALSE, s);
         }