Skip to content

Harkov replay fix #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 26, 2025
Merged

Harkov replay fix #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d558dfe
fix replay counter
Karjala22 Mar 25, 2025
7737038
adding back counter
Karjala22 Mar 25, 2025
a7ccd2c
Fix alt mods
Karjala22 Mar 26, 2025
6dede95
Preserve recording if always set to true and disable fullbright cheat…
Karjala22 Mar 26, 2025
2c8d80f
Replace recording with a longer one with ARC that will test more feat…
Karjala22 Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions TheForceEngine/TFE_Input/inputMapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,10 @@ namespace TFE_Input
InputBinding* binding = inputMapping_getBindingByIndex(indices[0]);
if (TFE_Input::keyPressed(binding->keyCode))
{
if (binding->keyMod && !TFE_Input::keyModDown(binding->keyMod, true))
{
return false;
}
return true;
}
}
Expand Down
24 changes: 17 additions & 7 deletions TheForceEngine/TFE_Input/replay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
#include <TFE_DarkForces/GameUI/agentMenu.h>
#include <TFE_DarkForces/GameUI/pda.h>
#include <TFE_DarkForces/mission.h>
#include <TFE_DarkForces/time.h>
#include <TFE_FileSystem/fileutil.h>
#include <TFE_FileSystem/filestream.h>
#include <TFE_FrontEndUI/frontEndUi.h>
#include <TFE_FrontEndUI/modLoader.h>
#include <TFE_Game/saveSystem.h>
#include <TFE_Input/inputMapping.h>
#include <TFE_Jedi/Renderer/rcommon.h>
#include <TFE_Jedi/Serialization/serialization.h>
#include <TFE_System/frameLimiter.h>
#include <TFE_System/system.h>
Expand Down Expand Up @@ -60,6 +62,7 @@ namespace TFE_Input
bool cutscenesEnabled = true;
bool pauseReplay = false;
bool showReplayMsgFrame = false;
bool alwaysRecord = false;

extern f64 gameFrameLimit = 0;
extern f64 replayFrameLimit = 0;
Expand Down Expand Up @@ -578,12 +581,12 @@ namespace TFE_Input
SERIALIZE(ReplayVersionInit, gameSettings->df_solidWallFlagFix, 0);
SERIALIZE(ReplayVersionInit, gameSettings->df_jsonAiLogics, 0);
SERIALIZE(ReplayVersionInit, gameSettings->df_bobaFettFacePlayer, 0);
SERIALIZE(ReplayVersionInit, gameSettings->df_recordFrameRate, 0);
SERIALIZE(ReplayVersionInit, gameSettings->df_recordFrameRate, 0);
int pitchLimit = gameSettings->df_pitchLimit;
SERIALIZE(ReplayVersionInit, pitchLimit, 0);

SERIALIZE(ReplayVersionInit, allySettings->enableHeadwave, 0);

SERIALIZE(ReplayVersionInit, inputConfig->mouseFlags, 0);
SERIALIZE(ReplayVersionInit, mouseMode, 0);
SERIALIZE(ReplayVersionInit, inputConfig->mouseSensitivity[0], 0);
Expand Down Expand Up @@ -686,6 +689,7 @@ namespace TFE_Input
TFE_DarkForces::s_oneHitKillEnabled = JFALSE;
TFE_DarkForces::s_instaDeathEnabled = JFALSE;
TFE_DarkForces::s_limitStepHeight = JTRUE;
TFE_Jedi::s_fullBright = JFALSE;
}

void setStartHudMessage(bool notify)
Expand Down Expand Up @@ -887,8 +891,8 @@ namespace TFE_Input
angle14_16 yaw = s_playerEye->yaw;
angle14_16 pitch = s_playerEye->pitch;

string logMsg = "Update %d: X:%04d Y:%04d Z:%04d, yaw: %d, pitch: %d, keysDown: %s, keysPressed: %s, mouse: %s";
TFE_System::logWrite(LOG_MSG, "Replay", logMsg.c_str(), counter, xPos, yPos, zPos, yaw, pitch,
string logMsg = "Update %d: Tick = %d X:%04d Y:%04d Z:%04d, yaw: %d, pitch: %d, keysDown: %s, keysPressed: %s, mouse: %s";
TFE_System::logWrite(LOG_MSG, "Replay", logMsg.c_str(), counter, s_curTick, xPos, yPos, zPos, yaw, pitch,
keys.c_str(), keysPressed.c_str(), mouse.c_str());
}
}
Expand Down Expand Up @@ -975,6 +979,10 @@ namespace TFE_Input
return;
}

// Always set this to false as we are loading a replay from path
alwaysRecord = TFE_Settings::getGameSettings()->df_enableRecordingAll;
TFE_Settings::getGameSettings()->df_enableRecordingAll = false;

TFE_SaveSystem::SaveHeader header;
loadReplayHeader(replayPath, &header);

Expand Down Expand Up @@ -1053,7 +1061,7 @@ namespace TFE_Input

// Start replaying with the first event
inputMapping_setReplayCounter(1);

serializeDemo(&s_replayFile, false);

// Setup frame rate for replay playback
Expand Down Expand Up @@ -1082,12 +1090,12 @@ namespace TFE_Input
else
{
char logPath[256];
replayLogCounter++;
sprintf(logPath, "replay_%d.log", replayLogCounter);
TFE_System::logOpen(logPath);
}
replayLogCounter++;
TFE_System::logTimeToggle();
}
}
}

void restoreAgent()
Expand Down Expand Up @@ -1133,6 +1141,8 @@ namespace TFE_Input

if (TFE_Settings::getTempSettings()->exit_after_replay)
{
// Reset the recording settings
TFE_Settings::getGameSettings()->df_enableRecordingAll = alwaysRecord;
TFE_FrontEndUI::setState(APP_STATE_QUIT);
}
else
Expand Down
Loading