- added fribidi for opensuse and fedora
- allow loading saved games on older versions if version are compatible
This commit is contained in:
parent
3997bafa2f
commit
56dc004119
|
@ -224,11 +224,11 @@ case $distribution in
|
||||||
11.2|11.3|11.4)
|
11.2|11.3|11.4)
|
||||||
zypper install subdistribution gcc gcc-c++ automake cmake
|
zypper install subdistribution gcc gcc-c++ automake cmake
|
||||||
if [ $? != 0 ]; then error_during_installation; exit 1; fi
|
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
|
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
|
unsupported_release
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
|
@ -243,11 +243,11 @@ case $distribution in
|
||||||
if [ $? != 0 ]; then error_during_installation; exit 1; fi
|
if [ $? != 0 ]; then error_during_installation; exit 1; fi
|
||||||
yum install subdistribution automake autoconf autogen cmake
|
yum install subdistribution automake autoconf autogen cmake
|
||||||
if [ $? != 0 ]; then error_during_installation; exit 1; fi
|
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
|
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
|
unsupported_release
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -5138,7 +5138,7 @@ void Game::loadGame(string name,Program *programPtr,bool isMasterserverMode) {
|
||||||
|
|
||||||
Lang &lang= Lang::getInstance();
|
Lang &lang= Lang::getInstance();
|
||||||
string gameVer = versionNode->getAttribute("version")->getValue();
|
string gameVer = versionNode->getAttribute("version")->getValue();
|
||||||
if(gameVer != glestVersionString) {
|
if(gameVer != glestVersionString && checkVersionComptability(gameVer, glestVersionString) == false) {
|
||||||
char szBuf[8096]="";
|
char szBuf[8096]="";
|
||||||
snprintf(szBuf,8096,lang.get("SavedGameBadVersion").c_str(),gameVer.c_str(),glestVersionString.c_str());
|
snprintf(szBuf,8096,lang.get("SavedGameBadVersion").c_str(),gameVer.c_str(),glestVersionString.c_str());
|
||||||
throw megaglest_runtime_error(szBuf);
|
throw megaglest_runtime_error(szBuf);
|
||||||
|
@ -5199,7 +5199,7 @@ void Game::loadGame(string name,Program *programPtr,bool isMasterserverMode) {
|
||||||
|
|
||||||
Lang &lang= Lang::getInstance();
|
Lang &lang= Lang::getInstance();
|
||||||
string gameVer = versionNode->getAttribute("version")->getValue();
|
string gameVer = versionNode->getAttribute("version")->getValue();
|
||||||
if(gameVer != glestVersionString) {
|
if(gameVer != glestVersionString && checkVersionComptability(gameVer, glestVersionString) == false) {
|
||||||
char szBuf[8096]="";
|
char szBuf[8096]="";
|
||||||
snprintf(szBuf,8096,lang.get("SavedGameBadVersion").c_str(),gameVer.c_str(),glestVersionString.c_str());
|
snprintf(szBuf,8096,lang.get("SavedGameBadVersion").c_str(),gameVer.c_str(),glestVersionString.c_str());
|
||||||
throw megaglest_runtime_error(szBuf);
|
throw megaglest_runtime_error(szBuf);
|
||||||
|
|
|
@ -289,7 +289,7 @@ void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){
|
||||||
|
|
||||||
const XmlNode *versionNode= rootNode;
|
const XmlNode *versionNode= rootNode;
|
||||||
string gameVer = versionNode->getAttribute("version")->getValue();
|
string gameVer = versionNode->getAttribute("version")->getValue();
|
||||||
if(gameVer != glestVersionString) {
|
if(gameVer != glestVersionString && checkVersionComptability(gameVer, glestVersionString) == false) {
|
||||||
char szBuf[8096]="";
|
char szBuf[8096]="";
|
||||||
snprintf(szBuf,8096,lang.get("SavedGameBadVersion").c_str(),gameVer.c_str(),glestVersionString.c_str());
|
snprintf(szBuf,8096,lang.get("SavedGameBadVersion").c_str(),gameVer.c_str(),glestVersionString.c_str());
|
||||||
infoTextLabel.setText(szBuf);
|
infoTextLabel.setText(szBuf);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user