Dungeon Stomp DirectX12

Author: moonwho101

bin/DungeonStomp.exe

@@ -1001,10 +1001,11 @@ void DrawIndexedItems(int fakel, int vert_index) {
 	}
 }
 
-wchar_t *charToWChar(const char *text) {
+std::wstring charToWChar(const char *text) {
 	const size_t size = strlen(text) + 1;
-	wchar_t *wText = new wchar_t[size];
+	std::wstring wText(size, L'\0');
 	size_t outSize;
-	mbstowcs_s(&outSize, wText, size, text, size);
+	mbstowcs_s(&outSize, &wText[0], size, text, size);
+	wText.resize(outSize > 0 ? outSize - 1 : 0);
 	return wText;
 }

src/World.cpp

@@ -389,7 +389,7 @@ void MakeWave(char *file, std::unique_ptr<uint8_t[]> waveFile) {
 	HRESULT hr;
 
 	DirectX::WAVData waveData;
-	hr = DirectX::LoadWAVAudioFromFileEx(charToWChar(file), waveFile, waveData);
+	hr = DirectX::LoadWAVAudioFromFileEx(charToWChar(file).c_str(), waveFile, waveData);
 	//{
 	// wprintf(L"Failed reading WAV file: %#X (%s)\n", hr, strFilePath);
 	// return;
@@ -461,7 +461,7 @@ BOOL LoadSoundFiles(char *filename) {
 			GetCurrentDirectory(100, NPath);
 
 			// DirectX::WAVData waveData;
-			hr = DirectX::LoadWAVAudioFromFileEx(charToWChar(file), sound_buffer[numsounds].waveFile, sound_buffer[numsounds].waveData);
+			hr = DirectX::LoadWAVAudioFromFileEx(charToWChar(file).c_str(), sound_buffer[numsounds].waveFile, sound_buffer[numsounds].waveData);
 			hr = pXAudio2->CreateSourceVoice(&sound_list[numsounds].pSourceVoice, sound_buffer[numsounds].waveData.wfx);
 			strcpy_s(sound_buffer[numsounds].name, name);
 			sound_list[numsounds].soundbufferid = numsounds;

src/XAudio2BasicSound.cpp

@@ -4,6 +4,7 @@
 
 #include <windows.h>
 #include <windowsx.h>
+#include <string>
 #include "d3dtypes.h"
 #include "GlobalSettings.hpp"
 #include <DirectXMath.h>
@@ -535,7 +536,7 @@ int SoundID(char *name);
 int FreeSlave();
 void CheckMidiMusic();
 int MakeDice();
-wchar_t *charToWChar(const char *text);
+std::wstring charToWChar(const char *text);
 int GetNextFramePlayer();
 
 #endif // __WORLD_H__