m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix severe old bug where RGB scale couldn't be set back to 256. Update NSIS script (win32 installer)

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1026 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2009-09-11 22:40:47 +00:00
parent 0f5d002505
commit 2345a764d6
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install/WinInstaller.nsi
View File

@ -11,7 +11,7 @@
;Name and file ;Name and file
Name "Grafx2" Name "Grafx2"
OutFile "grafx2-2.0-svn853-win32.exe" OutFile "grafx2-2.1.1026.win32.exe"
;Default installation folder ;Default installation folder
InstallDir "$PROGRAMFILES\Grafx2" InstallDir "$PROGRAMFILES\Grafx2"
@ -60,7 +60,7 @@ Section "Grafx2" SecProgram
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
;ADD YOUR OWN FILES HERE... ;ADD YOUR OWN FILES HERE...
File ..\grafx2.exe File ..\grafx2.exe
File ..\src-svn853.tgz File ..\src-2.1.1026.tgz
File ..\gfx2.gif File ..\gfx2.gif
File ..\gfx2def.ini File ..\gfx2def.ini
File ..\SDL_image.dll File ..\SDL_image.dll
@ -70,7 +70,10 @@ Section "Grafx2" SecProgram
File ..\zlib1.dll File ..\zlib1.dll
File ..\libpng13.dll File ..\libpng13.dll
SetOutPath "$INSTDIR\skins" SetOutPath "$INSTDIR\skins"
File ..\skins\base.gif File ..\skins\font_Classic.png
File ..\skins\font_Fun.png
File ..\skins\skin_classic.png
File ..\skins\skin_modern.png
SetOutPath "$INSTDIR\doc" SetOutPath "$INSTDIR\doc"
File ..\doc\README.txt File ..\doc\README.txt
File ..\doc\COMPILING.txt File ..\doc\COMPILING.txt
@ -97,7 +100,7 @@ Section "Grafx2" SecProgram
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
"URLInfoAbout" "http://grafx2.googlecode.com" "URLInfoAbout" "http://grafx2.googlecode.com"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
"DisplayVersion" "2.0 final" "DisplayVersion" "2.1.1026"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
"NoModify" 1 "NoModify" 1
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
@ -139,7 +142,7 @@ Section "un.SecProgram"
;ADD YOUR OWN FILES HERE... ;ADD YOUR OWN FILES HERE...
Delete "$INSTDIR\grafx2.exe" Delete "$INSTDIR\grafx2.exe"
Delete "$INSTDIR\src-svn853.tgz" Delete "$INSTDIR\src-2.1.1026.tgz"
Delete "$INSTDIR\gfx2.gif" Delete "$INSTDIR\gfx2.gif"
Delete "$INSTDIR\gfx2def.ini" Delete "$INSTDIR\gfx2def.ini"
Delete "$INSTDIR\SDL_image.dll" Delete "$INSTDIR\SDL_image.dll"
@ -159,7 +162,10 @@ Section "un.SecProgram"
Delete "$INSTDIR\fonts\8pxfont.png" Delete "$INSTDIR\fonts\8pxfont.png"
Delete "$INSTDIR\fonts\Tuffy.ttf" Delete "$INSTDIR\fonts\Tuffy.ttf"
RMDir "$INSTDIR\fonts" RMDir "$INSTDIR\fonts"
Delete "$INSTDIR\skins\base.gif" Delete "$INSTDIR\skins\font_Classic.png"
Delete "$INSTDIR\skins\font_Fun.png"
Delete "$INSTDIR\skins\skin_classic.png"
Delete "$INSTDIR\skins\skin_modern.png"
RMDir "$INSTDIR\skins" RMDir "$INSTDIR\skins"
Delete "$INSTDIR\Uninstall.exe" Delete "$INSTDIR\Uninstall.exe"

3
palette.c
View File

@ -2176,7 +2176,8 @@ void Button_Secondary_palette(void)
T_Scroller_button * rgb_scale_slider; T_Scroller_button * rgb_scale_slider;
char str[4]; char str[4];
byte palette_vertical = Config.Palette_vertical; byte palette_vertical = Config.Palette_vertical;
byte palette_cols, palette_lines, rgb_scale; byte palette_cols, palette_lines;
word rgb_scale;
byte palette_needs_redraw=0; byte palette_needs_redraw=0;
Open_window(200,146,"Palettes"); Open_window(200,146,"Palettes");