Pass ST::string to some hsMessageBoxes

H-uru · Aug 15, 2023 · 61bd0ed · 61bd0ed
1 parent 52e901d
commit 61bd0ed
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Sources/Plasma/Apps/plClient/win32/winmain.cpp b/Sources/Plasma/Apps/plClient/win32/winmain.cpp
@@ -1194,7 +1194,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
                 message = ST_LITERAL("Another copy of URU is already running");
                 break;
         }
-        hsMessageBox(message.to_wchar().c_str(), caption.to_wchar().c_str(), hsMessageBoxNormal);
+        hsMessageBox(message, caption, hsMessageBoxNormal);
         return PARABLE_NORMAL_EXIT;
     }
 #endif

diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
@@ -358,7 +358,7 @@ bool    pfConsole::MsgReceive( plMessage *msg )
 #else
                         "\nPress OK to continue parsing files." );
 
-                hsMessageBox( msg.c_str(), str.c_str(), hsMessageBoxNormal );
+                hsMessageBox(msg, str, hsMessageBoxNormal);
 #endif
             }
         }

diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.cpp
@@ -76,7 +76,7 @@ bool pfConsoleDirSrc::ParseDirectory(const plFileName& path, const char* mask /*
             error << fEngine->GetErrorMsg() << ":\n\nCommand: '" << fEngine->GetLastErrorLine()
                   << "'\n\nPress OK to continue parsing files.";
 
-            hsMessageBox(error.to_string().c_str(), caption.to_string().c_str(), hsMessageBoxNormal);
+            hsMessageBox(error.to_string(), caption.to_string(), hsMessageBoxNormal);
 
             SetCheckProcessedFiles(true);
             return false;

diff --git a/Sources/Plasma/FeatureLib/pfDXPipeline/plDXPipeline.cpp b/Sources/Plasma/FeatureLib/pfDXPipeline/plDXPipeline.cpp
@@ -1879,7 +1879,7 @@ void plDXPipeline::IPrintDeviceInitError()
             message = ST_LITERAL("There was an error initializing your video card. We have reset it to its Default settings.");
             break;
     }
-    hsMessageBox(message.to_wchar().c_str(), caption.to_wchar().c_str(), hsMessageBoxNormal, hsMessageBoxIconError);
+    hsMessageBox(message, caption, hsMessageBoxNormal, hsMessageBoxIconError);
 }
 
 // Reset device creation parameters to default and write to ini file

diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
@@ -253,7 +253,7 @@ void plClothingItem::Write(hsStream *s, hsResMgr *mgr)
         if (accessoryKey == nullptr)
         {
             strBuf = ST::format("Couldn't find accessory \"{}\". It won't show at runtime.", fAccessoryName);
-            hsMessageBox(strBuf.c_str(), GetKeyName().c_str(), hsMessageBoxNormal);
+            hsMessageBox(strBuf, GetKeyName(), hsMessageBoxNormal);
         }
     }
     mgr->WriteKey(s, accessoryKey);

diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
@@ -1171,7 +1171,7 @@ void plResManager::PageInRoom(const plLocation& page, uint16_t objClassToRef, pl
 
         ST::string msg = ST::format("Data Problem: Age:{}  Page:{}  Error:{}",
             pageNode->GetPageInfo().GetAge(), pageNode->GetPageInfo().GetPage(), condStr);
-        hsMessageBox(msg.c_str(), "Error", hsMessageBoxNormal, hsMessageBoxIconError);
+        hsMessageBox(msg, ST_LITERAL("Error"), hsMessageBoxNormal, hsMessageBoxIconError);
 
         hsRefCnt_SafeUnRef(refMsg);
         return;