Browse files

Merge remote-tracking branch 'origin/develop'

  • Loading branch information...
2 parents 6383ef7 + 953ee7b commit bc85ab63e78ed0205e7e30cdef22f256054d5349 blitz-research committed Apr 4, 2013
View
7 VERSIONS.TXT
@@ -1,6 +1,13 @@
NOTE: If you're having trouble with a new version, try deleting '.build' dirs!!!!!
+***** v70b *****
+
+Added temp LoadState_V66b() to Android target for kludging around LoadState issues. If you have recently updated a <v67 app to >=v67, and users have mysteriously 'lost' their save games, you can use this to recover their old save games. However, you might want to let user decide whether to use 'old' or 'new' save game.
+
+Android LoadState now checks for <v67 state data if >=v67 state data not found - my bad, I renamed the state 'key' in v67.
+
+
***** V70 *****
Souped up win8 VB performance; fixed several win8 bugs.
View
2 bananas/mak/suspendtest/suspendtest.monkey
@@ -13,7 +13,7 @@ Class MyApp Extends App
Method OnCreate()
- Local state$=LoadState()
+ Local state$=LoadState_V66b()
If state
creates=Int( state )+1
Else
View
1 bin/config.winnt.txt
@@ -54,6 +54,7 @@ MINGW_PATH="${SYSTEMDRIVE}\MinGW"
'The Java JDK is currently available here:
' http://www.oracle.com/technetwork/java/javase/downloads/index.html
'
+JDK_PATH="${PROGRAMFILES}\Java\jdk1.7.0_17"
JDK_PATH="${PROGRAMFILES}\Java\jdk1.7.0_02"
JDK_PATH="${PROGRAMFILES}\Java\jdk1.6.0_23"
JDK_PATH="${PROGRAMFILES}\Java\jdk1.6.0_21"
View
2 modules/brl/markdown.monkey
@@ -109,7 +109,7 @@ Class Markdown
Local i1:=i0+l
While i1<src.Length
Local c:=src[i1]
- If (c=95) Or (c>=65 And c<=90) Or (c>=97 And c<=122) Or (i1>i0+l And c>=48 And c<=57)
+ If (c=95) Or (c>=65 And c<=90) Or (c>=97 And c<=122) Or (i1>i0+l And c>=48 And c<=57)
i1+=1
Continue
Endif
View
3 targets/android/modules/monkeytarget.monkey
@@ -6,3 +6,6 @@ Import brl.gametarget
Import "native/androidgame.java"
Import "native/monkeytarget.java"
+Extern
+
+Function LoadState_V66b:String()="BBAndroidGame.LoadState_V66b"
View
10 targets/android/modules/native/androidgame.java
@@ -383,7 +383,15 @@ public int SaveState( String state ){
public String LoadState(){
SharedPreferences prefs=_activity.getPreferences( 0 );
- return prefs.getString( ".monkeystate","" );
+ String state=prefs.getString( ".monkeystate","" );
+ if( state.equals( "" ) ) state=prefs.getString( "gxtkAppState","" );
+ return state;
+ }
+
+ //Temporary fix!
+ static public String LoadState_V66b(){
+ SharedPreferences prefs=_androidGame._activity.getPreferences( 0 );
+ return prefs.getString( "gxtkAppState","" );
}
public boolean PollJoystick( int port,float[] joyx,float[] joyy,float[] joyz,boolean[] buttons ){

0 comments on commit bc85ab6

Please sign in to comment.