From 8277d3736adf30fdf8c9d7b12320b876e63f74ca Mon Sep 17 00:00:00 2001 From: ehouse Date: Thu, 22 Jun 2006 04:57:46 +0000 Subject: [PATCH] Use new xplatform newgame logic to replace palm's in newgame.c, and make other changes (shifting util functions around) that follow from that. Back version number down to 4.1.5 since that'll be the next shipped from this branch. Add juggle button to newgame -- the whole point of this. --- palm/palmmain.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/palm/palmmain.h b/palm/palmmain.h index 2dd9e4ded..7eebe438e 100644 --- a/palm/palmmain.h +++ b/palm/palmmain.h @@ -37,6 +37,7 @@ #include "game.h" #include "util.h" #include "mempool.h" +#include "nwgamest.h" /* #include "prefsdlg.h" */ #include "xwcolors.h" @@ -192,14 +193,12 @@ typedef struct DictState { } DictState; typedef struct PalmNewGameState { + FormPtr form; ListPtr playerNumList; - XP_UCHAR* passwds[MAX_NUM_PLAYERS]; + NewGameCtx* ngc; + XP_UCHAR passwds[MAX_PASSWORD_LENGTH+1][MAX_NUM_PLAYERS]; XP_UCHAR* dictName; - XP_Bool isLocal[MAX_NUM_PLAYERS]; - XP_Bool isRobot[MAX_NUM_PLAYERS]; XP_UCHAR shortDictName[32]; /* as long as a dict name can be */ - XP_U8 curNPlayersLocal; - XP_U8 curNPlayersTotal; XP_Bool forwardChange; Connectedness curServerHilite; #ifdef BEYOND_IR