Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android_branch' into relay_proxy

Browse source
This commit is contained in:
eehouse@eehouse.org 2010-08-26 18:36:55 -07:00 committed by Andy2
commit ecd0280353
6 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -21,8 +21,8 @@
to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4"
android:versionCode="7"
android:versionName="4.4 beta 14"
android:versionCode="8"
android:versionName="4.4 beta 15"
>
<uses-permission android:name="android.permission.INTERNET" />

13
xwords4/android/XWords4/res/raw/changes
View file

@ -6,19 +6,16 @@
</head>
<body>
<b>Crosswords 4.4 beta 14 release</b>
<b>Crosswords 4.4 beta 15 release</b>
<ul>New features:
<li>This spiffy per-release dialog</li>
</ul>
<p>This is a quick bug-fix release while I continue work on the new relay connection code.</p>
<ul>Bugs fixed:
<li>Crash exiting board view</li>
<li>Hang searching for robot move</li>
<li>Crash putting up progress dialog after board hidden</li>
<li>Robot wouldn't give up turn when unable to find a move. (Thanks S.A.)</li>
<li>"Crosshairs" was drawn only three columns wide when started on top row</li>
</ul>
<ul>Coming soon:
<ul>(Still) coming soon
<li>builtin hints and help</li>
<li>rewrite of gameplay via relay to make connecting easier and allow closed game to receive moves.</li>
</ul>

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConstants.java
View file

@ -23,5 +23,5 @@ package org.eehouse.android.xw4;
public interface XWConstants {
public static final String GAME_EXTN = ".xwg";
public static final String DICT_EXTN = ".xwd";
public static final String VERSION_STR = "4.4 beta 14";
public static final String VERSION_STR = "4.4 beta 15";
}

2
xwords4/common/dragdrpp.c
View file

@ -677,7 +677,7 @@ static void
crosshairs_init( BoardCtxt* board )
{
DragState* ds = &board->dragState;
ds->crosshairs.col = ds->crosshairs.col = -1;
ds->crosshairs.col = ds->crosshairs.row = -1;
}
static XP_Bool

6
xwords4/common/engine.c
View file

@ -513,11 +513,13 @@ engine_findMove( EngineCtxt* engine, const ModelCtxt* model,
result = XP_FALSE;
} else {
PossibleMove* move;
result = chooseMove( engine, &move );
if ( result ) {
if ( chooseMove( engine, &move ) ) {
XP_ASSERT( !!newMove );
XP_MEMCPY( newMove, &move->moveInfo, sizeof(*newMove) );
} else {
newMove->nTiles = 0;
}
result = XP_TRUE;
}
util_engineStopping( engine->util );

14
xwords4/common/server.c
View file

@ -642,7 +642,7 @@ static XP_Bool
makeRobotMove( ServerCtxt* server )
{
XP_Bool result = XP_FALSE;
XP_Bool finished;
XP_Bool searchComplete;
XP_S16 turn;
const TrayTileSet* tileSet;
MoveInfo newMove;
@ -674,14 +674,14 @@ makeRobotMove( ServerCtxt* server )
}
XP_ASSERT( !!server_getEngineFor( server, turn ) );
finished = engine_findMove( server_getEngineFor( server, turn ),
model, model_getDictionary( model ),
tileSet->tiles, tileSet->nTiles, XP_FALSE,
searchComplete = engine_findMove( server_getEngineFor( server, turn ),
model, model_getDictionary( model ),
tileSet->tiles, tileSet->nTiles, XP_FALSE,
#ifdef XWFEATURE_SEARCHLIMIT
NULL, XP_FALSE,
NULL, XP_FALSE,
#endif
targetScore, &canMove, &newMove );
if ( finished ) {
targetScore, &canMove, &newMove );
if ( searchComplete ) {
const XP_UCHAR* str;
XWStreamCtxt* stream = NULL;