1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Description: Set WMCLASS to Debian specific values & remove STUBs about icon
Forwarded: not-needed
Author: Sébastien Noel <sebastien@twolife.be>
--- a/Sources/SeriousSam/SeriousSam.cpp
+++ b/Sources/SeriousSam/SeriousSam.cpp
@@ -464,6 +464,13 @@ static void atexit_sdlquit(void) { stati
BOOL Init( HINSTANCE hInstance, int nCmdShow, CTString strCmdLine)
{
#ifdef PLATFORM_UNIX
+#ifdef FIRST_ENCOUNTER
+setenv("SDL_VIDEO_WAYLAND_WMCLASS", "serious-sam-tfe", 0);
+setenv("SDL_VIDEO_X11_WMCLASS", "serious-sam-tfe", 0);
+#else // Second Encounter
+setenv("SDL_VIDEO_WAYLAND_WMCLASS", "serious-sam-tse", 0);
+setenv("SDL_VIDEO_X11_WMCLASS", "serious-sam-tse", 0);
+#endif
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) == -1)
FatalError("SDL_Init(VIDEO|AUDIO) failed. Reason: [%s].", SDL_GetError());
atexit(atexit_sdlquit);
--- a/Sources/SeriousSam/MainWindow.cpp
+++ b/Sources/SeriousSam/MainWindow.cpp
@@ -163,9 +163,6 @@ void MainWindow_Init(void)
ASSERT(_hbmSplash!=NULL);
GetObject(_hbmSplash, sizeof(BITMAP), (LPSTR) &_bmSplash);
// here was loading and setting of no-windows-mouse-cursor
-
-#else
- STUBBED("load window icon");
#endif
}
@@ -174,8 +171,6 @@ void MainWindow_End(void)
{
#ifdef PLATFORM_WIN32
DeleteObject(_hbmSplash);
-#else
- STUBBED("");
#endif
}
|
