* Some stuff with changing the Dink HD menu key to F1 from Shift-Escape

* Added Dan's .png loading patch (untested)

git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1522 353e56fe-9613-0410-8469-b96ad8e6f29c

script/BuildAndPackageWindows.bat

@@ -31,6 +31,9 @@ if not exist %C_TARGET_EXE% beeper.exe /p
 
 :Sign it with the RTsoft cert (optional)
 
+echo "Waiting 5 seconds "
+timeout 5
+
 call sign.bat %C_TARGET_EXE%
 
 REM Do a little cleanup in  the dink bin dir as well
@@ -65,6 +68,9 @@ cd win_installer
 cd ..
 set d_fname=%C_FILENAME%
 
+echo "Waiting 5 seconds because NSIS does something and ruins the signing if I don't"
+timeout 5
+
 call sign.bat %C_FILENAME%
 
 :call FTPToSiteWin.bat

script/BuildAndroidAndUploadBeta.bat

@@ -1,11 +1,12 @@
 cd ..\android
-call build.bat
+call ..\app_info_setup.bat
+:call buildRelease.bat
 @ECHO ON
-set D_FILE_NAME=%APP_NAME%-unprotected.apk
-del ..\%D_FILE_NAME%
-copy bin\%APP_NAME%-debug.apk ..\%D_FILE_NAME%
-cd ..
+cd bin
+set D_FILE_NAME=%APP_NAME%-release.apk
+copy %D_FILE_NAME% ..\..\script
+cd ..\..\script
 set d_fname=%D_FILE_NAME%
-call script\FTPToSite.bat
-cd script
+call FTPToSiteWin.bat
+
 pause

script/FTPToSiteWin.bat

@@ -0,0 +1,34 @@
+
+REM This will FTP the latest build into the correct dir at RTSOFT
+
+if "%d_fname%" == "" ( 
+   echo d_fname not set.
+   beeper.exe /p
+   exit
+  )
+
+REM get our ftp logon info
+call ../../../SetFTPLogonInfo.bat
+
+REM create script for the FTP process
+
+if exist ftp.tmp del ftp.tmp
+
+echo user %_FTP_USER_% %_FTP_PASS_% >> ftp.tmp
+echo cd www >> ftp.tmp
+echo cd dink >> ftp.tmp
+echo binary >> ftp.tmp
+echo put %d_fname% >> ftp.tmp
+echo quit >> ftp.tmp
+
+
+echo http://www.rtsoft.com/dink/%d_fname%
+
+ftp -n -i -d -s:ftp.tmp %_FTP_SITE_%
+
+del ftp.tmp
+
+REM remove environmental vars we used
+set C_FILENAME=
+call ../../../KillFTPLogonInfo.bat
+

script/UploadWindowsVersionAsBeta.bat

@@ -0,0 +1,6 @@
+SET C_FILENAME=DinkSmallwoodHDInstallerBeta.exe
+del %C_FILENAME%
+copy DinkSmallwoodHDInstaller.exe %C_FILENAME%
+set d_fname=%C_FILENAME%
+call FTPToSiteWin.bat
+pause

script/win_installer/readme.txt

@@ -9,7 +9,7 @@ NOTE: Quick saves might give a "Can't load old version" error if the data format
 
 Controls:
 
-F1 - Quick save
+F4 - Quick save
 F10 - Quick load
 Control - Attack
 Arrow keys - Movement
@@ -17,7 +17,7 @@ Space - Talk
 Enter - Inventory
 Shift - Magic
 Escape - Bring up classic dink escape menu
-Shift-Escape - Bring up Dink HD escape menu
+F1 - Bring up Dink HD escape menu
 Drag on window borders - scale the play area (when windowed)
 
 NOTE: If you have a controller (like an xbox 360 pad) plugged in when you start the game, you can use that instead of keyboard, but you still need to use the
@@ -282,3 +282,7 @@ use timing (Myster island camera sequence for example) easier though, not sure.
 * Now gives a clear warning in the log.txt if a seq tries to go beyond what it can handle and will truncate it (better than breaking the whole sequence as it did before)
 * Added support for a weird bmp header type, fixes incorrect palette issue in the dmod The Orb of Darkness
 * Fixed life/exp/health to correctly interpolate between values like the original dink, huge thanks to Dan's detailed bug report on this, he even made a mod which made testing the fix a breeze!
+* BUGFIX: .dmod files detected in the main Dink HD dir are now properly deleted after auto-installing them
+* (Windows) Key binding changes: F1 now brings up the Dink Menu (Shift-Escape was .. weird..) and quicksave was moved to F4
+
+- Note:  Save state version has changed, old save states won't load!