From 1a6dcc079fb03e8a6e83b24062d1d689e8227196 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 5 Feb 2019 23:50:34 -1100 Subject: [PATCH] -gametxid --- src/cc/rogue/rogue.c | 18 ++++++++++++++++-- src/cc/rogue_rpc.cpp | 15 +-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/cc/rogue/rogue.c b/src/cc/rogue/rogue.c index 56316808c..f43b81a68 100644 --- a/src/cc/rogue/rogue.c +++ b/src/cc/rogue/rogue.c @@ -22,6 +22,7 @@ */ struct rogue_state globalR; void garbage_collect(); +char Gametxidstr[67]; void purge_obj_guess(struct obj_info *array,int32_t n) { @@ -139,6 +140,17 @@ int32_t flushkeystrokes(struct rogue_state *rs) } #else +void rogue_progress(uint64_t seed,char *keystrokes,int32_t num) // use seed to lookup gametxid +{ + char cmd[32768],hexstr[32768]; int32_t i; + for (i=0; iseed,rs->buffered,rs->num); @@ -238,9 +250,11 @@ int rogue(int argc, char **argv, char **envp) { char *env; int lowtime; struct rogue_state *rs = &globalR; memset(rs,0,sizeof(*rs)); - if ( argc == 3 && strcmp(argv[2],"gui") == 0 ) + if ( argc == 3 && strlen(argv[2]) == 64 ) + { rs->seed = atol(argv[1]); - else rs->seed = 777; + strcpy(Gametxidstr,argv[2]); + } else rs->seed = 777; rs->guiflag = 1; rs->sleeptime = 1; // non-zero to allow refresh() md_init(); diff --git a/src/cc/rogue_rpc.cpp b/src/cc/rogue_rpc.cpp index f8c575c4c..10d509b9b 100644 --- a/src/cc/rogue_rpc.cpp +++ b/src/cc/rogue_rpc.cpp @@ -21,8 +21,6 @@ #define ROGUE_MAXPLAYERS 64 // need to send unused fees back to globalCC address to prevent leeching #define ROGUE_MAXKEYSTROKESGAP 60 -uint256 Gametxid; - /* the idea is that you creategame and get a txid, you specify the maxplayers and buyin for the game. the tx will have maxplayers of vouts. You must have a non-zero buyin to be able to use a preexisting character. @@ -218,7 +216,7 @@ void rogue_gamefields(UniValue &obj,int64_t maxplayers,int64_t buyin,uint256 gam seed &= (1LL << 62) - 1; obj.push_back(Pair("seed",(int64_t)seed)); if ( rogue_iamregistered(maxplayers,gametxid,tx,myrogueaddr) > 0 ) - sprintf(cmd,"./rogue %llu gui",(long long)seed); + sprintf(cmd,"./rogue %llu %s",(long long)seed,gametxid.ToString().c_str()); else sprintf(cmd,"./komodo-cli -ac_name=%s cclib register %d \"[%%22%s%%22]\"",ASSETCHAINS_SYMBOL,EVAL_ROGUE,gametxid.ToString().c_str()); obj.push_back(Pair("run",cmd)); } @@ -590,17 +588,6 @@ UniValue rogue_keystrokes(uint64_t txfee,struct CCcontract_info *cp,cJSON *param } else return(cclib_error(result,"couldnt reparse params")); } -void rogue_progress(uint64_t seed,char *keystrokes,int32_t num) -{ - char cmd[32768],hexstr[32768]; int32_t i; - for (i=0; i highlander vout from creategame TCBOO