dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7278) -Codechange: [win32] Add UNICODE support so it should compile on OS's using UNICODE

Browse Source 
API exclusively.
This commit is contained in:
Darkvater
2006-11-28 19:58:13 +00:00
parent bf907c8d3c
commit 8d29e3efdb
4 changed files with 119 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
video/dedicated_v.c
View File

@@ -64,6 +64,7 @@ static void DedicatedSignalHandler(int sig)
#include <windows.h> /* GetTickCount */
#include <conio.h>
#include <time.h>
#include <tchar.h>
static HANDLE _hInputReady, _hWaitForInputHandling;
static HANDLE _hThread; // Thread to close
static char _win_console_thread_buffer[200];
@@ -121,10 +122,10 @@ static const char *DedicatedVideoStart(const char * const *parm)
_debug_misc_level = 0;
#ifdef WIN32
// For win32 we need to allocate an console (debug mode does the same)
// For win32 we need to allocate a console (debug mode does the same)
CreateConsole();
CreateWindowsConsoleThread();
SetConsoleTitle("OpenTTD Dedicated Server");
SetConsoleTitle(_T("OpenTTD Dedicated Server"));
#endif
#ifdef __OS2__

9
video/win32_v.c
View File

@@ -11,6 +11,7 @@
#include "../window.h"
#include "win32_v.h"
#include <windows.h>
#include <tchar.h>
static struct {
HWND main_wnd;
@@ -517,7 +518,7 @@ static void RegisterWndClass(void)
LoadCursor(NULL, IDC_ARROW),
0,
0,
"OTTD"
_T("OTTD")
};
registered = true;
@@ -588,11 +589,11 @@ static void MakeWindow(bool full_screen)
SetWindowPos(_wnd.main_wnd, 0, x, y, w, h, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
} else {
extern const char _openttd_revision[];
char Windowtitle[50];
TCHAR Windowtitle[50];
snprintf(Windowtitle, lengthof(Windowtitle), "OpenTTD %s", _openttd_revision);
_sntprintf(Windowtitle, sizeof(Windowtitle), _T("OpenTTD %s"), MB_TO_WIDE(_openttd_revision));
_wnd.main_wnd = CreateWindow("OTTD", Windowtitle, style, x, y, w, h, 0, 0, GetModuleHandle(NULL), 0);
_wnd.main_wnd = CreateWindow(_T("OTTD"), Windowtitle, style, x, y, w, h, 0, 0, GetModuleHandle(NULL), 0);
if (_wnd.main_wnd == NULL) error("CreateWindow failed");
}
}