mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-29 08:34:37 +01:00
Add the ALL_HERE alert to the set not duplicated.
This commit is contained in:
parent
378d02f1f5
commit
d5e641ee52
2 changed files with 6 additions and 4 deletions
|
@ -1705,12 +1705,12 @@ ceFlattenState( const CEAppGlobals* globals )
|
||||||
} else {
|
} else {
|
||||||
switch( socketState ) {
|
switch( socketState ) {
|
||||||
case CE_IPST_START:
|
case CE_IPST_START:
|
||||||
/* state = CENSTATE_NONE; */
|
|
||||||
break;
|
|
||||||
#ifdef _WIN32_WCE
|
#ifdef _WIN32_WCE
|
||||||
case CE_IPST_OPENING_NETWORK:
|
case CE_IPST_OPENING_NETWORK:
|
||||||
case CE_IPST_NETWORK_OPENED:
|
case CE_IPST_NETWORK_OPENED:
|
||||||
#endif
|
#endif
|
||||||
|
/* state = CENSTATE_NONE; */
|
||||||
|
break;
|
||||||
case CE_IPST_RESOLVINGHOST:
|
case CE_IPST_RESOLVINGHOST:
|
||||||
case CE_IPST_HOSTRESOLVED:
|
case CE_IPST_HOSTRESOLVED:
|
||||||
case CE_IPST_CONNECTING:
|
case CE_IPST_CONNECTING:
|
||||||
|
@ -3196,6 +3196,7 @@ ce_relay_connd( void* closure, XP_Bool allHere, XP_U16 nMissing )
|
||||||
|
|
||||||
if ( allHere ) {
|
if ( allHere ) {
|
||||||
strID = IDS_RELAY_ALLHERE;
|
strID = IDS_RELAY_ALLHERE;
|
||||||
|
bit = SAB_ALL_HERE;
|
||||||
} else {
|
} else {
|
||||||
DeviceRole role = globals->gameInfo.serverRole;
|
DeviceRole role = globals->gameInfo.serverRole;
|
||||||
if ( role == SERVER_ISSERVER ) {
|
if ( role == SERVER_ISSERVER ) {
|
||||||
|
|
|
@ -96,8 +96,9 @@ typedef enum {
|
||||||
,SAB_NETFAILED = 1 << 1
|
,SAB_NETFAILED = 1 << 1
|
||||||
,SAB_HOST_CONND = 1 << 2
|
,SAB_HOST_CONND = 1 << 2
|
||||||
,SAB_CLIENT_CONND = 1 << 3
|
,SAB_CLIENT_CONND = 1 << 3
|
||||||
,SAB_HEART_YOU = 1 << 4
|
,SAB_ALL_HERE = 1 << 4
|
||||||
,SAB_HEART_OTHER = 1 << 5
|
,SAB_HEART_YOU = 1 << 5
|
||||||
|
,SAB_HEART_OTHER = 1 << 6
|
||||||
} SkipAlertBits;
|
} SkipAlertBits;
|
||||||
|
|
||||||
typedef struct CEAppPrefs {
|
typedef struct CEAppPrefs {
|
||||||
|
|
Loading…
Add table
Reference in a new issue