DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rogue compile

Browse Source
This commit is contained in:
jl777
2019-03-26 19:59:13 -11:00
parent 8a7a1da70f
commit 2e8573c0ec
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cc/gamescc.cpp
View File

@@ -1510,15 +1510,8 @@ UniValue games_finish(uint64_t txfee,struct CCcontract_info *cp,cJSON *params,ch
result.push_back(Pair("method",method));
result.push_back(Pair("mygamesaddr",mygamesaddr));
if ( strcmp(method,"bailout") == 0 )
{
funcid = 'Q';
//mult = 10; //100000;
}
else
{
funcid = 'H';
//mult = 20; //200000;
}
else funcid = 'H';
if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 )
{
if ( n > 0 )
@@ -1570,13 +1563,13 @@ UniValue games_finish(uint64_t txfee,struct CCcontract_info *cp,cJSON *params,ch
fprintf(stderr,"\ncashout %.8f extracted %s\n",(double)cashout/COIN,str);
if ( funcid == 'H' && maxplayers > 1 )
{
if ( P.amulet == 0 )
/*if ( P.amulet == 0 )
{
if ( numplayers != maxplayers )
return(cclib_error(result,"numplayers != maxplayers"));
else if ( games_playersalive(tmp,tmp,gametxid,maxplayers,gameheight,gametx) > 1 )
return(cclib_error(result,"highlander must be a winner or last one standing"));
}
}*/
cashout += games_buyins(gametxid,maxplayers);//numplayers * buyin;
}
if ( cashout > 0 )

8
src/cc/rogue_rpc.cpp
View File

@@ -283,7 +283,7 @@ int32_t rogue_iamregistered(int32_t maxplayers,uint256 gametxid,CTransaction tx,
return(0);
}
int64_t rogue_buyins(uint256 gametxid)
int64_t rogue_buyins(uint256 gametxid,int32_t maxplayers)
{
int32_t i,vout; uint256 spenttxid,hashBlock; CTransaction spenttx; int64_t buyins = 0;
for (i=0; i<maxplayers; i++)
@@ -708,7 +708,7 @@ uint64_t rogue_gamefields(UniValue &obj,int64_t maxplayers,int64_t buyin,uint256
obj.push_back(Pair("alive",rogue_playersalive(openslots,numplayers,gametxid,maxplayers,ht,tx)));
obj.push_back(Pair("openslots",openslots));
obj.push_back(Pair("numplayers",numplayers));
obj.push_back(Pair("buyins",ValueFromAmount(rogue_buyins(gametxid))));
obj.push_back(Pair("buyins",ValueFromAmount(rogue_buyins(gametxid,maxplayers))));
}
obj.push_back(Pair("maxplayers",maxplayers));
obj.push_back(Pair("buyin",ValueFromAmount(buyin)));
@@ -1114,7 +1114,7 @@ UniValue rogue_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
int64_t rogue_cashout(struct rogue_player *P)
{
int32_t dungeonlevel; int64_t mult = 10;
int32_t dungeonlevel; int64_t cashout,mult = 10;
if ( P->amulet != 0 )
mult *= 5;
dungeonlevel = P->dungeonlevel;
@@ -1618,7 +1618,7 @@ bool rogue_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const C
if ( funcid == 'H' )
{
cashout *= 2;
cashout += rogue_buyins(gametxid);
cashout += rogue_buyins(gametxid,maxplayers);
}
sprintf(cashstr,"tokentx.(%c) decoded.%d ht.%d txid.%s %.8f vs vout2 %.8f",tokentx,decoded,height,txid.GetHex().c_str(),(double)cashout/COIN,(double)tx.vout[2].nValue/COIN);
if ( strcmp(laststr,cashstr) != 0 )