Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Mark Vejvoda 2010-04-06 23:50:06 +00:00
parent b4e662c886
commit b16b0f00fc
3 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mk/windoze/Glest.suo
View File

Binary file not shown.

43
mk/windoze/Installer/MegaGlestInstaller.nsi
View File

@ -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

14
source/glest_game/menu/menu_state_options.cpp
View File

@ -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<ModeInfo>::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