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

add name of remote player to notification that remote player moved.

Browse source 
And remove a few dead strings.
This commit is contained in:
Eric House 2011-07-15 18:13:55 -07:00
parent aec3400677
commit febb640049
7 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/jni/LocalizedStrIncludes.h
View file

@ -9,7 +9,7 @@
# define STRS_VALUES_HEADER 3
# define STRD_REMAINING_TILES_ADD 4
# define STRD_UNUSED_TILES_SUB 5
# define STR_REMOTE_MOVED 6
# define STRS_REMOTE_MOVED 6
# define STRD_TIME_PENALTY_SUB 7
# define STR_PASS 8
# define STRS_MOVE_ACROSS 9

5
xwords4/android/XWords4/res/values/strings.xml
View file

@ -26,7 +26,6 @@
<string name="title_langs_list">Languages (based on installed
dictionaries)</string>
<string name="lang_label">Game language</string>
<string name="title_game">Game</string>
<string name="title_game_configf">%s settings</string>
<string name="title_gamenet_configf">%s settings (networked)</string>
<string name="title_prefs">Crosswords settings</string>
@ -101,7 +100,7 @@
<string name="strs_values_header">%s counts/values:\n</string>
<string name="strd_remaining_tiles_add">+ %d [all remaining tiles]</string>
<string name="strd_unused_tiles_sub">- %d [unused tiles]</string>
<string name="str_remote_moved">Remote player made this move: </string>
<string name="str_remote_movedf">Remote player %1$s made this move: </string>
<string name="strd_time_penalty_sub"></string>
<string name="str_pass"> - %d [time]</string>
<string name="strs_move_across">move (from %s across)\n</string>
@ -174,7 +173,6 @@
<string name="new_room_hint">Room name</string>
<string name="room_public_prompt">Select public room</string>
<string name="configure_role">Configure connection</string>
<string name="configure_rolef">Configure %s connection</string>
<string name="settings_label">Other settings</string>
<string name="minutes_label">Minutes per player</string>
@ -320,7 +318,6 @@
<string name="clr_crosshairs">Crosshairs color</string>
<string name="background">Board background</string>
<string name="key_player">key_player</string>
<string name="tab_relay">Internet/Relay</string>
<string name="tab_sms">SMS (broken)</string>
<string name="tab_bluetooth">Bluetooth (pending)</string>

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

@ -54,7 +54,7 @@ public interface UtilCtxt {
static final int STRS_VALUES_HEADER = 3;
static final int STRD_REMAINING_TILES_ADD = 4;
static final int STRD_UNUSED_TILES_SUB = 5;
static final int STR_REMOTE_MOVED = 6;
static final int STRS_REMOTE_MOVED = 6;
static final int STRD_TIME_PENALTY_SUB = 7;
static final int STR_PASS = 8;
static final int STRS_MOVE_ACROSS = 9;

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
View file

@ -112,8 +112,8 @@ public class UtilCtxtImpl implements UtilCtxt {
case UtilCtxt.STRD_UNUSED_TILES_SUB:
id = R.string.strd_unused_tiles_sub;
break;
case UtilCtxt.STR_REMOTE_MOVED:
id = R.string.str_remote_moved;
case UtilCtxt.STRS_REMOTE_MOVED:
id = R.string.str_remote_movedf;
break;
case UtilCtxt.STRD_TIME_PENALTY_SUB:
id = R.string.strd_time_penalty_sub;

10
xwords4/common/server.c
View file

@ -816,10 +816,10 @@ showPrevScore( ServerCtxt* server )
XW_UtilCtxt* util = server->vol.util;
XWStreamCtxt* stream;
const XP_UCHAR* str;
XP_UCHAR buf[128];
CurGameInfo* gi = server->vol.gi;
XP_U16 nPlayers = gi->nPlayers;
XP_U16 prevTurn;
XP_U16 strCode;
LocalPlayer* lp;
prevTurn = (server->nv.currentTurn + nPlayers - 1) % nPlayers;
@ -828,14 +828,14 @@ showPrevScore( ServerCtxt* server )
if ( LP_IS_LOCAL(lp) ) {
/* Why can't a local non-robot have postponed score? */
// XP_ASSERT( LP_IS_ROBOT(lp) );
strCode = STR_ROBOT_MOVED;
str = util_getUserString( util, STR_ROBOT_MOVED );
} else {
strCode = STR_REMOTE_MOVED;
str = util_getUserString( util, STRS_REMOTE_MOVED );
XP_SNPRINTF( buf, sizeof(buf), str, lp->name );
str = buf;
}
stream = mkServerStream( server );
str = util_getUserString( util, strCode );
stream_catString( stream, str );
if ( !!server->nv.prevMoveStream ) {

2
xwords4/linux/LocalizedStrIncludes.h
View file

@ -43,7 +43,7 @@ enum {
STR_PHONY_REJECTED,
STRD_ROBOT_TRADED,
STR_ROBOT_MOVED,
STR_REMOTE_MOVED,
STRS_REMOTE_MOVED,
STR_PASSED,
STRSD_SUMMARYSCORED,

4
xwords4/linux/linuxutl.c
View file

@ -236,8 +236,8 @@ linux_util_getUserString( XW_UtilCtxt* XP_UNUSED(uc), XP_U16 code )
return (XP_UCHAR*)"%d tiles traded this turn.";
case STR_ROBOT_MOVED:
return (XP_UCHAR*)"The robot moved:\n";
case STR_REMOTE_MOVED:
return (XP_UCHAR*)"Remote player moved:\n";
case STRS_REMOTE_MOVED:
return (XP_UCHAR*)"Remote player \"%s\" moved:\n";
case STR_PASSED:
return (XP_UCHAR*)"Passed";