jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplicate definition of M_OEMToUTF8() (thanks exp(x)).

Browse source 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2569
This commit is contained in:
Simon Howard 2013-03-27 02:25:20 +00:00
parent f0f56055d8
commit 917aa5b184
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/setup/multiplayer.c
View file

@ -30,6 +30,7 @@
#include "d_iwad.h"
#include "m_config.h"
#include "m_misc.h"
#include "doom/d_englsh.h"
#include "m_controls.h"
@ -1008,28 +1009,6 @@ void SetChatMacroDefaults(void)
}
}
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
char *M_OEMToUTF8(const char *oem)
{
unsigned int len = strlen(oem) + 1;
wchar_t *tmp;
char *result;
tmp = malloc(len * sizeof(wchar_t));
MultiByteToWideChar(CP_OEMCP, 0, oem, len, tmp, len);
result = malloc(len * 4);
WideCharToMultiByte(CP_UTF8, 0, tmp, len, result, len * 4, NULL, NULL);
free(tmp);
return result;
}
#endif
void SetPlayerNameDefault(void)
{
if (net_player_name == NULL)