Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-02 15:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Call Director.Unpause() to execute running scripts

Browse source
This commit is contained in:
smallmodel 2023-08-12 03:03:48 +02:00
parent ec3259271e
commit 77a9cd5a9a
No known key found for this signature in database
GPG key ID: A96F163ED4891440
5 changed files with 9 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
code/fgame/actor.cpp
View file

@ -4512,12 +4512,8 @@ void Actor::UpdateAnim
Com_Printf("ChangeAnim\n"); Com_Printf("ChangeAnim\n");
ChangeAnim(); ChangeAnim();
} }
Director.iPaused--; Director.Unpause();
if (!Director.iPaused) Director.Pause();
{
Director.ExecuteRunning();
}
Director.iPaused++;
if (m_csSayAnim != STRING_EMPTY) if (m_csSayAnim != STRING_EMPTY)
{ {
@ -5534,9 +5530,7 @@ void Actor::Think
m_bNeedReload = false; m_bNeedReload = false;
mbBreakSpecialAttack = false; mbBreakSpecialAttack = false;
Director.iPaused--; Director.Unpause();
if (!Director.iPaused)
Director.ExecuteRunning();
//gi.DPrintf("Actor::Think 5: entnum %d, classname: %s\n", entnum, G_GetEntity(0) ? G_GetEntity(0)->getClassname() : ""); //gi.DPrintf("Actor::Think 5: entnum %d, classname: %s\n", entnum, G_GetEntity(0) ? G_GetEntity(0)->getClassname() : "");
} }
@ -8234,13 +8228,9 @@ void Actor::IdleTurn
SafePtr<SimpleEntity> prevTurnEntity = m_pTurnEntity; SafePtr<SimpleEntity> prevTurnEntity = m_pTurnEntity;
Director.iPaused--; Director.Unpause();
if (!Director.iPaused)
{
Director.ExecuteRunning();
}
Unregister(STRING_TURNDONE); Unregister(STRING_TURNDONE);
Director.iPaused++; Director.Pause();
if (m_pTurnEntity == prevTurnEntity) if (m_pTurnEntity == prevTurnEntity)

8
code/fgame/g_main.cpp
View file

@ -545,14 +545,8 @@ void G_RunFrame( int levelTime, int frameTime )
} }
} }
Director.iPaused--;
g_iInThinks++; g_iInThinks++;
Director.Unpause();
if( !Director.iPaused )
{
Director.ExecuteRunning();
}
g_iInThinks--; g_iInThinks--;
// Process any pending events that got posted during the script code // Process any pending events that got posted during the script code

4
code/fgame/level.cpp
View file

@ -1218,9 +1218,7 @@ void Level::ServerSpawned(void)
ent->entity->Unregister(STRING_SPAWN); ent->entity->Unregister(STRING_SPAWN);
} }
if (Director.iPaused-- == 1) { Director.Unpause();
Director.ExecuteRunning();
}
Unregister(STRING_SPAWN); Unregister(STRING_SPAWN);
} }

2
code/fgame/scriptmaster.cpp
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2023 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.

2
code/fgame/scriptmaster.h
View file

@ -1,6 +1,6 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 2015 the OpenMoHAA team Copyright (C) 2023 the OpenMoHAA team
This file is part of OpenMoHAA source code. This file is part of OpenMoHAA source code.