From b16b0f00fcde6cc462a927e6eadf983797a111ad Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Tue, 6 Apr 2010 23:50:06 +0000 Subject: [PATCH] Bugfix for release so if the current used resolution string isn't properly detected we add it at the end. - Updated win32 glest.ini and win32 installer script --- mk/windoze/Glest.suo | Bin 151552 -> 166912 bytes mk/windoze/Installer/MegaGlestInstaller.nsi | 43 ++++++++++++++---- source/glest_game/menu/menu_state_options.cpp | 14 +++++- 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo index b11f8de168c5dec4d133bba4d790bad6f1928548..e43c3bd0926b28303fe9337aa682110c874c8d2e 100755 GIT binary patch delta 19375 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 delta 9623 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 diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi index eee843f4..707ffc33 100644 --- a/mk/windoze/Installer/MegaGlestInstaller.nsi +++ b/mk/windoze/Installer/MegaGlestInstaller.nsi @@ -3,9 +3,12 @@ !define APNAME Mega-Glest -Name "${APNAME}" +Name "${APNAME} 3.3.2" OutFile "${APNAME}-Installer.exe" +;Icon "..\glest.ico" +;UninstallIcon "..\glest.ico" InstallDir "$PROGRAMFILES\${APNAME}" +ShowInstDetails show BGGradient 0xDF9437 0xffffff ; Request application privileges for Windows Vista @@ -50,6 +53,24 @@ Function MUIGUIInit # GetDlgItem $0 $0 1006 # SetCtlColors $0 0xDF9437 0xDF9437 + ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APNAME}" "UninstallString" + StrCmp $R0 "" doneInit + +MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ + "${APNAME} is already installed. $\n$\nClick `OK` to remove the \ + previous version or `Cancel` to cancel this upgrade." \ + IDOK uninstInit + Abort + +;Run the uninstaller +uninstInit: + ClearErrors + ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file + + Exec $INSTDIR\uninst.exe ; instead of the ExecWait line + +doneInit: + FunctionEnd @@ -86,15 +107,16 @@ Section "${APNAME} (required)" File "..\..\..\data\glest_game\glest.ico" File "..\..\..\data\glest_game\glest.ini" File "..\..\..\data\glest_game\servers.ini" - File "..\..\..\data\glest_game\dsound.dll" +# File "..\..\..\data\glest_game\dsound.dll" + File "..\..\..\data\glest_game\openal32.dll" File "..\..\..\data\glest_game\xerces-c_3_0.dll" - File /r /x .svn "..\..\..\data\glest_game\data" - File /r /x .svn "..\..\..\data\glest_game\docs" - File /r /x .svn "..\..\..\data\glest_game\maps" - File /r /x .svn "..\..\..\data\glest_game\scenarios" - File /r /x .svn "..\..\..\data\glest_game\techs" - File /r /x .svn "..\..\..\data\glest_game\tilesets" - File /r /x .svn "..\..\..\data\glest_game\tutorials" + File /r /x .svn /x mydata "..\..\..\data\glest_game\data" + File /r /x .svn /x mydata "..\..\..\data\glest_game\docs" + File /r /x .svn /x mydata "..\..\..\data\glest_game\maps" + File /r /x .svn /x mydata "..\..\..\data\glest_game\scenarios" + File /r /x .svn /x mydata "..\..\..\data\glest_game\techs" + File /r /x .svn /x mydata "..\..\..\data\glest_game\tilesets" + File /r /x .svn /x mydata "..\..\..\data\glest_game\tutorials" # File /r /x .svn "..\..\..\data\glest_game\screens" ; Write the installation path into the registry @@ -154,7 +176,8 @@ Section "Uninstall" Delete $INSTDIR\glest.ico Delete $INSTDIR\glest.ini Delete $INSTDIR\servers.ini - Delete $INSTDIR\dsound.dll + # Delete $INSTDIR\dsound.dll + Delete $INSTDIR\openal32.dll Delete $INSTDIR\xerces-c_3_0.dll Delete $INSTDIR\*.log diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp index 5da30405..d4dbac17 100644 --- a/source/glest_game/menu/menu_state_options.cpp +++ b/source/glest_game/menu/menu_state_options.cpp @@ -132,11 +132,21 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu): labelScreenModes.init(leftLabelStart, leftline); labelScreenModes.setText(lang.get("Resolution")); listBoxScreenModes.init(leftColumnStart, leftline, 170); + + string currentResString = config.getString("ScreenWidth") + "x" + + config.getString("ScreenHeight") + "-" + + intToStr(config.getInt("ColorBits")); + bool currentResolutionFound = false; for(list::const_iterator it= modeInfos.begin(); it!=modeInfos.end(); ++it){ + if((*it).getString() == currentResString) { + currentResolutionFound = true; + } listBoxScreenModes.pushBackItem((*it).getString()); } - listBoxScreenModes.setSelectedItem(config.getString("ScreenWidth")+"x"+ - config.getString("ScreenHeight")+"-"+intToStr(config.getInt("ColorBits"))); + if(currentResolutionFound == false) { + listBoxScreenModes.pushBackItem(currentResString); + } + listBoxScreenModes.setSelectedItem(currentResString); leftline-=30; //filter