petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r1093) -Fix: Hopefully fixed windows revision issues once and for all. Removed globalness of _openttd_revision and put all such ifdefs into one place. If server has a revision only the same revisions can join; if the server has no revision everyone can join. I reckon this should be a server-side option to allow people to join or not to join.

Browse Source
This commit is contained in:
darkvater
2004-12-15 00:31:08 +00:00
parent 6cb53e7d34
commit c58549d512
11 changed files with 55 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
win32.c
View File

@@ -15,11 +15,6 @@
#define SMART_PALETTE_ANIM
/* Declare the revision tag for Windows */
#ifdef WITH_REV_HACK
const char _openttd_revision[] = WITH_REV_HACK;
#endif
static struct {
HWND main_wnd;
HBITMAP dib_sect;
@@ -446,6 +441,8 @@ static void RegisterWndClass()
}
}
extern const char _openttd_revision[];
static void MakeWindow(bool full_screen)
{
_fullscreen = full_screen;
@@ -504,10 +501,9 @@ static void MakeWindow(bool full_screen)
SetWindowPos(_wnd.main_wnd, 0, x, y, w, h, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
} else {
char Windowtitle[50] = "OpenTTD ";
#ifdef WITH_REV
// also show revision number/release in window title
strncat(Windowtitle, _openttd_revision, sizeof(Windowtitle)-(strlen(Windowtitle) + 1));
#endif
// also show revision number/release in window title
strncat(Windowtitle, _openttd_revision, sizeof(Windowtitle)-(strlen(Windowtitle) + 1));
_wnd.main_wnd = CreateWindow("TTD", Windowtitle, style, x, y, w, h, 0, 0, _inst, 0);
if (_wnd.main_wnd == NULL)
error("CreateWindow failed");