From b50a9670ce7cdaa6cb927cf48706b4b316ae760a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 10 Feb 2019 03:21:25 -1100
Subject: [PATCH] Restore

---
 src/cc/rogue/rogue.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/cc/rogue/rogue.c b/src/cc/rogue/rogue.c
index c2f8c667b..4aaab985c 100644
--- a/src/cc/rogue/rogue.c
+++ b/src/cc/rogue/rogue.c
@@ -146,9 +146,9 @@ int32_t flushkeystrokes(struct rogue_state *rs)
 uint8_t *OS_fileptr(long *allocsizep,char *fname);
 #define is_cJSON_True(json) ((json) != 0 && ((json)->type & 0xff) == cJSON_True)
 
-void rogue_setplayerdata(struct rogue_state *rs,char *gametxidstr)
+int32_t rogue_setplayerdata(struct rogue_state *rs,char *gametxidstr)
 {
-    char cmd[32768]; int32_t i,n; char *filestr,*datastr,fname[128]; long allocsize; cJSON *retjson,*array,*item;
+    char cmd[32768]; int32_t i,n,retval=-1; char *filestr,*statusstr,*datastr,fname[128]; long allocsize; cJSON *retjson,*array,*item;
     sprintf(fname,"%s.gameinfo",gametxidstr);
     sprintf(cmd,"./komodo-cli -ac_name=ROGUE cclib gameinfo 17 \\\"[%%22%s%%22]\\\" > %s",gametxidstr,fname);
     if ( system(cmd) != 0 )
@@ -163,13 +163,17 @@ void rogue_setplayerdata(struct rogue_state *rs,char *gametxidstr)
                 for (i=0; i<n; i++)
                 {
                     item = jitem(array,i);
-                    if ( is_cJSON_True(jobj(item,"ismine")) != 0 )
+                    if ( is_cJSON_True(jobj(item,"ismine")) != 0 && (statusstr= jstr(item,"status")) != 0 )
                     {
-                        if ( (item= jobj(item,"player")) != 0 && (datastr= jstr(item,"data")) != 0 )
+                        if ( strcmp(statusstr,"registered") == 0 )
                         {
-                            decode_hex((uint8_t *)&rs->P,(int32_t)strlen(datastr)/2,datastr);
-                            //fprintf(stderr,"set datastr[%d]\n",(int32_t)strlen(datastr));
-                            rs->restoring = 1;
+                            retval = 0;
+                            if ( (item= jobj(item,"player")) != 0 && (datastr= jstr(item,"data")) != 0 )
+                            {
+                                decode_hex((uint8_t *)&rs->P,(int32_t)strlen(datastr)/2,datastr);
+                                //fprintf(stderr,"set datastr[%d]\n",(int32_t)strlen(datastr));
+                                rs->restoring = 1;
+                            }
                         }
                     }
                 }
@@ -178,6 +182,7 @@ void rogue_setplayerdata(struct rogue_state *rs,char *gametxidstr)
         }
         free(filestr);
     }
+    return(retval);
 }
 
 void rogue_progress(uint64_t seed,char *keystrokes,int32_t num) // use seed to lookup gametxid
@@ -209,7 +214,11 @@ int32_t rogue_replay2(uint8_t *newdata,uint64_t seed,char *keystrokes,int32_t nu
     rs->numkeys = num;
     rs->sleeptime = 0;
     if ( player != 0 )
+    {
         rs->P = *player;
+        rs->restoring = 1;
+        fprintf(stderr,"restore player\n");
+    }
     uint32_t starttime = (uint32_t)time(NULL);
     rogueiterate(rs);
     /*fprintf(stderr,"elapsed %d seconds\n",(uint32_t)time(NULL) - starttime);
@@ -298,7 +307,11 @@ int rogue(int argc, char **argv, char **envp)
     {
         rs->seed = atol(argv[1]);
         strcpy(Gametxidstr,argv[2]);
-        rogue_setplayerdata(rs,Gametxidstr);
+        if ( rogue_setplayerdata(rs,Gametxidstr) < 0 )
+        {
+            fprintf(stderr,"invalid gametxid, or already started\n");
+            return(-1);
+        }
     } else rs->seed = 777;
     rs->guiflag = 1;
     rs->sleeptime = 1; // non-zero to allow refresh()