Skip to content

Commit 7a22efe

Browse files
committed
fix e3d88b1 conservatively
1 parent 8f81eee commit 7a22efe

File tree

3 files changed

+2
-46
lines changed

3 files changed

+2
-46
lines changed

src/Misc/Hooks.Gamespeed.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DEFINE_HOOK(0x55E160, SyncDelay_Start, 0x6)
1919
{
2020
constexpr reference<SysTimerClass, 0x887348> FrameTimer;
2121
//constexpr reference<SysTimerClass, 0x887328> NFTTimer;
22-
if (!Phobos::Misc::CustomGS)
22+
if (!Phobos::Misc::CustomGS || SessionClass::IsMultiplayer())
2323
return 0;
2424
if ((Phobos::Misc::CustomGS_ChangeInterval[FrameTimer->TimeLeft] > 0)
2525
&& (GameSpeedTemp::counter % Phobos::Misc::CustomGS_ChangeInterval[FrameTimer->TimeLeft] == 0))
@@ -39,7 +39,7 @@ DEFINE_HOOK(0x55E160, SyncDelay_Start, 0x6)
3939
DEFINE_HOOK(0x55E33B, SyncDelay_End, 0x6)
4040
{
4141
constexpr reference<SysTimerClass, 0x887348> FrameTimer;
42-
if (Phobos::Misc::CustomGS)
42+
if (Phobos::Misc::CustomGS && SessionClass::IsSingleplayer())
4343
FrameTimer->TimeLeft = GameOptionsClass::Instance->GameSpeed;
4444
return 0;
4545
}

src/Misc/PlaceHolders.cpp

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/Phobos.cpp

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -200,36 +200,6 @@ DEFINE_HOOK(0x67E68A, LoadGame_UnsetFlag, 0x5)
200200
return 0;
201201
}
202202

203-
DEFINE_HOOK(0x48CE6D, MainGame_AfterSpawnerStartGame, 0x6)
204-
{
205-
// Please make sure that Ares or Spawner didn't hook or skip anything in these places
206-
207-
if (SessionClass::IsMultiplayer())
208-
{
209-
// Phobos hooks:
210-
211-
// Commands/FrameByFrame.cpp
212-
Patch::Apply_RAW(0x55D871, // Revert MainLoop_FrameStep_End
213-
{ 0x81, 0xC4, 0xB4, 0x01, 0x00, 0x00 });
214-
Patch::Apply_RAW(0x55DEC1, // Revert MainLoop_FrameStep_End
215-
{ 0x81, 0xC4, 0xB4, 0x01, 0x00, 0x00 });
216-
Patch::Apply_RAW(0x55DED5, // Revert MainLoop_FrameStep_End
217-
{ 0x81, 0xC4, 0xB4, 0x01, 0x00, 0x00 });
218-
219-
Patch::Apply_RAW(0x55D360, // Revert MainLoop_FrameStep_Begin
220-
{ 0xA0,0xA0,0xE9,0xA8,0x00 });
221-
222-
// Misc/Hooks.Gamespeed.cpp
223-
Patch::Apply_RAW(0x55E160, // Revert SyncDelay_Start
224-
{ 0x8B, 0x0D, 0x48, 0x73, 0x88, 0x00 });
225-
Patch::Apply_RAW(0x55E33B, // Revert SyncDelay_End
226-
{ 0xA0,0x94,0xCD,0xAB,0x00 });
227-
228-
}
229-
230-
return 0;
231-
}
232-
233203
#ifndef IS_RELEASE_VER
234204
DEFINE_HOOK(0x4F4583, GScreenClass_DrawText, 0x6)
235205
{

0 commit comments

Comments
 (0)