zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-12 23:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Ensure crouch_toggle bool from 6e3d414b3c is serialised when saving game, and cleared when InputState::ClearAllInput() is called.

Browse source
This commit is contained in:
Mitchell Richters 2020-11-08 07:30:48 +11:00
parent 59c72c923e
commit f9f365a593
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/core/gamecontrol.h
View file

@ -21,6 +21,7 @@ extern bool GUICapture;
extern bool AppActive; extern bool AppActive;
extern cycle_t drawtime, actortime, thinktime, gameupdatetime; extern cycle_t drawtime, actortime, thinktime, gameupdatetime;
extern bool r_NoInterpolate; extern bool r_NoInterpolate;
extern bool crouch_toggle;
struct MapRecord; struct MapRecord;
extern MapRecord* g_nextmap; extern MapRecord* g_nextmap;

5
source/core/inputstate.cpp
View file

@ -46,7 +46,7 @@ static int WeaponToSend = 0;
ESyncBits ActionsToSend = 0; ESyncBits ActionsToSend = 0;
static int dpad_lock = 0; static int dpad_lock = 0;
bool sendPause; bool sendPause;
bool crouch_toggle;
static double lastCheck; static double lastCheck;
CVAR(Float, m_pitch, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE) // Mouse speeds CVAR(Float, m_pitch, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE) // Mouse speeds
@ -120,6 +120,7 @@ void InputState::ClearAllInput()
WeaponToSend = 0; WeaponToSend = 0;
dpad_lock = 0; dpad_lock = 0;
lastCheck = 0; lastCheck = 0;
crouch_toggle = false;
buttonMap.ResetButtonStates(); // this is important. If all input is cleared, the buttons must be cleared as well. buttonMap.ResetButtonStates(); // this is important. If all input is cleared, the buttons must be cleared as well.
gi->clearlocalinputstate(); // also clear game local input state. gi->clearlocalinputstate(); // also clear game local input state.
} }
@ -327,8 +328,6 @@ CCMD(pause)
} }
static bool crouch_toggle;
void ApplyGlobalInput(InputPacket& input, ControlInfo* hidInput, bool const crouchable, bool const disableToggle) void ApplyGlobalInput(InputPacket& input, ControlInfo* hidInput, bool const crouchable, bool const disableToggle)
{ {
if (WeaponToSend != 0) input.setNewWeapon(WeaponToSend); if (WeaponToSend != 0) input.setNewWeapon(WeaponToSend);

16
source/core/savegamehelp.cpp
View file

@ -75,6 +75,21 @@ CVAR(String, cl_savedir, "", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
// //
//============================================================================= //=============================================================================
static void SerializeGlobals(FSerializer& arc)
{
if (arc.BeginObject("globals"))
{
arc("crouch_toggle", crouch_toggle)
.EndObject();
}
}
//=============================================================================
//
//
//
//=============================================================================
static void SerializeSession(FSerializer& arc) static void SerializeSession(FSerializer& arc)
{ {
SerializeMap(arc); SerializeMap(arc);
@ -85,6 +100,7 @@ static void SerializeSession(FSerializer& arc)
S_SerializeSounds(arc); S_SerializeSounds(arc);
SerializeAutomap(arc); SerializeAutomap(arc);
SerializeHud(arc); SerializeHud(arc);
SerializeGlobals(arc);
} }
//============================================================================= //=============================================================================