Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

per-gi dictName matters again: preserve it, include it in lists passed

Browse source 
to jni, and don't bother to assign a per-player dict when it'd be the
same as the game dict.  Allows many games to have just the one, and
also fixes problems opening games saved with older versions.  Duh.
This commit is contained in:
Andy2 2011-04-25 20:24:56 -07:00
parent af08b2e5b0
commit 024f7e0541
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -361,6 +361,7 @@ public class GameUtils {
}
missingSet = new HashSet<String>( Arrays.asList( dictNames ) );
missingSet.remove( null );
Utils.logf( "missingSet before remove of %s: %s", installed.toString(),
missingSet.toString() );
Utils.logf( "missingSet size: %d", missingSet.size() );
@ -504,11 +505,16 @@ public class GameUtils {
byte[][] result = new byte[names.length][];
HashMap<String,byte[]> seen = new HashMap<String,byte[]>();
for ( int ii = 0; ii < names.length; ++ii ) {
byte[] bytes = null;
String name = names[ii];
byte[] bytes = seen.get( name );
if ( null == bytes ) {
bytes = openDict( context, name );
seen.put( name, bytes );
if ( null == name ) {
Utils.logf( "openDicts: names[%d] == null; skipping open", ii );
} else {
bytes = seen.get( name );
if ( null == bytes ) {
bytes = openDict( context, name );
seen.put( name, bytes );
}
}
result[ii] = bytes;
}

39
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
View file

@ -38,6 +38,7 @@ public class CurGameInfo {
public enum XWPhoniesChoice { PHONIES_IGNORE, PHONIES_WARN, PHONIES_DISALLOW };
public enum DeviceRole { SERVER_STANDALONE, SERVER_ISSERVER, SERVER_ISCLIENT };
public String dictName;
public LocalPlayer[] players;
public int dictLang;
public int gameID;
@ -75,7 +76,7 @@ public class CurGameInfo {
players = new LocalPlayer[MAX_NUM_PLAYERS];
serverRole = isNetworked ? DeviceRole.SERVER_ISCLIENT
: DeviceRole.SERVER_STANDALONE;
String dictName = CommonPrefs.getDefaultHumanDict( context );
dictName = CommonPrefs.getDefaultHumanDict( context );
dictLang = DictLangCache.getDictLangCode( context, dictName );
hintsNotAllowed = !CommonPrefs.getDefaultHintsAllowed( context );
phoniesAction = CommonPrefs.getDefaultPhonies( context );
@ -107,6 +108,7 @@ public class CurGameInfo {
boardSize = src.boardSize;
players = new LocalPlayer[MAX_NUM_PLAYERS];
serverRole = src.serverRole;
dictName = src.dictName;
dictLang = src.dictLang;
hintsNotAllowed = src.hintsNotAllowed;
phoniesAction = src.phoniesAction;
@ -246,9 +248,10 @@ public class CurGameInfo {
assignDicts();
}
String[] result = new String[nPlayers];
String[] result = new String[nPlayers+1];
result[0] = dictName;
for ( int ii = 0; ii < nPlayers; ++ii ) {
result[ii] = players[ii].dictName;
result[ii+1] = players[ii].dictName;
}
return result;
}
@ -359,16 +362,32 @@ public class CurGameInfo {
DictLangCache.getBestDefault( m_context, dictLang, true );
String robotDict =
DictLangCache.getBestDefault( m_context, dictLang, false );
if ( null == dictName ||
dictLang != DictLangCache.getDictLangCode( m_context,
dictName ) ) {
dictName = humanDict;
}
for ( int ii = 0; ii < nPlayers; ++ii ) {
LocalPlayer lp = players[ii];
if ( null == lp.dictName ) {
} else if ( dictLang !=
DictLangCache.getDictLangCode( m_context,
lp.dictName ) ) {
} else {
continue;
if ( null != lp.dictName &&
dictLang != DictLangCache.getDictLangCode( m_context,
lp.dictName ) ) {
lp.dictName = null;
}
if ( null == lp.dictName ) {
if ( lp.isRobot() ) {
if ( robotDict != dictName ) {
lp.dictName = robotDict;
} else if ( humanDict != dictName ) {
lp.dictName = humanDict;
}
}
}
lp.dictName = lp.isRobot() ? robotDict : humanDict;
}
}
}