diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh index 387fa4a7..f746c9cd 100755 --- a/mk/linux/setupBuildDeps.sh +++ b/mk/linux/setupBuildDeps.sh @@ -224,11 +224,11 @@ case $distribution in 11.2|11.3|11.4) zypper install subdistribution gcc gcc-c++ automake cmake if [ $? != 0 ]; then error_during_installation; exit 1; fi - zypper install libSDL-devel libxerces-c-devel MesaGLw-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel + zypper install libSDL-devel libxerces-c-devel MesaGLw-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel if [ $? != 0 ]; then error_during_installation; exit 1; fi ;; *) - alternative='zypper install subdistribution gcc gcc-c++ automake cmake; zypper install libSDL-devel libxerces-c-devel MesaGLw-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel' + alternative='zypper install subdistribution gcc gcc-c++ automake cmake; zypper install libSDL-devel libxerces-c-devel MesaGLw-devel freeglut-devel libvorbis-devel wxGTK-devel lua-devel libjpeg-devel libpng14-devel libcurl-devel openal-soft-devel xorg-x11-libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel' unsupported_release exit 1 ;; @@ -243,11 +243,11 @@ case $distribution in if [ $? != 0 ]; then error_during_installation; exit 1; fi yum install subdistribution automake autoconf autogen cmake if [ $? != 0 ]; then error_during_installation; exit 1; fi - yum install SDL-devel xerces-c-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-dev libircclient-dev glew-devel ftgl-devel + yum install SDL-devel xerces-c-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-dev libircclient-dev glew-devel ftgl-devel fribidi-devel if [ $? != 0 ]; then error_during_installation; exit 1; fi ;; *) - alternative='yum groupinstall "Development Tools"; yum install subdistribution automake autoconf autogen cmake; yum install SDL-devel xerces-c-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-dev libircclient-dev glew-devel ftgl-devel' + alternative='yum groupinstall "Development Tools"; yum install subdistribution automake autoconf autogen cmake; yum install SDL-devel xerces-c-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-dev libircclient-dev glew-devel ftgl-devel fribidi-devel' unsupported_release exit 1 ;; diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index 2a6e5ea5..1533a3e5 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -5138,7 +5138,7 @@ void Game::loadGame(string name,Program *programPtr,bool isMasterserverMode) { Lang &lang= Lang::getInstance(); string gameVer = versionNode->getAttribute("version")->getValue(); - if(gameVer != glestVersionString) { + if(gameVer != glestVersionString && checkVersionComptability(gameVer, glestVersionString) == false) { char szBuf[8096]=""; snprintf(szBuf,8096,lang.get("SavedGameBadVersion").c_str(),gameVer.c_str(),glestVersionString.c_str()); throw megaglest_runtime_error(szBuf); @@ -5199,7 +5199,7 @@ void Game::loadGame(string name,Program *programPtr,bool isMasterserverMode) { Lang &lang= Lang::getInstance(); string gameVer = versionNode->getAttribute("version")->getValue(); - if(gameVer != glestVersionString) { + if(gameVer != glestVersionString && checkVersionComptability(gameVer, glestVersionString) == false) { char szBuf[8096]=""; snprintf(szBuf,8096,lang.get("SavedGameBadVersion").c_str(),gameVer.c_str(),glestVersionString.c_str()); throw megaglest_runtime_error(szBuf); diff --git a/source/glest_game/menu/menu_state_load_game.cpp b/source/glest_game/menu/menu_state_load_game.cpp index be04e7f2..e5ed0cbd 100644 --- a/source/glest_game/menu/menu_state_load_game.cpp +++ b/source/glest_game/menu/menu_state_load_game.cpp @@ -289,7 +289,7 @@ void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){ const XmlNode *versionNode= rootNode; string gameVer = versionNode->getAttribute("version")->getValue(); - if(gameVer != glestVersionString) { + if(gameVer != glestVersionString && checkVersionComptability(gameVer, glestVersionString) == false) { char szBuf[8096]=""; snprintf(szBuf,8096,lang.get("SavedGameBadVersion").c_str(),gameVer.c_str(),glestVersionString.c_str()); infoTextLabel.setText(szBuf);