From e96b3bf96ae29acd188baa7f336313c8e48c9d9e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 26 Mar 2019 04:34:08 -1100
Subject: [PATCH] Gamesevent

---
 src/cc/dapps/dappstd.c | 43 +++++++++++++++++++++++++-----------------
 src/cc/tetris.c        | 18 +++++++++---------
 src/cc/tetris.cpp      |  6 +++---
 src/cc/tetris.h        |  8 +++++---
 4 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/cc/dapps/dappstd.c b/src/cc/dapps/dappstd.c
index a5ef379db..05f4fe332 100644
--- a/src/cc/dapps/dappstd.c
+++ b/src/cc/dapps/dappstd.c
@@ -249,7 +249,7 @@ int32_t safecopy(char *dest,char *src,long len)
 //#endif
 
 int32_t games_replay(uint64_t seed,int32_t sleeptime);
-char *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter);
+gamesevent *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter);
 
 int GAMEMAIN(int argc, char **argv);
 
@@ -735,9 +735,9 @@ int32_t games_sendrawtransaction(char *rawtx)
     return(retval);
 }
 
-int32_t games_progress(struct games_state *rs,int32_t waitflag,uint64_t seed,char *keystrokes,int32_t num)
+int32_t games_progress(struct games_state *rs,int32_t waitflag,uint64_t seed,gamesevent *keystrokes,int32_t num)
 {
-    char cmd[16384],hexstr[16384],params[32768],*retstr,*errstr,*rawtx,*pastkeys,*keys; int32_t i,len,numpastkeys,retflag = -1; cJSON *retjson,*resobj; uint8_t *pastcmp;
+    char cmd[16384],hexstr[16384],params[32768],*retstr,*errstr,*rawtx; int32_t i,len,retflag = -1; cJSON *retjson,*resobj;
     if ( rs->guiflag != 0 && Gametxidstr[0] != 0 )
     {
         if ( rs->keystrokeshex != 0 )
@@ -757,9 +757,18 @@ int32_t games_progress(struct games_state *rs,int32_t waitflag,uint64_t seed,cha
             }
             free(rs->keystrokeshex), rs->keystrokeshex = 0;
         }
+        memset(hexstr,0,sizeof(hexstr));
         for (i=0; i<num; i++)
-            sprintf(&hexstr[i<<1],"%02x",keystrokes[i]&0xff);
-        hexstr[i<<1] = 0;
+        {
+            if ( sizeof(gamesevent) ==  1 )
+                sprintf(&hexstr[i<<1],"%02x",keystrokes[i]&0xff);
+            else if ( sizeof(gamesevent) ==  2 )
+                sprintf(&hexstr[i<<2],"%04x",keystrokes[i]&0xffff);
+            else if ( sizeof(gamesevent) ==  4 )
+                sprintf(&hexstr[i<<3],"%08x",keystrokes[i]&0xffffffff);
+            else if ( sizeof(gamesevent) ==  8 )
+                sprintf(&hexstr[i<<4],"%016x",keystrokes[i]&0xffffffffffffffff);
+        }
         static FILE *fp;
         if ( fp == 0 )
             fp = fopen("keystrokes.log","a");
@@ -808,7 +817,7 @@ int32_t flushkeystrokes_local(struct games_state *rs,int32_t waitflag)
     gamesfname(fname,rs->origseed,rs->counter);
     if ( (fp= fopen(fname,"wb")) != 0 )
     {
-        if ( fwrite(rs->buffered,1,rs->num,fp) == rs->num )
+        if ( fwrite(rs->buffered,sizeof(*rs->buffered),rs->num,fp) == rs->num )
         {
             rs->num = 0;
             retflag = 0;
@@ -864,7 +873,7 @@ void games_bailout(struct games_state *rs)
 #endif
 #endif
 
-int32_t games_replay2(uint8_t *newdata,uint64_t seed,char *keystrokes,int32_t num,struct games_player *player,int32_t sleepmillis)
+int32_t games_replay2(uint8_t *newdata,uint64_t seed,gamesevent *keystrokes,int32_t num,struct games_player *player,int32_t sleepmillis)
 {
     struct games_state *rs; FILE *fp; int32_t i,n; void *ptr;
     rs = (struct games_state *)calloc(1,sizeof(*rs));
@@ -930,9 +939,9 @@ long get_filesize(FILE *fp)
     return(fsize);
 }
 
-char *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter)
+gamesevent *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter)
 {
-    char fname[1024],*keystrokes = 0; FILE *fp; long fsize; int32_t num = 0;
+    char fname[1024]; gamesevent *keystrokes = 0; FILE *fp; long fsize; int32_t num = 0;
     *numkeysp = 0;
     while ( 1 )
     {
@@ -946,7 +955,7 @@ char *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter)
             //printf("fsize.%ld\n",fsize);
             break;
         }
-        if ( (keystrokes= (char *)realloc(keystrokes,num+fsize)) == 0 )
+        if ( (keystrokes= (char *)realloc(keystrokes,sizeof(*keystrokes)*(num+fsize))) == 0 )
         {
             fprintf(stderr,"error reallocating keystrokes\n");
             fclose(fp);
@@ -983,7 +992,7 @@ void games_exit()
 
 int32_t games_replay(uint64_t seed,int32_t sleeptime)
 {
-    FILE *fp; char fname[1024]; char *keystrokes = 0; long fsize; int32_t i,num=0,counter = 0; struct games_state *rs; struct games_player P,*player = 0;
+    FILE *fp; char fname[1024]; gamesevent *keystrokes = 0; long fsize; int32_t i,num=0,counter = 0; struct games_state *rs; struct games_player P,*player = 0;
     if ( seed == 0 )
         seed = 777;
     keystrokes = games_keystrokesload(&num,seed,counter);
@@ -1009,15 +1018,15 @@ int32_t games_replay(uint64_t seed,int32_t sleeptime)
     return(num);
 }
 
-char games_readchar(struct games_state *rs)
+gamesevent games_readevent(struct games_state *rs)
 {
-    char ch = -1; int32_t c;
+    gamesevent ch = -1; int32_t c;
     if ( rs != 0 && rs->guiflag == 0 )
     {
         static uint32_t counter;
         if ( rs->ind < rs->numkeys )
         {
-            c = rs->keystrokes[rs->ind++];
+            ch = rs->keystrokes[rs->ind++];
             if ( 0 )
             {
                 static FILE *fp; static int32_t counter;
@@ -1030,7 +1039,7 @@ char games_readchar(struct games_state *rs)
                     counter++;
                 }
             }
-            return(c);
+            return(ch);
         }
         if ( rs->replaydone != 0 && counter++ < 3 )
             fprintf(stderr,"replay finished but readchar called\n");
@@ -1065,7 +1074,7 @@ char games_readchar(struct games_state *rs)
         {
             if ( rs->num < sizeof(rs->buffered) )
             {
-                rs->buffered[rs->num++] = c;
+                rs->buffered[rs->num++] = ch;
                 if ( rs->num > (sizeof(rs->buffered)*9)/10 && rs->needflush == 0 )
                 {
                     rs->needflush = (uint32_t)time(NULL);
@@ -1075,7 +1084,7 @@ char games_readchar(struct games_state *rs)
             } else fprintf(stderr,"buffer filled without flushed\n");
         }
     } else fprintf(stderr,"readchar rs.%p non-gui error?\n",rs);
-    return(c);
+    return(ch);
 }
 
 int32_t games_setplayerdata(struct games_state *rs,char *gametxidstr)
diff --git a/src/cc/tetris.c b/src/cc/tetris.c
index 5ddb10ca4..048a701f5 100644
--- a/src/cc/tetris.c
+++ b/src/cc/tetris.c
@@ -640,13 +640,13 @@ void init_colors(void)
  */
 #include "dapps/dappstd.c"
 
-int32_t issue_games_events(struct games_state *rs,char *gametxidstr,uint32_t eventid,char c)
+int32_t issue_games_events(struct games_state *rs,char *gametxidstr,uint32_t eventid,int16_t c)
 {
     static FILE *fp;
     char params[512],*retstr; cJSON *retjson,*resobj; int32_t retval = -1;
     if ( fp == 0 )
         fp = fopen("events.log","wb");
-    sprintf(params,"[\"events\",\"17\",\"[%%22%02x%%22,%%22%s%%22,%u]\"]",c&0xff,gametxidstr,eventid);
+    sprintf(params,"[\"events\",\"17\",\"[%%22%04x%%22,%%22%s%%22,%u]\"]",c&0xffff,gametxidstr,eventid);
     if ( (retstr= komodo_issuemethod(USERPASS,(char *)"cclib",params,GAMES_PORT)) != 0 )
     {
         if ( (retjson= cJSON_Parse(retstr)) != 0 )
@@ -689,7 +689,7 @@ struct games_state globalR;
 void *gamesiterate(struct games_state *rs)
 {
     uint32_t counter = 0; bool running = true; tetris_move move = TM_NONE;
-    int32_t c,skipcount=0; uint32_t eventid = 0; tetris_game *tg;
+    gamesevent c; uint16_t skipcount=0; uint32_t eventid = 0; tetris_game *tg;
     WINDOW *board, *next, *hold, *score;
     // Create windows for each section of the interface.
     tg = tg_create(rs,22, 10);
@@ -709,11 +709,11 @@ void *gamesiterate(struct games_state *rs)
             if ( (counter++ % 5) == 0 )
                 doupdate();
             sleep_milli(10);
-            c = games_readchar(rs);
-            if ( c >= 0 || skipcount == 0x7f )
+            c = games_readevent(rs);
+            if ( c >= 0 || skipcount == 0x3fff )
             {
                 if ( skipcount > 0 )
-                    issue_games_events(rs,Gametxidstr,eventid-skipcount,skipcount | 0x80);
+                    issue_games_events(rs,Gametxidstr,eventid-skipcount,skipcount | 0x4000);
                 if ( c >= 0 )
                     issue_games_events(rs,Gametxidstr,eventid,c);
                 skipcount = 0;
@@ -723,10 +723,10 @@ void *gamesiterate(struct games_state *rs)
         {
             if ( skipcount == 0 )
             {
-                c = games_readchar(rs);
-                if ( (c & 0x80) != 0 )
+                c = games_readevent(rs);
+                if ( (c & 0x4000) == 0x4000 )
                 {
-                    skipcount = (c & 0x7f);
+                    skipcount = (c & 0x3fff);
                     c = 'S';
                 }
             }
diff --git a/src/cc/tetris.cpp b/src/cc/tetris.cpp
index f9e4e167a..a20652012 100644
--- a/src/cc/tetris.cpp
+++ b/src/cc/tetris.cpp
@@ -42,9 +42,9 @@ int32_t games_payloadrecv(CPubKey pk,uint32_t timestamp,std::vector<uint8_t> pay
         eventid |= (uint32_t)payload[len+33] << 8;
         eventid |= (uint32_t)payload[len+34] << 16;
         eventid |= (uint32_t)payload[len+35] << 24;
-        for (i=0; i<len; i++)
-            fprintf(stderr,"%02x",payload[i]);
-        fprintf(stderr," got payload, from %s %s/e%d\n",pubkey33_str(str,(uint8_t *)&pk),gametxid.GetHex().c_str(),eventid);
+        //for (i=0; i<len; i++)
+        //    fprintf(stderr,"%02x",payload[i]);
+        //fprintf(stderr," got payload, from %s %s/e%d\n",pubkey33_str(str,(uint8_t *)&pk),gametxid.GetHex().c_str(),eventid);
         return(0);
     } else return(-1);
 }
diff --git a/src/cc/tetris.h b/src/cc/tetris.h
index 317dad62b..3c246a3bd 100644
--- a/src/cc/tetris.h
+++ b/src/cc/tetris.h
@@ -180,16 +180,18 @@ struct games_player
     struct games_packitem gamespack[MAXPACK];
 };
 
+typedef uint16_t gamesevent;
+
 struct games_state
 {
     uint64_t seed,origseed;
-    char *keystrokes,*keystrokeshex;
+    char *keystrokeshex;
     uint32_t needflush,replaydone;
     int32_t numkeys,ind,num,guiflag,counter,sleeptime,playersize,restoring,lastnum;
     FILE *logfp;
     struct games_player P;
-    char buffered[10000];
-    uint8_t playerdata[10000];
+    gamesevent buffered[5000],*keystrokes;
+    uint8_t playerdata[1024];
 };
 
 uint64_t _games_rngnext(uint64_t initseed);