From d5e641ee52b52239fa9d47be001206a7e211f9d8 Mon Sep 17 00:00:00 2001 From: ehouse Date: Sun, 27 Dec 2009 19:04:29 +0000 Subject: [PATCH] Add the ALL_HERE alert to the set not duplicated. --- xwords4/wince/cemain.c | 5 +++-- xwords4/wince/cemain.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xwords4/wince/cemain.c b/xwords4/wince/cemain.c index 2d7a202ea..7074b105d 100755 --- a/xwords4/wince/cemain.c +++ b/xwords4/wince/cemain.c @@ -1705,12 +1705,12 @@ ceFlattenState( const CEAppGlobals* globals ) } else { switch( socketState ) { case CE_IPST_START: -/* state = CENSTATE_NONE; */ - break; #ifdef _WIN32_WCE case CE_IPST_OPENING_NETWORK: case CE_IPST_NETWORK_OPENED: #endif +/* state = CENSTATE_NONE; */ + break; case CE_IPST_RESOLVINGHOST: case CE_IPST_HOSTRESOLVED: case CE_IPST_CONNECTING: @@ -3196,6 +3196,7 @@ ce_relay_connd( void* closure, XP_Bool allHere, XP_U16 nMissing ) if ( allHere ) { strID = IDS_RELAY_ALLHERE; + bit = SAB_ALL_HERE; } else { DeviceRole role = globals->gameInfo.serverRole; if ( role == SERVER_ISSERVER ) { diff --git a/xwords4/wince/cemain.h b/xwords4/wince/cemain.h index b486a9a4f..19f96fc29 100755 --- a/xwords4/wince/cemain.h +++ b/xwords4/wince/cemain.h @@ -96,8 +96,9 @@ typedef enum { ,SAB_NETFAILED = 1 << 1 ,SAB_HOST_CONND = 1 << 2 ,SAB_CLIENT_CONND = 1 << 3 - ,SAB_HEART_YOU = 1 << 4 - ,SAB_HEART_OTHER = 1 << 5 + ,SAB_ALL_HERE = 1 << 4 + ,SAB_HEART_YOU = 1 << 5 + ,SAB_HEART_OTHER = 1 << 6 } SkipAlertBits; typedef struct CEAppPrefs {