From 377fc814479f768558114960c5bc8557195b1f01 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 13 May 2017 12:07:37 -0400
Subject: [PATCH 01/10] Appveyor: disable deployment
---
appveyor.yml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 76e1261f9..75f3b3abf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -63,21 +63,21 @@ after_build:
test: off
-deploy:
- - provider: FTP
- protocol: ftps
- host:
- secure: NsLJEPIBvmwCOj8Tg8RoRQ==
- username:
- secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA=
- password:
- secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
- folder: appveyor
- application:
- active_mode: false
- on:
- branch: master
- appveyor_repo_tag: true
+#deploy:
+# - provider: FTP
+# protocol: ftps
+# host:
+# secure: NsLJEPIBvmwCOj8Tg8RoRQ==
+# username:
+# secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA=
+# password:
+# secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
+# folder: appveyor
+# application:
+# active_mode: false
+# on:
+# branch: master
+# appveyor_repo_tag: true
on_finish:
From 7d4146870a8b7dd1484af3c8650a2f8979dc79f4 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sat, 13 May 2017 12:13:47 -0400
Subject: [PATCH 02/10] Appveyor: keep a stable name version of the archive
---
appveyor.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/appveyor.yml b/appveyor.yml
index 75f3b3abf..c1f6894ef 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -58,8 +58,11 @@ after_build:
- cmd: git rev-parse --short %APPVEYOR_REPO_COMMIT%>%TMP%/gitshort.txt
- cmd: set /P GITSHORT=<%TMP%/gitshort.txt
- set BUILD_ARCHIVE=%APPVEYOR_REPO_BRANCH%-%GITSHORT%-%CONFIGURATION%.7z
+- set BUILDSARCHIVE=%APPVEYOR_REPO_BRANCH%-%CONFIGURATION%.7z
- cmd: 7z a %BUILD_ARCHIVE% bin\Mingw\Release -xr!.gitignore
- appveyor PushArtifact %BUILD_ARCHIVE%
+- cmd: copy %BUILD_ARCHIVE% %BUILDSARCHIVE%
+- appveyor PushArtifact %BUILDSARCHIVE%
test: off
From 222807c6f62d73e60c33f1d229f8c7678273b562 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 15 May 2017 14:29:31 +0100
Subject: [PATCH 03/10] Fix R_InitExtraColormaps reporting 6 or more colormaps
every time you loaded the game, even though we haven't used C_START/C_END in
more than a decade now
Note to self: W_ functions are awfully confusing with returning with LUMPERROR or INT16_MAX. Should sort out what's going on there if necessary
---
src/r_data.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/r_data.c b/src/r_data.c
index 7bad6bb89..4066ca648 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -944,12 +944,12 @@ static void R_InitExtraColormaps(void)
for (cfile = clump = 0; cfile < numwadfiles; cfile++, clump = 0)
{
startnum = W_CheckNumForNamePwad("C_START", cfile, clump);
- if (startnum == LUMPERROR)
+ if (startnum == INT16_MAX)
continue;
endnum = W_CheckNumForNamePwad("C_END", cfile, clump);
- if (endnum == LUMPERROR)
+ if (endnum == INT16_MAX)
I_Error("R_InitExtraColormaps: C_START without C_END\n");
if (WADFILENUM(startnum) != WADFILENUM(endnum))
From f8482421e5dd1666a61e4901b988a62829b1c2d7 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 15 May 2017 14:38:55 +0100
Subject: [PATCH 04/10] Don't need to use WADFILENUM/LUMPNUM in this function,
since W_CheckNumForNamePwad returns just the lump number, not a combined WAD
+ lump number frankenstein's monster
This is just in case someone actually tries to dump in C_START/C_END and "add" colormaps using them, not that they would ever be used currently anyway.
---
src/r_data.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/r_data.c b/src/r_data.c
index 4066ca648..d19882dd3 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -952,15 +952,16 @@ static void R_InitExtraColormaps(void)
if (endnum == INT16_MAX)
I_Error("R_InitExtraColormaps: C_START without C_END\n");
- if (WADFILENUM(startnum) != WADFILENUM(endnum))
- I_Error("R_InitExtraColormaps: C_START and C_END in different wad files!\n");
+ // This shouldn't be possible when you use the Pwad function, silly
+ //if (WADFILENUM(startnum) != WADFILENUM(endnum))
+ //I_Error("R_InitExtraColormaps: C_START and C_END in different wad files!\n");
if (numcolormaplumps >= maxcolormaplumps)
maxcolormaplumps *= 2;
colormaplumps = Z_Realloc(colormaplumps,
sizeof (*colormaplumps) * maxcolormaplumps, PU_STATIC, NULL);
- colormaplumps[numcolormaplumps].wadfile = WADFILENUM(startnum);
- colormaplumps[numcolormaplumps].firstlump = LUMPNUM(startnum+1);
+ colormaplumps[numcolormaplumps].wadfile = cfile;
+ colormaplumps[numcolormaplumps].firstlump = startnum+1;
colormaplumps[numcolormaplumps].numlumps = endnum - (startnum + 1);
numcolormaplumps++;
}
From 093800cb06be63040368adbf4579af0738ae97a5 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 15 May 2017 15:24:40 +0100
Subject: [PATCH 05/10] I_FinishUpdate: OglSdlFinishUpdate should never run for
render_soft, even if screens[0] somehow is NULL
---
src/sdl/i_video.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index aa572e6e0..73bbe8acd 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -931,7 +931,7 @@ void I_FinishUpdate(void)
if (cv_ticrate.value)
SCR_DisplayTicRate();
- if (render_soft == rendermode && screens[0])
+ if (rendermode == render_soft && screens[0])
{
SDL_Rect rect;
@@ -958,7 +958,7 @@ void I_FinishUpdate(void)
}
#ifdef HWRENDER
- else
+ else if (rendermode == render_opengl)
{
OglSdlFinishUpdate(cv_vidwait.value);
}
From d1bbd1261e7f3b3dbdbbe9951ae007fa120d0df0 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 15 May 2017 15:36:51 +0100
Subject: [PATCH 06/10] VID_SetMode: SDLSetMode should use
vid.width/vid.height, not windowedModes[modeNum].
If modenum was < 0 or >= MAXWINMODES, that would make windowedModes[modeNum] be out of bounds and possibly crash the game.
---
src/sdl/i_video.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 73bbe8acd..43a293ae5 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1188,7 +1188,7 @@ INT32 VID_SetMode(INT32 modeNum)
}
Impl_SetWindowName("SRB2 "VERSIONSTRING);
- SDLSetMode(windowedModes[modeNum][0], windowedModes[modeNum][1], USE_FULLSCREEN);
+ SDLSetMode(vid.width, vid.height, USE_FULLSCREEN);
if (render_soft == rendermode)
{
From 4979ab6b8ec0de1e684ff87a00978b0fab87df51 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 15 May 2017 15:43:31 +0100
Subject: [PATCH 07/10] Not really important or anything, but checking
render_soft == rendermode rather than rendermode == render_soft always bugged
me. And it's not consistent with the rest of the source code (or at least
most of it) anyway.
---
src/sdl/i_video.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 43a293ae5..2df4d527e 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -899,7 +899,7 @@ static inline boolean I_SkipFrame(void)
{
static boolean skip = false;
- if (render_soft != rendermode)
+ if (rendermode != render_soft)
return false;
skip = !skip;
@@ -1190,7 +1190,7 @@ INT32 VID_SetMode(INT32 modeNum)
SDLSetMode(vid.width, vid.height, USE_FULLSCREEN);
- if (render_soft == rendermode)
+ if (rendermode == render_soft)
{
if (bufSurface)
{
@@ -1483,7 +1483,7 @@ void I_ShutdownGraphics(void)
rendermode = render_none;
if (icoSurface) SDL_FreeSurface(icoSurface);
icoSurface = NULL;
- if (render_soft == oldrendermode)
+ if (oldrendermode == render_soft)
{
if (vidSurface) SDL_FreeSurface(vidSurface);
vidSurface = NULL;
From a340f2c8edec7c9e2e84f5aef4372f2423923c5c Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 15 May 2017 16:19:28 +0100
Subject: [PATCH 08/10] Impl_CreateWindow: re-use "flags" for SDL_RENDERER_*
flags, remove unnecessary curly braces
---
src/sdl/i_video.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 2df4d527e..5602ed04d 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1209,30 +1209,20 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
int flags = 0;
if (rendermode == render_none) // dedicated
- {
return SDL_TRUE; // Monster Iestyn -- not sure if it really matters what we return here tbh
- }
if (window != NULL)
- {
return SDL_FALSE;
- }
if (fullscreen)
- {
flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
- }
if (borderlesswindow)
- {
flags |= SDL_WINDOW_BORDERLESS;
- }
#ifdef HWRENDER
if (rendermode == render_opengl)
- {
flags |= SDL_WINDOW_OPENGL;
- }
#endif
// Create a window
@@ -1261,7 +1251,13 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
#endif
if (rendermode == render_soft)
{
- renderer = SDL_CreateRenderer(window, -1, (usesdl2soft ? SDL_RENDERER_SOFTWARE : 0) | (cv_vidwait.value && !usesdl2soft ? SDL_RENDERER_PRESENTVSYNC : 0));
+ flags = 0; // Use this to set SDL_RENDERER_* flags now
+ if (usesdl2soft)
+ flags |= SDL_RENDERER_SOFTWARE;
+ else if (cv_vidwait.value)
+ flags |= SDL_RENDERER_PRESENTVSYNC;
+
+ renderer = SDL_CreateRenderer(window, -1, flags);
if (renderer == NULL)
{
CONS_Printf(M_GetText("Couldn't create rendering context: %s\n"), SDL_GetError());
From 87085f2475ff5b699a1f95221b73e2e7fc81f5f6 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 15 May 2017 16:35:32 +0100
Subject: [PATCH 09/10] SDLSetMode: merge wasfullscreen/windowed mode code into
one block
---
src/sdl/i_video.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 5602ed04d..ec9b901c9 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -181,15 +181,13 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
wasfullscreen = SDL_TRUE;
SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
}
- else if (wasfullscreen)
- {
- wasfullscreen = SDL_FALSE;
- SDL_SetWindowFullscreen(window, 0);
- SDL_SetWindowSize(window, width, height);
- SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED_DISPLAY(1), SDL_WINDOWPOS_CENTERED_DISPLAY(1));
- }
- else
+ else // windowed mode
{
+ if (wasfullscreen)
+ {
+ wasfullscreen = SDL_FALSE;
+ SDL_SetWindowFullscreen(window, 0);
+ }
// Reposition window only in windowed mode
SDL_SetWindowSize(window, width, height);
SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED_DISPLAY(1), SDL_WINDOWPOS_CENTERED_DISPLAY(1));
From 17a06dd6c4875f562bbb33ddb6ddb0fa37d8428b Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 15 May 2017 18:39:59 +0100
Subject: [PATCH 10/10] I_GetConsoleEvents: Split KEY_EVENT code into a
function of its own, like with I_GetEvent's event types
One benefit of this is that event_t data need only be created if KEY_EVENT is found, since the other event types never do anything anyway
---
src/sdl/i_system.c | 112 ++++++++++++++++++++++++---------------------
1 file changed, 60 insertions(+), 52 deletions(-)
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 71ee3f794..f72a9857d 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -590,70 +590,78 @@ static BOOL I_ReadyConsole(HANDLE ci)
static boolean entering_con_command = false;
+static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co)
+{
+ event_t event;
+ CONSOLE_SCREEN_BUFFER_INFO CSBI;
+ DWORD t;
+
+ memset(&event,0x00,sizeof (event));
+
+ if (evt.bKeyDown)
+ {
+ event.type = ev_console;
+ entering_con_command = true;
+ switch (evt.wVirtualKeyCode)
+ {
+ case VK_ESCAPE:
+ case VK_TAB:
+ event.data1 = KEY_NULL;
+ break;
+ case VK_SHIFT:
+ event.data1 = KEY_LSHIFT;
+ break;
+ case VK_RETURN:
+ entering_con_command = false;
+ // Fall through.
+ default:
+ event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char
+ }
+ if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t))
+ {
+ if (event.data1 && event.data1 != KEY_LSHIFT && event.data1 != KEY_RSHIFT)
+ {
+#ifdef _UNICODE
+ WriteConsole(co, &evt.uChar.UnicodeChar, 1, &t, NULL);
+#else
+ WriteConsole(co, &evt.uChar.AsciiChar, 1 , &t, NULL);
+#endif
+ }
+ if (evt.wVirtualKeyCode == VK_BACK
+ && GetConsoleScreenBufferInfo(co,&CSBI))
+ {
+ WriteConsoleOutputCharacterA(co, " ",1, CSBI.dwCursorPosition, &t);
+ }
+ }
+ }
+ else
+ {
+ event.type = ev_keyup;
+ switch (evt.wVirtualKeyCode)
+ {
+ case VK_SHIFT:
+ event.data1 = KEY_LSHIFT;
+ break;
+ default:
+ break;
+ }
+ }
+ if (event.data1) D_PostEvent(&event);
+}
+
void I_GetConsoleEvents(void)
{
- event_t ev = {0,0,0,0};
HANDLE ci = GetStdHandle(STD_INPUT_HANDLE);
HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE);
- CONSOLE_SCREEN_BUFFER_INFO CSBI;
INPUT_RECORD input;
DWORD t;
while (I_ReadyConsole(ci) && ReadConsoleInput(ci, &input, 1, &t) && t)
{
- memset(&ev,0x00,sizeof (ev));
switch (input.EventType)
{
case KEY_EVENT:
- if (input.Event.KeyEvent.bKeyDown)
- {
- ev.type = ev_console;
- entering_con_command = true;
- switch (input.Event.KeyEvent.wVirtualKeyCode)
- {
- case VK_ESCAPE:
- case VK_TAB:
- ev.data1 = KEY_NULL;
- break;
- case VK_SHIFT:
- ev.data1 = KEY_LSHIFT;
- break;
- case VK_RETURN:
- entering_con_command = false;
- // Fall through.
- default:
- ev.data1 = MapVirtualKey(input.Event.KeyEvent.wVirtualKeyCode,2); // convert in to char
- }
- if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t))
- {
- if (ev.data1 && ev.data1 != KEY_LSHIFT && ev.data1 != KEY_RSHIFT)
- {
-#ifdef _UNICODE
- WriteConsole(co, &input.Event.KeyEvent.uChar.UnicodeChar, 1, &t, NULL);
-#else
- WriteConsole(co, &input.Event.KeyEvent.uChar.AsciiChar, 1 , &t, NULL);
-#endif
- }
- if (input.Event.KeyEvent.wVirtualKeyCode == VK_BACK
- && GetConsoleScreenBufferInfo(co,&CSBI))
- {
- WriteConsoleOutputCharacterA(co, " ",1, CSBI.dwCursorPosition, &t);
- }
- }
- }
- else
- {
- ev.type = ev_keyup;
- switch (input.Event.KeyEvent.wVirtualKeyCode)
- {
- case VK_SHIFT:
- ev.data1 = KEY_LSHIFT;
- break;
- default:
- break;
- }
- }
- if (ev.data1) D_PostEvent(&ev);
+ Impl_HandleKeyboardConsoleEvent(input.Event.KeyEvent, co);
break;
case MOUSE_EVENT:
case WINDOW_BUFFER_SIZE_EVENT: