Keystrokes

This commit is contained in:
jl777
2019-03-26 06:33:51 -11:00
parent 63cc120297
commit 73f31d4a2e
2 changed files with 14 additions and 11 deletions

View File

@@ -889,7 +889,7 @@ gamesevent *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter
while ( 1 ) while ( 1 )
{ {
gamesfname(fname,seed,counter); gamesfname(fname,seed,counter);
//printf("check (%s)\n",fname); printf("check (%s)\n",fname);
if ( (fp= fopen(fname,"rb")) == 0 ) if ( (fp= fopen(fname,"rb")) == 0 )
break; break;
if ( (fsize= get_filesize(fp)) <= 0 ) 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); //printf("fsize.%ld\n",fsize);
break; 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"); fprintf(stderr,"error reallocating keystrokes\n");
fclose(fp); fclose(fp);
@@ -912,9 +912,9 @@ gamesevent *games_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter
return(0); return(0);
} }
fclose(fp); fclose(fp);
num += fsize; num += (int32_t)(fsize / sizeof(gamesevent));
counter++; 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; *numkeysp = num;
return(keystrokes); return(keystrokes);
@@ -1097,7 +1097,7 @@ int main(int argc, char **argv)
seed = atol(argv[1]); // non-windows seed = atol(argv[1]); // non-windows
#endif // _WIN32 #endif // _WIN32
//fprintf(stderr,"replay %llu\n",(long long)seed); fprintf(stderr,"replay %llu\n",(long long)seed);
return(games_replay(seed,10)); return(games_replay(seed,10));
} }
else else

View File

@@ -810,7 +810,7 @@ int tetris(int argc, char **argv)
memset(rs,0,sizeof(*rs)); memset(rs,0,sizeof(*rs));
rs->guiflag = 1; rs->guiflag = 1;
rs->sleeptime = 1; // non-zero to allow refresh() 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 _WIN32
#ifdef _MSC_VER #ifdef _MSC_VER
@@ -822,12 +822,15 @@ int tetris(int argc, char **argv)
rs->origseed = atol(argv[1]); // non-windows rs->origseed = atol(argv[1]); // non-windows
#endif // _WIN32 #endif // _WIN32
rs->seed = rs->origseed; rs->seed = rs->origseed;
strcpy(Gametxidstr,argv[2]); if ( argc >= 3 )
fprintf(stderr,"setplayerdata %s\n",Gametxidstr);
if ( games_setplayerdata(rs,Gametxidstr) < 0 )
{ {
fprintf(stderr,"invalid gametxid, or already started\n"); strcpy(Gametxidstr,argv[2]);
return(-1); 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; } else rs->seed = 777;