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

fix formatting -- no code change

Browse source
This commit is contained in:
Andy2 2011-12-07 06:16:11 -08:00
parent ded7ffc6fe
commit 7b985fcbae
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -202,15 +202,15 @@ public class GameUtils {
XwJNI.comms_setAddr( gamePtr, addr ); XwJNI.comms_setAddr( gamePtr, addr );
} }
if ( null == lockDest ) { if ( null == lockDest ) {
long rowid = saveNewGame( context, gamePtr, gi ); long rowid = saveNewGame( context, gamePtr, gi );
lockDest = new GameLock( rowid, true ).lock(); lockDest = new GameLock( rowid, true ).lock();
} else { } else {
saveGame( context, gamePtr, gi, lockDest, true ); saveGame( context, gamePtr, gi, lockDest, true );
} }
summarizeAndClose( context, lockDest, gamePtr, gi ); summarizeAndClose( context, lockDest, gamePtr, gi );
return lockDest; return lockDest;
} // resetGame } // resetGame
public static void resetGame( Context context, long rowidIn ) public static void resetGame( Context context, long rowidIn )
@ -315,16 +315,18 @@ public class GameUtils {
gamePtr = XwJNI.initJNI(); gamePtr = XwJNI.initJNI();
String langName = gi.langName(); String langName = gi.langName();
boolean madeGame = XwJNI.game_makeFromStream( gamePtr, stream, boolean madeGame =
JNIUtilsImpl.get(), gi, XwJNI.game_makeFromStream( gamePtr, stream,
dictNames, pairs.m_bytes, JNIUtilsImpl.get(), gi,
pairs.m_paths, langName, dictNames, pairs.m_bytes,
util, pairs.m_paths, langName,
CommonPrefs.get(context)); util,
CommonPrefs.get(context));
if ( !madeGame ) { if ( !madeGame ) {
XwJNI.game_makeNewGame( gamePtr, gi, JNIUtilsImpl.get(), XwJNI.game_makeNewGame( gamePtr, gi, JNIUtilsImpl.get(),
CommonPrefs.get(context), dictNames, CommonPrefs.get(context), dictNames,
pairs.m_bytes, pairs.m_paths, langName ); pairs.m_bytes, pairs.m_paths,
langName );
} }
} }
return gamePtr; return gamePtr;