Changeset - r28791:1f0e3e5e39e0
[Not reviewed]
master
0 2 0
Loïc Guilloux - 2 months ago 2024-02-20 16:08:26
glx22@users.noreply.github.com
Fix: [Script] Only show debug script window at the end of savegame loading (#12135)
2 files changed with 6 insertions and 0 deletions:
0 comments (0 inline, 0 general)
src/ai/ai_instance.cpp
Show inline comments
 
@@ -61,12 +61,15 @@ void AIInstance::Died()
 
{
 
	ScriptInstance::Died();
 

	
 
	/* Intro is not supposed to use AI, but it may have 'dummy' AI which instant dies. */
 
	if (_game_mode == GM_MENU) return;
 

	
 
	/* Don't show errors while loading savegame. They will be shown at end of loading anyway. */
 
	if (_switch_mode != SM_NONE) return;
 

	
 
	ShowScriptDebugWindow(_current_company);
 

	
 
	const AIInfo *info = AIConfig::GetConfig(_current_company)->GetInfo();
 
	if (info != nullptr) {
 
		ShowErrorMessage(STR_ERROR_AI_PLEASE_REPORT_CRASH, INVALID_STRING_ID, WL_WARNING);
 

	
src/game/game_instance.cpp
Show inline comments
 
@@ -64,12 +64,15 @@ ScriptInfo *GameInstance::FindLibrary(co
 
}
 

	
 
void GameInstance::Died()
 
{
 
	ScriptInstance::Died();
 

	
 
	/* Don't show errors while loading savegame. They will be shown at end of loading anyway. */
 
	if (_switch_mode != SM_NONE) return;
 

	
 
	ShowScriptDebugWindow(OWNER_DEITY);
 

	
 
	const GameInfo *info = Game::GetInfo();
 
	if (info != nullptr) {
 
		ShowErrorMessage(STR_ERROR_AI_PLEASE_REPORT_CRASH, INVALID_STRING_ID, WL_WARNING);
 

	
0 comments (0 inline, 0 general)