diff --git a/.travis.yml b/.travis.yml
index c6a3ce799db5690be895b5f73c71bbed698ae8a6..db44edb5d080ff3d3518575c304f8c761d5ee832 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ compiler:
cache:
directories:
- - $HOME/srb2_cache
+ - $HOME/srb2_cache
addons:
apt:
@@ -24,8 +24,8 @@ addons:
before_script:
- mkdir $HOME/srb2_cache
- - wget http://rosenthalcastle.org/srb2/SRB2-v2114-Installer.exe -c -O $HOME/srb2_cache/SRB2-v2114-Installer.exe
- - 7z x $HOME/srb2_cache/SRB2-v2114-Installer.exe -oassets
+ - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2114-assets.7z -O $HOME/srb2_cache/SRB2-v2114-assets.7z
+ - 7z x $HOME/srb2_cache/SRB2-v2114-assets.7z -oassets
- mkdir build
- cd build
- cmake ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 738e5332d7f3ac9926b46e397a122e2a66051ede..cb93d22f0d68148e3f9a60eef3bd37bccf9fdfb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,13 +23,13 @@ endfunction()
# Macro to add OSX framework
macro(add_framework fwname appname)
find_library(FRAMEWORK_${fwname}
- NAMES ${fwname}
- PATHS ${CMAKE_OSX_SYSROOT}/System/Library
- ${CMAKE_OSX_SYSROOT}/Library
- /System/Library
- /Library
- PATH_SUFFIXES Frameworks
- NO_DEFAULT_PATH)
+ NAMES ${fwname}
+ PATHS ${CMAKE_OSX_SYSROOT}/System/Library
+ ${CMAKE_OSX_SYSROOT}/Library
+ /System/Library
+ /Library
+ ATH_SUFFIXES Frameworks
+ NO_DEFAULT_PATH)
if( ${FRAMEWORK_${fwname}} STREQUAL FRAMEWORK_${fwname}-NOTFOUND)
MESSAGE(ERROR ": Framework ${fwname} not found")
else()
diff --git a/cmake/Modules/FindSDL2.cmake b/cmake/Modules/FindSDL2.cmake
index 9e789e19cc85e547bca49e7d23810421ba48dc1f..2fc833cefcd01c34e2430c2ecd2bd999ca85d82b 100644
--- a/cmake/Modules/FindSDL2.cmake
+++ b/cmake/Modules/FindSDL2.cmake
@@ -1,6 +1,6 @@
# Find SDL2
# Once done, this will define
-#
+#
# SDL2_FOUND - system has SDL2
# SDL2_INCLUDE_DIRS - SDL2 include directories
# SDL2_LIBRARIES - link libraries
diff --git a/cmake/Modules/FindSDL2_main.cmake b/cmake/Modules/FindSDL2_main.cmake
index 280e51e2e47b9555584af340b62d880422a21c3e..d4cbdeb11e199517fe53a6669e0850a6018dd11b 100644
--- a/cmake/Modules/FindSDL2_main.cmake
+++ b/cmake/Modules/FindSDL2_main.cmake
@@ -1,6 +1,6 @@
# Find SDL2
# Once done, this will define
-#
+#
# SDL2_MAIN_FOUND - system has SDL2
# SDL2_MAIN_INCLUDE_DIRS - SDL2 include directories
# SDL2_MAIN_LIBRARIES - link libraries
diff --git a/cmake/Modules/FindSDL2_mixer.cmake b/cmake/Modules/FindSDL2_mixer.cmake
index 59b4823ed8ddb4406fd8dc8036675025c43d6fff..9af3e26dd85895d2ebac39030eb3b0f2b3cfea0f 100644
--- a/cmake/Modules/FindSDL2_mixer.cmake
+++ b/cmake/Modules/FindSDL2_mixer.cmake
@@ -1,6 +1,6 @@
# Find SDL2
# Once done, this will define
-#
+#
# SDL2_MIXER_FOUND - system has SDL2
# SDL2_MIXER_INCLUDE_DIRS - SDL2 include directories
# SDL2_MIXER_LIBRARIES - link libraries
diff --git a/cmake/Modules/LibFindMacros.cmake b/cmake/Modules/LibFindMacros.cmake
index f6800aa7bd277e85ffa4297d27fbc980f0fda281..81fef7d8e7bd5e9adcfd42cc3fe6a06924b8ab38 100644
--- a/cmake/Modules/LibFindMacros.cmake
+++ b/cmake/Modules/LibFindMacros.cmake
@@ -123,7 +123,7 @@ function (libfind_process PREFIX)
set(includeopts ${${PREFIX}_PROCESS_INCLUDES})
set(libraryopts ${${PREFIX}_PROCESS_LIBS})
- # Process deps to add to
+ # Process deps to add to
foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
# The package seems to export option lists that we can use, woohoo!
@@ -146,11 +146,11 @@ function (libfind_process PREFIX)
endif()
endif()
endforeach()
-
+
if (includeopts)
list(REMOVE_DUPLICATES includeopts)
endif()
-
+
if (libraryopts)
list(REMOVE_DUPLICATES libraryopts)
endif()
@@ -215,7 +215,7 @@ function (libfind_process PREFIX)
set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
endif()
- return()
+ return()
endif()
# Format messages for debug info and the type of error
diff --git a/src/doomdef.h b/src/doomdef.h
index 558a9e115b5d14c99040d121689b74c32667312a..8935eb1179b866b1e105007feb44c3e261203442 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -210,13 +210,6 @@ extern FILE *logstream;
// Note that we use this to help keep internal testing in check; this is why v2.1.0 is not version "1".
#define MODVERSION 19
-
-
-
-
-// some tests, enable or disable it if it run or not
-#define SPLITSCREEN
-
// =========================================================================
// The maximum number of players, multiplayer/networking.
@@ -352,11 +345,7 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...) FUNCDEBUG;
#include "m_swap.h"
// Things that used to be in dstrings.h
-#define DEVMAPS "devmaps"
-#define DEVDATA "devdata"
-
#define SAVEGAMENAME "srb2sav"
-
char savegamename[256];
// m_misc.h
diff --git a/src/p_inter.c b/src/p_inter.c
index 709e0e2bef06868eb8fbdd09c4852713d1a8140e..55d36a1dee451882bb84298c9c3c2473c0d85d1d 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1339,6 +1339,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
}
else
player->pflags |= PF_ITEMHANG;
+
+ // Can't jump first frame
+ player->pflags |= PF_JUMPSTASIS;
return;
case MT_BIGMINE:
case MT_BIGAIRMINE:
diff --git a/src/p_map.c b/src/p_map.c
index 7ff913a8632431df5b37aaf9ef981ee20261625d..61d57dcd15972cc1e1a440849a98a071eac8ea33 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -503,7 +503,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // overhead
if (thing->z + thing->height < tmthing->z)
return true; // underneath
- if (tmthing->player && tmthing->flags & MF_SHOOTABLE)
+ if (tmthing->player && tmthing->flags & MF_SHOOTABLE && thing->health > 0)
P_DamageMobj(tmthing, thing, thing, 1);
return true;
}
@@ -514,7 +514,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // overhead
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
- if (thing->player && thing->flags & MF_SHOOTABLE)
+ if (thing->player && thing->flags & MF_SHOOTABLE && tmthing->health > 0)
P_DamageMobj(thing, tmthing, tmthing, 1);
return true;
}
diff --git a/src/p_user.c b/src/p_user.c
index 96841d7e070727fe0fedc833fd55550d2f9e2391..da65b7cb41fef5e0b75cf0989fa6d84d5e328ac6 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6340,8 +6340,7 @@ static void P_MovePlayer(player_t *player)
if (!(player->powers[pw_nocontrol] & (1<<15)))
player->pflags |= PF_JUMPSTASIS;
}
- else
- player->pflags &= ~PF_FULLSTASIS;
+ // note: don't unset stasis here
if (!player->spectator && G_TagGametype())
{
@@ -8928,6 +8927,11 @@ void P_PlayerThink(player_t *player)
if (!player->mo)
return; // P_MovePlayer removed player->mo.
+ // Unset statis flags after moving.
+ // In other words, if you manually set stasis via code,
+ // it lasts for one tic.
+ player->pflags &= ~PF_FULLSTASIS;
+
#ifdef POLYOBJECTS
if (player->onconveyor == 1)
player->cmomy = player->cmomx = 0;
diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt
index eb832797e482c0450dcea44c1929fa0bb763a90d..b3d734521bed110b4d3c107fd2e52db252ee4523 100644
--- a/src/sdl/CMakeLists.txt
+++ b/src/sdl/CMakeLists.txt
@@ -57,7 +57,7 @@ if(${SDL2_FOUND})
${SRB2_SDL2_SOURCES}
${SRB2_SDL2_HEADERS}
)
-
+
source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS})
source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index db873765b3a15e9943b88a2133272313bfbecd0a..2e9ebbeded27ca33c771023e6cf25512309c5fbd 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -45,9 +45,6 @@ typedef DWORD (WINAPI *p_timeGetTime) (void);
typedef UINT (WINAPI *p_timeEndPeriod) (UINT);
typedef HANDLE (WINAPI *p_OpenFileMappingA) (DWORD, BOOL, LPCSTR);
typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
-typedef HANDLE (WINAPI *p_GetCurrentProcess) (VOID);
-typedef BOOL (WINAPI *p_GetProcessAffinityMask) (HANDLE, PDWORD_PTR, PDWORD_PTR);
-typedef BOOL (WINAPI *p_SetProcessAffinityMask) (HANDLE, DWORD_PTR);
#endif
#endif
#include <stdio.h>
@@ -2779,7 +2776,6 @@ static const char *locateWad(void)
{
return returnWadPath;
}
-
#endif
// examine default dirs
@@ -3070,52 +3066,6 @@ const CPUInfoFlags *I_CPUInfo(void)
#endif
}
-#if (defined (_WIN32) && !defined (_WIN32_WCE)) && !defined (_XBOX)
-static void CPUAffinity_OnChange(void);
-static consvar_t cv_cpuaffinity = {"cpuaffinity", "-1", CV_SAVE | CV_CALL, NULL, CPUAffinity_OnChange, 0, NULL, NULL, 0, 0, NULL};
-
-static p_GetCurrentProcess pfnGetCurrentProcess = NULL;
-static p_GetProcessAffinityMask pfnGetProcessAffinityMask = NULL;
-static p_SetProcessAffinityMask pfnSetProcessAffinityMask = NULL;
-
-static inline VOID GetAffinityFuncs(VOID)
-{
- HMODULE h = GetModuleHandleA("kernel32.dll");
- pfnGetCurrentProcess = (p_GetCurrentProcess)GetProcAddress(h, "GetCurrentProcess");
- pfnGetProcessAffinityMask = (p_GetProcessAffinityMask)GetProcAddress(h, "GetProcessAffinityMask");
- pfnSetProcessAffinityMask = (p_SetProcessAffinityMask)GetProcAddress(h, "SetProcessAffinityMask");
-}
-
-static void CPUAffinity_OnChange(void)
-{
- DWORD_PTR dwProcMask, dwSysMask;
- HANDLE selfpid;
-
- if (!pfnGetCurrentProcess || !pfnGetProcessAffinityMask || !pfnSetProcessAffinityMask)
- return;
- else
- selfpid = pfnGetCurrentProcess();
-
- pfnGetProcessAffinityMask(selfpid, &dwProcMask, &dwSysMask);
-
- /* If resulting mask is zero, don't change anything and fall back to
- * actual mask.
- */
- if(dwSysMask & cv_cpuaffinity.value)
- {
- pfnSetProcessAffinityMask(selfpid, dwSysMask & cv_cpuaffinity.value);
- CV_StealthSetValue(&cv_cpuaffinity, (INT32)(dwSysMask & cv_cpuaffinity.value));
- }
- else
- CV_StealthSetValue(&cv_cpuaffinity, (INT32)dwProcMask);
-}
-#endif
-
-void I_RegisterSysCommands(void)
-{
-#if (defined (_WIN32) && !defined (_WIN32_WCE)) && !defined (_XBOX)
- GetAffinityFuncs();
- CV_RegisterVar(&cv_cpuaffinity);
-#endif
-}
+// note CPUAFFINITY code used to reside here
+void I_RegisterSysCommands(void) {}
#endif
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index dbb97f093eab06d11418e7d63ecf29216e22a354..963310a261546984379b7fe105e761fb8c7d351a 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1701,21 +1701,11 @@ void I_StartupGraphics(void)
keyboard_started = true;
#if !defined(HAVE_TTF)
-#ifdef _WIN32 // Initialize Audio as well, otherwise Win32's DirectX can not use audio
- if (SDL_InitSubSystem(SDL_INIT_AUDIO|SDL_INIT_VIDEO) < 0)
-#else //SDL_OpenAudio will do SDL_InitSubSystem(SDL_INIT_AUDIO)
+ // Previously audio was init here for questionable reasons?
if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
-#endif
{
-#ifdef _WIN32
- if (SDL_WasInit(SDL_INIT_AUDIO)==0)
- CONS_Printf(M_GetText("Couldn't initialize SDL's Audio System with Video System: %s\n"), SDL_GetError());
- if (SDL_WasInit(SDL_INIT_VIDEO)==0)
-#endif
- {
- CONS_Printf(M_GetText("Couldn't initialize SDL's Video System: %s\n"), SDL_GetError());
- return;
- }
+ CONS_Printf(M_GetText("Couldn't initialize SDL's Video System: %s\n"), SDL_GetError());
+ return;
}
#endif
{
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 71969209c3e367fc471c21608afaaa1410d997a5..50e5013946e9f59b2ab407163b3a8c16598bb718 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -77,7 +77,16 @@ static INT32 current_track;
void I_StartupSound(void)
{
I_Assert(!sound_started);
- sound_started = true;
+
+ // EE inits audio first so we're following along.
+ if (SDL_WasInit(SDL_INIT_AUDIO) == SDL_INIT_AUDIO)
+ CONS_Printf("SDL Audio already started\n");
+ else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
+ {
+ CONS_Alert(CONS_ERROR, "Error initializing SDL Audio: %s\n", SDL_GetError());
+ // call to start audio failed -- we do not have it
+ return;
+ }
midimode = false;
music = NULL;
@@ -86,19 +95,31 @@ void I_StartupSound(void)
#if SDL_MIXER_VERSION_ATLEAST(1,2,11)
Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG);
#endif
- Mix_OpenAudio(44100, AUDIO_S16LSB, 2, 2048);
+
+ if (Mix_OpenAudio(44100, AUDIO_S16SYS, 2, 2048) < 0)
+ {
+ CONS_Alert(CONS_ERROR, "Error starting SDL_Mixer: %s\n", Mix_GetError());
+ // call to start audio failed -- we do not have it
+ return;
+ }
+
+ sound_started = true;
Mix_AllocateChannels(256);
}
void I_ShutdownSound(void)
{
- I_Assert(sound_started);
+ if (!sound_started)
+ return; // not an error condition
sound_started = false;
Mix_CloseAudio();
#if SDL_MIXER_VERSION_ATLEAST(1,2,11)
Mix_Quit();
#endif
+
+ SDL_QuitSubSystem(SDL_INIT_AUDIO);
+
#ifdef HAVE_LIBGME
if (gme)
gme_delete(gme);
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 5d6c007b5696beca42b92e01ec2fa73531a8244c..0face92e25c03749c6e1ca5a0c7a431cadf63e3d 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -1213,6 +1213,16 @@ void I_StartupSound(void)
// Configure sound device
CONS_Printf("I_StartupSound:\n");
+ // EE inits audio first so we're following along.
+ if (SDL_WasInit(SDL_INIT_AUDIO) == SDL_INIT_AUDIO)
+ CONS_Printf("SDL Audio already started\n");
+ else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
+ {
+ CONS_Alert(CONS_ERROR, "Error initializing SDL Audio: %s\n", SDL_GetError());
+ // call to start audio failed -- we do not have it
+ return;
+ }
+
// Open the audio device
if (M_CheckParm ("-freq") && M_IsNextParm())
{
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index efb0be463128feb1005f98a4d275c8e18b8b8d58..2babb57b962cab2f6666a4374a0979230fb09892 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -3656,7 +3656,7 @@ const CPUInfoFlags *I_CPUInfo(void)
}
static void CPUAffinity_OnChange(void);
-static consvar_t cv_cpuaffinity = {"cpuaffinity", "1", CV_SAVE | CV_CALL, NULL, CPUAffinity_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_cpuaffinity = {"cpuaffinity", "-1", CV_CALL, NULL, CPUAffinity_OnChange, 0, NULL, NULL, 0, 0, NULL};
typedef HANDLE (WINAPI *p_GetCurrentProcess) (VOID);
static p_GetCurrentProcess pfnGetCurrentProcess = NULL;