zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

This commit is contained in:
Magnus Norddahl 2017-05-14 08:55:39 +02:00
parent 31125486ad fa36b1195f
commit 788b9f6d54
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -12,7 +12,7 @@ git:
matrix: matrix:
include: include:
- os: osx - os: osx
osx_image: xcode8.2 osx_image: xcode8.3
env: env:
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7" - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7"

2
src/CMakeLists.txt
View File

@ -1253,7 +1253,7 @@ if( MSVC )
create_default_target_launcher( zdoom WORKING_DIRECTORY ${ZDOOM_OUTPUT_DIR} ) create_default_target_launcher( zdoom WORKING_DIRECTORY ${ZDOOM_OUTPUT_DIR} )
endif() endif()
if( NOT WIN32 ) if( NOT WIN32 AND NOT APPLE )
FILE( WRITE ${CMAKE_CURRENT_BINARY_DIR}/link-make "if [ ! -e ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME} ]; then ln -sf ${CMAKE_CURRENT_BINARY_DIR}/${ZDOOM_EXE_NAME} ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME}; fi" ) FILE( WRITE ${CMAKE_CURRENT_BINARY_DIR}/link-make "if [ ! -e ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME} ]; then ln -sf ${CMAKE_CURRENT_BINARY_DIR}/${ZDOOM_EXE_NAME} ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME}; fi" )
add_custom_command( TARGET zdoom POST_BUILD add_custom_command( TARGET zdoom POST_BUILD
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/link-make COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/link-make

13
src/portal.cpp
View File

@ -1027,8 +1027,17 @@ void P_CreateLinkedPortals()
{ {
if (linePortals[i].mType == PORTT_LINKED) if (linePortals[i].mType == PORTT_LINKED)
{ {
if (CollectSectors(id, linePortals[i].mOrigin->frontsector)) id++; if (linePortals[i].mDestination == nullptr)
if (CollectSectors(id, linePortals[i].mDestination->frontsector)) id++; {
Printf("Linked portal on line %d is unconnected and will be disabled\n", linePortals[i].mOrigin->Index());
linePortals[i].mOrigin->portalindex = UINT_MAX;
linePortals[i].mType = PORTT_VISUAL;
}
else
{
if (CollectSectors(id, linePortals[i].mOrigin->frontsector)) id++;
if (CollectSectors(id, linePortals[i].mDestination->frontsector)) id++;
}
} }
} }

15
src/sound/mididevices/music_fluidsynth_mididevice.cpp
View File

@ -526,14 +526,21 @@ int FluidSynthMIDIDevice::LoadPatchSets(const char *patches)
{ {
path = NicePath(tok); path = NicePath(tok);
} }
if (FLUID_FAILED != fluid_synth_sfload(FluidSynth, path, count == 0)) if (FileExists(path))
{ {
DPrintf(DMSG_NOTIFY, "Loaded patch set %s.\n", tok); if (FLUID_FAILED != fluid_synth_sfload(FluidSynth, path, count == 0))
count++; {
DPrintf(DMSG_NOTIFY, "Loaded patch set %s.\n", tok);
count++;
}
else
{
DPrintf(DMSG_ERROR, "Failed to load patch set %s.\n", tok);
}
} }
else else
{ {
DPrintf(DMSG_ERROR, "Failed to load patch set %s.\n", tok); DPrintf(DMSG_ERROR, "Could not find patch set %s.\n", tok);
} }
tok = strtok(NULL, delim); tok = strtok(NULL, delim);
} }

2
tools/updaterevision/updaterevision.c
View File

@ -51,7 +51,7 @@ int main(int argc, char **argv)
// on a tag, it returns that tag. Otherwise it returns <most recent tag>-<number of // on a tag, it returns that tag. Otherwise it returns <most recent tag>-<number of
// commits since the tag>-<short hash>. // commits since the tag>-<short hash>.
// Use git log to get the time of the latest commit in ISO 8601 format and its full hash. // Use git log to get the time of the latest commit in ISO 8601 format and its full hash.
stream = popen("git describe --tags && git log -1 --format=%ai*%H", "r"); stream = popen("git describe --tags --dirty=-m && git log -1 --format=%ai*%H", "r");
if (NULL != stream) if (NULL != stream)
{ {