From 73f31d4a2edf3b780088f2acff03ac356028b929 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 26 Mar 2019 06:33:51 -1100
Subject: [PATCH] Keystrokes

---
 src/cc/dapps/dappstd.c | 10 +++++-----
 src/cc/tetris.c        | 15 +++++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/cc/dapps/dappstd.c b/src/cc/dapps/dappstd.c
index 3992cb80e..4f67f20e5 100644
--- a/src/cc/dapps/dappstd.c
+++ b/src/cc/dapps/dappstd.c
@@ -889,7 +889,7 @@ gamesevent *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter
     while ( 1 )
     {
         gamesfname(fname,seed,counter);
-        //printf("check (%s)\n",fname);
+        printf("check (%s)\n",fname);
         if ( (fp= fopen(fname,"rb")) == 0 )
             break;
         if ( (fsize= get_filesize(fp)) <= 0 )
@@ -898,7 +898,7 @@ gamesevent *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter
             //printf("fsize.%ld\n",fsize);
             break;
         }
-        if ( (keystrokes= (gamesevent *)realloc(keystrokes,sizeof(*keystrokes)*(num+fsize))) == 0 )
+        if ( (keystrokes= (gamesevent *)realloc(keystrokes,sizeof(*keystrokes)*num+fsize))) == 0 )
         {
             fprintf(stderr,"error reallocating keystrokes\n");
             fclose(fp);
@@ -912,9 +912,9 @@ gamesevent *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter
             return(0);
         }
         fclose(fp);
-        num += fsize;
+        num += (int32_t)(fsize / sizeof(gamesevent));
         counter++;
-        //fprintf(stderr,"loaded %ld from (%s) total %d\n",fsize,fname,num);
+        fprintf(stderr,"loaded %ld from (%s) total %d\n",fsize,fname,num);
     }
     *numkeysp = num;
     return(keystrokes);
@@ -1097,7 +1097,7 @@ int main(int argc, char **argv)
         seed = atol(argv[1]); // non-windows
 #endif // _WIN32
         
-        //fprintf(stderr,"replay %llu\n",(long long)seed);
+        fprintf(stderr,"replay %llu\n",(long long)seed);
         return(games_replay(seed,10));
     }
     else
diff --git a/src/cc/tetris.c b/src/cc/tetris.c
index 6b63bb008..5c3f742bb 100644
--- a/src/cc/tetris.c
+++ b/src/cc/tetris.c
@@ -810,7 +810,7 @@ int tetris(int argc, char **argv)
     memset(rs,0,sizeof(*rs));
     rs->guiflag = 1;
     rs->sleeptime = 1; // non-zero to allow refresh()
-    if ( argc == 3 && strlen(argv[2]) == 64 )
+    if ( argc >= 2 && strlen(argv[2]) == 64 )
     {
 #ifdef _WIN32
 #ifdef _MSC_VER
@@ -822,12 +822,15 @@ int tetris(int argc, char **argv)
         rs->origseed = atol(argv[1]); // non-windows
 #endif // _WIN32
         rs->seed = rs->origseed;
-        strcpy(Gametxidstr,argv[2]);
-        fprintf(stderr,"setplayerdata %s\n",Gametxidstr);
-        if ( games_setplayerdata(rs,Gametxidstr) < 0 )
+        if ( argc >= 3 )
         {
-            fprintf(stderr,"invalid gametxid, or already started\n");
-            return(-1);
+            strcpy(Gametxidstr,argv[2]);
+            fprintf(stderr,"setplayerdata %s\n",Gametxidstr);
+            if ( games_setplayerdata(rs,Gametxidstr) < 0 )
+            {
+                fprintf(stderr,"invalid gametxid, or already started\n");
+                return(-1);
+            }
         }
     } else rs->seed = 777;