diff --git a/src/cc/rogue/rip.c b/src/cc/rogue/rip.c index 56f2453a4..032cc1b6d 100644 --- a/src/cc/rogue/rip.c +++ b/src/cc/rogue/rip.c @@ -46,12 +46,14 @@ static char *rip[] = { /* VARARGS2 */ void -score(int amount, int flags, char monst) +score(struct rogue_state *rs,int amount, int flags, char monst) { SCORE *scp; int i; SCORE *sc2; SCORE *top_ten, *endp; + if ( rs->guiflag == 0 ) + return; # ifdef MASTER int prflags = 0; # endif @@ -274,7 +276,7 @@ death(struct rogue_state *rs,char monst) } move(LINES - 1, 0); refresh(); - score(purse, amulet ? 3 : 0, monst); + score(rs,purse, amulet ? 3 : 0, monst); rogue_bailout(); printf("[Press return to continue]"); fflush(stdout); @@ -390,7 +392,7 @@ total_winner(struct rogue_state *rs) } printw(" %5d Gold Pieces ", oldpurse); refresh(); - score(purse, 2, ' '); + score(rs,purse, 2, ' '); my_exit(0); } diff --git a/src/cc/rogue/rogue.c b/src/cc/rogue/rogue.c index a0278f38a..8db8cabca 100644 --- a/src/cc/rogue/rogue.c +++ b/src/cc/rogue/rogue.c @@ -384,7 +384,7 @@ int rogue(int argc, char **argv, char **envp) if (strcmp(argv[1], "-s") == 0) { noscore = TRUE; - score(0, -1, 0); + score(rs,0, -1, 0); exit(0); } else if (strcmp(argv[1], "-d") == 0) @@ -602,14 +602,14 @@ quit(int sig) move(LINES - 1, 0); if ( rs->sleeptime != 0 ) refresh(); - score(purse, 1, 0); + score(rs,purse, 1, 0); flushkeystrokes(rs); my_exit(0); } else { fprintf(stderr,"done!\n"); - score(purse, 1, 0); + score(rs,purse, 1, 0); } } else diff --git a/src/cc/rogue/rogue.h b/src/cc/rogue/rogue.h index 6543976da..6e9a6600f 100644 --- a/src/cc/rogue/rogue.h +++ b/src/cc/rogue/rogue.h @@ -698,7 +698,7 @@ int save(int which); void save_file(struct rogue_state *rs,FILE *savef,int32_t guiflag); void save_game(struct rogue_state *rs); int save_throw(int which, THING *tp); -void score(int amount, int flags, char monst); +void score(struct rogue_state *rs,int amount, int flags, char monst); void search(struct rogue_state *rs); void set_know(THING *obj, struct obj_info *info); void set_oldch(THING *tp, coord *cp); diff --git a/src/cc/rogue_rpc.cpp b/src/cc/rogue_rpc.cpp index 446b3f224..fe898e363 100644 --- a/src/cc/rogue_rpc.cpp +++ b/src/cc/rogue_rpc.cpp @@ -464,13 +464,13 @@ int32_t rogue_findbaton(struct CCcontract_info *cp,uint256 &playertxid,char **ke if ( myIsutxo_spent(spenttxid,gametxid,maxplayers+i+1) < 0 ) { numvouts = matchtx.vout.size(); - fprintf(stderr,"matches.%d numvouts.%d\n",matches,numvouts); + //fprintf(stderr,"matches.%d numvouts.%d\n",matches,numvouts); if ( rogue_registeropretdecode(txid,playertxid,matchtx.vout[numvouts-1].scriptPubKey) == 'R' && txid == gametxid ) { if ( playertxid == zeroid || rogue_playerdata(cp,origplayergame,pk,playerdata,playertxid) == 0 ) { txid = matchtx.GetHash(); - fprintf(stderr,"scan forward playertxid.%s spenttxid.%s\n",playertxid.GetHex().c_str(),txid.GetHex().c_str()); + //fprintf(stderr,"scan forward playertxid.%s spenttxid.%s\n",playertxid.GetHex().c_str(),txid.GetHex().c_str()); while ( CCgettxout(txid,0,1) < 0 ) { spenttxid = zeroid; @@ -497,7 +497,7 @@ int32_t rogue_findbaton(struct CCcontract_info *cp,uint256 &playertxid,char **ke } } } - fprintf(stderr,"set baton %s\n",txid.GetHex().c_str()); + //fprintf(stderr,"set baton %s\n",txid.GetHex().c_str()); batontxid = txid; batonvout = 0; // not vini // how to detect timeout, bailedout, highlander @@ -797,7 +797,6 @@ UniValue rogue_finishgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *param result.push_back(Pair("gametxid",gametxid.GetHex())); if ( (err= rogue_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid)) == 0 ) { - fprintf(stderr,"validgame\n"); if ( maxplayers == 1 ) mult /= 2; if ( rogue_findbaton(cp,playertxid,&keystrokes,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,gametx,maxplayers,myrogueaddr,numplayers) == 0 )