From 1b3ae14659b69ea03ce16b4764b26d843e7bf302 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Sun, 2 Sep 2018 13:06:21 +0200 Subject: [PATCH] Made OOS messages more friendly --- source/g3d_viewer/main.cpp | 12 ++-- source/glest_game/ai/ai_interface.cpp | 56 ++++----------- source/glest_game/game/commander.cpp | 69 +++++-------------- .../menu/menu_state_custom_game.cpp | 2 +- .../glest_game/network/client_interface.cpp | 2 +- .../include/platform/sdl/platform_main.h | 8 +-- .../platform/common/simple_threads.cpp | 2 +- 7 files changed, 44 insertions(+), 107 deletions(-) diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index c21ef0ad9..b44897205 100644 --- a/source/g3d_viewer/main.cpp +++ b/source/g3d_viewer/main.cpp @@ -199,13 +199,13 @@ namespace Shared { printf("\n\n \tWhere x is a g3d filename to load separated with a"); printf("\n\n \tcomma and one or more skill names to try loading."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/megapack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_UNIT])); + printf("\n\n \t%s %s=techs/zetapack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_UNIT])); printf("\n\n \ttech/units/battle_machine,attack_skill,stop_skill"); printf("\n\n%s=x \tAuto load the model specified in path/filename x.", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); printf("\n\n \tWhere x is a g3d filename to load."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/megapack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); + printf("\n\n \t%s %s=techs/zetapack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); printf("\n\n \ttech/units/battle_machine/models/battle_machine_dying.g3d"); printf("\n\n%s=x ", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL_ANIMATION_VALUE])); @@ -225,14 +225,14 @@ namespace Shared { printf("\n\n \texample:"); printf("\n\n \t%s %s=transparent,", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_AUTO_SCREENSHOT])); printf("\n\n \tdisable_grid,saveas-test.png,resize-800x600"); - printf("\n\n \t%s=techs/megapack/factions/tech/units/", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); + printf("\n\n \t%s=techs/zetapack/factions/tech/units/", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); printf("\n\n \tbattle_machine/models/battle_machine_dying.g3d"); // "================================================================================" printf("\n\n%s=x \tAuto load the particle specified in path/filename x.", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE])); printf("\n\n \tWhere x is a Particle XML filename to load."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/megapack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE])); + printf("\n\n \t%s %s=techs/zetapack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE])); printf("\n\n \tpersian/units/genie/glow_particles.xml"); printf("\n\n%s=x ", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_PROJECTILE])); @@ -241,7 +241,7 @@ namespace Shared { printf("\n\n \tWhere x is a Projectile Particle Definition XML"); printf("\n\n \t filename to load."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/megapack/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_PROJECTILE])); + printf("\n\n \t%s %s=techs/zetapack/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_PROJECTILE])); printf("\n\n \tfactions/persian/units/genie/particle_proj.xml"); printf("\n\n%s=x ", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_SPLASH])); @@ -250,7 +250,7 @@ namespace Shared { printf("\n\n \tWhere x is a Splash Particle Definition XML"); printf("\n\n \t filename to load."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/megapack/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_SPLASH])); + printf("\n\n \t%s %s=techs/zetapack/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_SPLASH])); printf("\n\n \tfactions/persian/units/genie/particle_splash.xml"); printf("\n\n%s=x ", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_LOOP_VALUE])); diff --git a/source/glest_game/ai/ai_interface.cpp b/source/glest_game/ai/ai_interface.cpp index dc0bb40df..687c456a9 100644 --- a/source/glest_game/ai/ai_interface.cpp +++ b/source/glest_game/ai/ai_interface.cpp @@ -553,10 +553,7 @@ namespace std::pair < CommandResult, string > result(crFailUndefined, ""); if (unit == NULL) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "In [%s::%s Line: %d] Can not find AI unit in AI factionIndex = %d. Game out of synch.", + printf("In [%s::%s Line: %d] Can not find AI unit in AI factionIndex = %d. Game out of synch.", __FILE__, __FUNCTION__, __LINE__, factionIndex); /*throw megaglest_runtime_error(szBuf);*/ @@ -568,21 +565,14 @@ namespace const UnitType * unitType = unit->getType(); if (unitType == NULL) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "In [%s::%s Line: %d] Can not find AI unittype with unit id: %d, AI factionIndex = %d. Game out of synch.", - __FILE__, __FUNCTION__, __LINE__, unit->getId(), - factionIndex); + printf("In [%s::%s Line: %d] Can not find AI unittype with unit id: %d, AI factionIndex = %d. Game out of synch.", + __FILE__, __FUNCTION__, __LINE__, unit->getId(), factionIndex); /*throw megaglest_runtime_error(szBuf);*/ return result; } if (commandType == NULL) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "In [%s::%s Line: %d] commandType == NULL, unit id: %d, AI factionIndex = %d. Game out of synch.", + printf("In [%s::%s Line: %d] commandType == NULL, unit id: %d, AI factionIndex = %d. Game out of synch.", __FILE__, __FUNCTION__, __LINE__, unit->getId(), factionIndex); /*throw @@ -600,7 +590,7 @@ namespace unit->getFullName(false).c_str(), unit->getDesc(false).c_str(), unit->getFaction()->getIndex()); - + printf(szBuf); if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem). enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "%s\n", @@ -657,10 +647,7 @@ namespace const Unit * unit = getMyUnit(unitIndex); if (unit == NULL) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "In [%s::%s Line: %d] Can not find AI unit with index: %d, AI factionIndex = %d. Game out of synch.", + printf("In [%s::%s Line: %d] Can not find AI unit with index: %d, AI factionIndex = %d. Game out of synch.", __FILE__, __FUNCTION__, __LINE__, unitIndex, factionIndex); /*throw @@ -673,10 +660,7 @@ namespace const UnitType * unitType = unit->getType(); if (unitType == NULL) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "In [%s::%s Line: %d] Can not find AI unittype with unit index: %d, AI factionIndex = %d. Game out of synch.", + printf("In [%s::%s Line: %d] Can not find AI unittype with unit index: %d, AI factionIndex = %d. Game out of synch.", __FILE__, __FUNCTION__, __LINE__, unitIndex, factionIndex); /*throw @@ -694,7 +678,7 @@ namespace unit->getFullName(false).c_str(), unit->getDesc(false).c_str(), unit->getFaction()->getIndex()); - + printf(szBuf); if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem). enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "%s\n", @@ -750,10 +734,7 @@ namespace const Unit * unit = getMyUnit(unitIndex); if (unit == NULL) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "In [%s::%s Line: %d] Can not find AI unit with index: %d, AI factionIndex = %d. Game out of synch.", + printf("In [%s::%s Line: %d] Can not find AI unit with index: %d, AI factionIndex = %d. Game out of synch.", __FILE__, __FUNCTION__, __LINE__, unitIndex, factionIndex); /*throw @@ -766,10 +747,7 @@ namespace const UnitType * unitType = unit->getType(); if (unitType == NULL) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "In [%s::%s Line: %d] Can not find AI unittype with unit index: %d, AI factionIndex = %d. Game out of synch.", + printf("In [%s::%s Line: %d] Can not find AI unittype with unit index: %d, AI factionIndex = %d. Game out of synch.", __FILE__, __FUNCTION__, __LINE__, unitIndex, factionIndex); /*throw @@ -787,7 +765,7 @@ namespace unit->getFullName(false).c_str(), unit->getDesc(false).c_str(), unit->getFaction()->getIndex()); - + printf(szBuf); if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem). enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "%s\n", @@ -842,10 +820,7 @@ namespace const Unit * unit = getMyUnit(unitIndex); if (unit == NULL) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "In [%s::%s Line: %d] Can not find AI unit with index: %d, AI factionIndex = %d. Game out of synch.", + printf("In [%s::%s Line: %d] Can not find AI unit with index: %d, AI factionIndex = %d. Game out of synch.", __FILE__, __FUNCTION__, __LINE__, unitIndex, factionIndex); /*throw @@ -858,10 +833,7 @@ namespace const UnitType * unitType = unit->getType(); if (unitType == NULL) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "In [%s::%s Line: %d] Can not find AI unittype with unit index: %d, AI factionIndex = %d. Game out of synch.", + printf("In [%s::%s Line: %d] Can not find AI unittype with unit index: %d, AI factionIndex = %d. Game out of synch.", __FILE__, __FUNCTION__, __LINE__, unitIndex, factionIndex); /*throw @@ -882,7 +854,7 @@ namespace unit->getFullName(false).c_str(), unit->getDesc(false).c_str(), unit->getFaction()->getIndex()); - + printf(szBuf); if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem). enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "%s\n", diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp index b86119c62..8b0b31f85 100644 --- a/source/glest_game/game/commander.cpp +++ b/source/glest_game/game/commander.cpp @@ -670,7 +670,7 @@ namespace char szBuf[8096] = ""; snprintf(szBuf, 8096, - "In [%s::%s - %d] Command refers to non existent unit id = %d. Game out of synch.", + "In [%s::%s - %d] Command refers to non existent unit id = %d. Game out of sync", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, networkCommand->getUnitId()); GameNetworkInterface * @@ -679,8 +679,7 @@ namespace if (gameNetworkInterface != NULL) { char szMsg[8096] = ""; - snprintf(szMsg, 8096, - "Player detected an error: Command refers to non existent unit id = %d. Game out of synch.", + snprintf(szMsg, 8096, "Error: Command refers to non-existent unit id %d. Game out of sync, try leaving and rejoining", networkCommand->getUnitId()); gameNetworkInterface-> sendTextMessage(szMsg, -1, true, ""); @@ -1632,7 +1631,7 @@ namespace char szMsg[8096] = ""; snprintf(szMsg, 8096, - "Player detected an error: Can not find unit with id: %d. Game out of synch.", + "Error: Cannot find unit with id %d. Game out of sync, try leaving and rejoining", networkCommand->getUnitId()); gameNetworkInterface->sendTextMessage(szMsg, -1, true, ""); } @@ -1654,7 +1653,7 @@ namespace char szBuf[8096] = ""; snprintf(szBuf, 8096, - "In [%s::%s Line: %d]\nUnit / Faction mismatch for network command = [%s]\nfor unit = %d\n[%s]\n[%s]\nactual local factionIndex = %d.\nGame out of synch.", + "In [%s::%s Line: %d]\nUnit/Faction mismatch for network command = [%s]\nfor unit = %d\n[%s]\n[%s]\nactual local factionIndex = %d.\nGame out of sync", __FILE__, __FUNCTION__, __LINE__, networkCommand->toString().c_str(), unit->getId(), unit->getFullName(false).c_str(), @@ -1673,32 +1672,11 @@ namespace GameNetworkInterface * gameNetworkInterface = NetworkManager::getInstance().getGameNetworkInterface(); - if (gameNetworkInterface != NULL - && gameNetworkInterface->isConnected() == true) { - char - szMsg[8096] = ""; + if (gameNetworkInterface != NULL) { + char szMsg[8096] = ""; snprintf(szMsg, 8096, - "Player detected an error: Unit / Faction mismatch for unitId: %d", - networkCommand->getUnitId()); - gameNetworkInterface->sendTextMessage(szMsg, -1, true, ""); - snprintf(szMsg, 8096, - "Local faction index = %d, remote index = %d. Game out of synch.", - unit->getFaction()->getIndex(), - networkCommand->getUnitFactionIndex()); - gameNetworkInterface->sendTextMessage(szMsg, -1, true, ""); - - } - - // Else if it's a network game but the user disconnected, print the error locally only. - else if (gameNetworkInterface != NULL) { - char - szMsg[8096] = ""; - snprintf(szMsg, 8096, - "Player detected an error: Connection lost, possible Unit / Faction mismatch for unitId: %d", - networkCommand->getUnitId()); - gameNetworkInterface->sendTextMessage(szMsg, -1, true, ""); - snprintf(szMsg, 8096, - "Local faction index = %d, remote index = %d. Game out of synch.", + "Error: Unit/Faction mismatch for unitId %d, local faction index %d, remote index %d. Game out of sync, try leaving and rejoining", + networkCommand->getUnitId(), unit->getFaction()->getIndex(), networkCommand->getUnitFactionIndex()); gameNetworkInterface->sendTextMessage(szMsg, -1, true, ""); @@ -1717,14 +1695,8 @@ namespace world->findUnitTypeById(unit->getFaction()->getType(), networkCommand->getUnitTypeId()); - // debug test! - //throw megaglest_runtime_error("Test missing command type!"); - //validate command type - // !!!Test out of synch behaviour - //ct = NULL; - // Check if the command was for the unit before it morphed, if so cancel it. bool isCancelPreMorphCommand = false; @@ -1745,7 +1717,7 @@ namespace char szBuf[8096] = ""; snprintf(szBuf, 8096, - "In [%s::%s Line: %d]\nCan not find command type for network command = [%s]\nfor unit = %d\n[%s]\n[%s]\nactual local factionIndex = %d.\nUnit Type Info:\n[%s]\nNetwork unit type:\n[%s]\nisCancelPreMorphCommand: %d\nGame out of synch.", + "In [%s::%s Line: %d]\nCannot find command type for network command = [%s]\nfor unit = %d\n[%s]\n[%s]\nactual local factionIndex = %d.\nUnit Type Info:\n[%s]\nNetwork unit type:\n[%s]\nGame out of sync", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, networkCommand->toString().c_str(), @@ -1754,8 +1726,7 @@ namespace unit->getFaction()->getIndex(), unit->getType()->toString().c_str(), (unitType != - NULL ? unitType->getName(false).c_str() : "null"), - isCancelPreMorphCommand); + NULL ? unitType->getName(false).c_str() : "null")); SystemFlags::OutputDebug(SystemFlags::debugSystem, "%s\n", szBuf); SystemFlags::OutputDebug(SystemFlags::debugError, "%s\n", szBuf); @@ -1765,15 +1736,12 @@ namespace gameNetworkInterface = NetworkManager::getInstance().getGameNetworkInterface(); if (gameNetworkInterface != NULL) { - char - szMsg[8096] = ""; - snprintf(szMsg, 8096, - "Player detected an error: Can not find command type: %d for unitId: %d [%s]. isCancelPreMorphCommand: %d Game out of synch.", + char szMsg[8096] = ""; + snprintf(szMsg, 8096, "Error: Cannot find command type %d for unitId %d [%s]. Game out of sync, try leaving and rejoining", networkCommand->getCommandTypeId(), networkCommand->getUnitId(), (unitType != - NULL ? unitType->getName(false).c_str() : "null"), - isCancelPreMorphCommand); + NULL ? unitType->getName(false).c_str() : "null")); gameNetworkInterface->sendTextMessage(szMsg, -1, true, ""); } @@ -1794,13 +1762,10 @@ namespace /// TODO: What is happening here? The error returned does not match the condition. Why is there a constant of 4? if (networkCommand->getTargetId() < 0 || networkCommand->getTargetId() >= 4) { - char - szBuf[8096] = ""; - snprintf(szBuf, 8096, - "networkCommand->getTargetId() >= 0 && networkCommand->getTargetId() < 4, [%s]", - networkCommand->toString().c_str()); - throw - megaglest_runtime_error(szBuf); + printf("networkCommand->getTargetId() >= 0 && networkCommand->getTargetId() < 4, [%s]", networkCommand->toString().c_str()); + /*throw + megaglest_runtime_error(szBuf);*/ + return command; } facing = CardinalDir(networkCommand->getTargetId()); } diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index c997c6af7..3d072922b 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -666,7 +666,7 @@ namespace Glest { checkBoxAllowInGameJoinPlayer.registerGraphicComponent(containerName, "checkBoxAllowInGameJoinPlayer"); checkBoxAllowInGameJoinPlayer.init(20, networkPos - 30); - checkBoxAllowInGameJoinPlayer.setValue(false); + checkBoxAllowInGameJoinPlayer.setValue(true); checkBoxAllowInGameJoinPlayer.setVisible(allowInProgressJoin); diff --git a/source/glest_game/network/client_interface.cpp b/source/glest_game/network/client_interface.cpp index 0d6b72b9e..2600573ff 100644 --- a/source/glest_game/network/client_interface.cpp +++ b/source/glest_game/network/client_interface.cpp @@ -498,7 +498,7 @@ namespace Glest { string sMsg = "may go out of synch: client requestedCommands.size() = " + intToStr(requestedCommands.size()); sendTextMessage(sMsg, -1, true, ""); - sleep(1); + sleep(0); } } catch (const megaglest_runtime_error &ex) { SystemFlags::OutputDebug(SystemFlags::debugNetwork, "In [%s::%s Line: %d] Error [%s]\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, ex.what()); diff --git a/source/shared_lib/include/platform/sdl/platform_main.h b/source/shared_lib/include/platform/sdl/platform_main.h index 483b94696..b34255cc6 100644 --- a/source/shared_lib/include/platform/sdl/platform_main.h +++ b/source/shared_lib/include/platform/sdl/platform_main.h @@ -291,7 +291,7 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) { printf("\n\n \t*NOTE: This only applies when files are purged due to the"); printf("\n\n \t above flags being set."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=megapack,vbros_pack_5", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES]); + printf("\n\n \t%s %s=zetapack,vbros_pack_5", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES]); printf("\n\n%s=x=purgeunused=purgeduplicates=hideduplicates ", GAME_ARGS[GAME_ARG_VALIDATE_FACTIONS]); printf("\n\n \tDisplay a report detailing any known problems related to"); @@ -380,7 +380,7 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) { printf("\n\n \t the original texture if its filesize is smaller than the"); printf("\n\n \t converted format."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/megapack/factions/tech/", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_CONVERT_MODELS]); + printf("\n\n \t%s %s=techs/zetapack/factions/tech/", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_CONVERT_MODELS]); printf("\n\n \tunits/castle/models/castle.g3d=png=keepsmallest"); printf("\n\n%s=x \tForce the language to be the language specified", GAME_ARGS[GAME_ARG_USE_LANGUAGE]); @@ -398,7 +398,7 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) { printf("\n\n%s=x \tShow the calculated CRC for the techtree named x.", GAME_ARGS[GAME_ARG_SHOW_TECHTREE_CRC]); printf("\n\n \tWhere x is a techtree name."); - printf("\n\n \texample: %s %s=megapack", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_SHOW_TECHTREE_CRC]); + printf("\n\n \texample: %s %s=zetapack", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_SHOW_TECHTREE_CRC]); printf("\n\n%s=x \tShow the calculated CRC for the scenario named x.", GAME_ARGS[GAME_ARG_SHOW_SCENARIO_CRC]); printf("\n\n \tWhere x is a scenario name."); @@ -408,7 +408,7 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) { printf("\n\n%s=x=y \tShow the calculated CRC for files in the path", GAME_ARGS[GAME_ARG_SHOW_PATH_CRC]); printf("\n\n \t located in x using file filter y."); printf("\n\n \tWhere x is a path name and y is file(s) filter."); - printf("\n\n \texample: %s %s=techs/=megapack.7z", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_SHOW_PATH_CRC]); + printf("\n\n \texample: %s %s=techs/=zetapack.7z", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_SHOW_PATH_CRC]); printf("\n\n%s \tDisables stack backtrace on errors.", GAME_ARGS[GAME_ARG_DISABLE_BACKTRACE]); diff --git a/source/shared_lib/sources/platform/common/simple_threads.cpp b/source/shared_lib/sources/platform/common/simple_threads.cpp index a8eb570bd..8fef015d1 100644 --- a/source/shared_lib/sources/platform/common/simple_threads.cpp +++ b/source/shared_lib/sources/platform/common/simple_threads.cpp @@ -120,7 +120,7 @@ namespace Shared { vector techPaths; findDirs(techDataPaths, techPaths); if (techPaths.empty() == false) { - // Always calc megapack first so its up to date sooner + // Always calc zetapack first so its up to date sooner const string zetapackTechtreeName = "zetapack"; vector::iterator iterFindZetaPack = std::find(techPaths.begin(), techPaths.end(), zetapackTechtreeName); if (iterFindZetaPack != techPaths.end()) {