Commit e08d1a9a authored by Richard Gobeille's avatar Richard Gobeille
Browse files

Fury: fix screen return-to-center when triggering save checkpoints, hopefully...

Fury: fix screen return-to-center when triggering save checkpoints, hopefully for good this time. :p
parent 01f10a60
......@@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "minicoro.h"
#include "mmulti.h"
#include "network.h"
#include "savegame.h"
#ifdef __cplusplus
extern "C" {
......@@ -139,8 +140,6 @@ static inline int32_t G_GetLogoFlags(void)
#define MAXRIDECULE 10
#define MAXRIDECULELENGTH 40
#define MAXSAVEGAMENAMESTRUCT 32
#define MAXSAVEGAMENAME (MAXSAVEGAMENAMESTRUCT-1)
#define MAXPWLOCKOUT 128
#define MAXRTSNAME 128
......@@ -324,7 +323,7 @@ static FORCE_INLINE int dukeMaybeDrawFrame(void)
// g_frameJustDrawn is set by G_DrawFrame() (and thus by the coroutine)
// it isn't cleared until the next game tic is processed.
if (!g_frameJustDrawn && timerGetNanoTicks() >= g_lastFrameEndTime + (g_lastFrameEndTime - g_lastFrameStartTime - g_lastFrameDuration) && engineFPSLimit())
if (!g_saveRequested && !g_frameJustDrawn && timerGetNanoTicks() >= g_lastFrameEndTime + (g_lastFrameEndTime - g_lastFrameStartTime - g_lastFrameDuration) && engineFPSLimit())
{
g_switchRoutine(co_drawframe);
return 1;
......
......@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "duke3d.h"
#include "demo.h"
#include "enet.h"
#include "savegame.h"
#ifdef __ANDROID__
#include "android.h"
......@@ -3146,7 +3147,7 @@ void P_GetInput(int const playerNum)
auto const pPlayer = thisPlayer.ps;
ControlInfo info;
if (g_cheatBufLen > 1 || (pPlayer->gm & (MODE_MENU|MODE_TYPE)) || (ud.pause_on && !KB_KeyPressed(sc_Pause)))
if (g_cheatBufLen > 1 || (pPlayer->gm & (MODE_MENU|MODE_TYPE)) || (ud.pause_on && !KB_KeyPressed(sc_Pause)) || g_saveRequested)
{
if (!(pPlayer->gm&MODE_MENU))
CONTROL_GetInput(&info);
......
......@@ -33,7 +33,10 @@ extern "C" {
#define SV_MAJOR_VER 1
#define SV_MINOR_VER 7
#define MAXSAVEGAMENAMESTRUCT 32
#define MAXSAVEGAMENAME (MAXSAVEGAMENAMESTRUCT-1)
#pragma pack(push,1)
typedef struct _savehead
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment