Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release.yml # CMakeLists.txt # os/macosx/Info.plist.in # src/fileio.cpp # src/landscape.cpp # src/league_cmd.h # src/saveload/ai_sl.cpp # src/saveload/game_sl.cpp # src/saveload/league_sl.cpp # src/saveload/saveload.cpp
This commit is contained in:
@@ -60,6 +60,9 @@ 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;
|
||||
|
||||
ShowAIDebugWindow(_current_company);
|
||||
|
||||
const AIInfo *info = AIConfig::GetConfig(_current_company, AIConfig::SSS_FORCE_GAME)->GetInfo();
|
||||
|
Reference in New Issue
Block a user