zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-02 00:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into whaven

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-10 20:15:19 +02:00
commit 33a8355d11
9 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -188,9 +188,10 @@ target_architecture(TARGET_ARCHITECTURE)
if( ${TARGET_ARCHITECTURE} MATCHES "x86_64" ) if( ${TARGET_ARCHITECTURE} MATCHES "x86_64" )
set( HAVE_VM_JIT ON ) set( HAVE_VM_JIT ON )
option (HAVE_VULKAN "Enable Vulkan support" ON)
endif() endif()
option (HAVE_VULKAN "Enable Vulkan support" ON)
# no, we're not using external asmjit for now, we made too many modifications to our's. # no, we're not using external asmjit for now, we made too many modifications to our's.
# if the asmjit author uses our changes then we'll update this. # if the asmjit author uses our changes then we'll update this.

2
source/build/include/compat.h
View file

@ -52,7 +52,7 @@
////////// Platform headers ////////// ////////// Platform headers //////////
#if !defined __APPLE__ && (!defined EDUKE32_BSD || !__STDC__) #if !defined __APPLE__ && (!defined EDUKE32_BSD || !__STDC__) && !defined __OpenBSD__ && !defined __DragonFly__
# include <malloc.h> # include <malloc.h>
#endif #endif

1
source/common/engine/printf.h
View file

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <stdarg.h>
#if defined __GNUC__ || defined __clang__ #if defined __GNUC__ || defined __clang__
# define ATTRIBUTE(attrlist) __attribute__(attrlist) # define ATTRIBUTE(attrlist) __attribute__(attrlist)

4
source/core/savegamehelp.cpp
View file

@ -133,6 +133,7 @@ bool ReadSavegame(const char* name)
delete savereader; delete savereader;
return false; return false;
} }
file.Close();
FResourceLump* info = savereader->FindLump("session.json"); FResourceLump* info = savereader->FindLump("session.json");
if (info == nullptr) if (info == nullptr)
@ -149,11 +150,12 @@ bool ReadSavegame(const char* name)
delete savereader; delete savereader;
return false; return false;
} }
info->Unlock();
// Load the savegame. // Load the savegame.
loadMapBackup(currentLevel->fileName); loadMapBackup(currentLevel->fileName);
SerializeSession(arc); SerializeSession(arc);
arc.Close();
info->Unlock();
delete savereader; delete savereader;
return true; return true;
} }

4
source/games/duke/src/gamedef.cpp
View file

@ -2795,10 +2795,10 @@ int ConCompiler::parsecommand()
setscriptvalue(tempscrptr, scriptpos()); // save 'end' location setscriptvalue(tempscrptr, scriptpos()); // save 'end' location
} }
casescriptptr = NULL; casescriptptr = 0;
// decremented in endswitch. Don't decrement here... // decremented in endswitch. Don't decrement here...
// checking_switch--; // allow nesting (maybe if other things work) // checking_switch--; // allow nesting (maybe if other things work)
tempscrptr = NULL; tempscrptr = 0;
break; break;

2
source/games/duke/src/gamevar.cpp
View file

@ -431,7 +431,7 @@ void ClearGameEvents()
int i; int i;
for (i=0;i<MAXGAMEEVENTS;i++) for (i=0;i<MAXGAMEEVENTS;i++)
{ {
apScriptGameEvent[i]=NULL; apScriptGameEvent[i]=(intptr_t)0;
} }
} }

2
source/games/sw/src/inv.cpp
View file

@ -79,7 +79,7 @@ INVENTORY_DATA InventoryData[MAX_INVENTORY+1] =
{"GAS BOMB", UseInventoryChemBomb, NULL, 0, 1, (FRACUNIT), INVF_COUNT}, {"GAS BOMB", UseInventoryChemBomb, NULL, 0, 1, (FRACUNIT), INVF_COUNT},
{"FLASH BOMB", UseInventoryFlashBomb, NULL, 0, 2, (FRACUNIT), INVF_COUNT}, {"FLASH BOMB", UseInventoryFlashBomb, NULL, 0, 2, (FRACUNIT), INVF_COUNT},
{"CALTROPS", UseInventoryCaltrops, NULL, 0, 3, (FRACUNIT), INVF_COUNT}, {"CALTROPS", UseInventoryCaltrops, NULL, 0, 3, (FRACUNIT), INVF_COUNT},
{NULL, NULL, NULL, NULL, 0, 0, 0} {NULL, NULL, NULL, 0, 0, 0, 0}
}; };
void PanelInvTestSuicide(PANEL_SPRITEp psp) void PanelInvTestSuicide(PANEL_SPRITEp psp)

2
wadsrc/static/engine/compatibility/2bac4971499306ee6c86462e6a03dae8.mhk
View file

@ -1,2 +1,4 @@
// bad sky setting in WT's $volcano.map (original version) // bad sky setting in WT's $volcano.map (original version)
sector 118 clearflags ceiling 1 sector 118 clearflags ceiling 1
sector 57 clearflags ceiling 1
sector 281 clearflags ceiling 1

2
wadsrc/static/engine/compatibility/67207fb90130ad561479301c0970c7ba.mhk
View file

@ -1,2 +1,4 @@
// bad sky setting in WT's $volcano.map (fixed version) // bad sky setting in WT's $volcano.map (fixed version)
sector 118 clearflags ceiling 1 sector 118 clearflags ceiling 1
sector 57 clearflags ceiling 1
sector 281 clearflags ceiling 1