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

Remove minstrength check

Browse Source
This commit is contained in:
jl777
2019-02-17 23:46:14 -11:00
parent 9ef4ca1723
commit 9a48b245d4
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc/rogue/init.c
View File

@@ -28,9 +28,7 @@ void restore_player(struct rogue_state *rs)
//rs->P.gold = purse; //rs->P.gold = purse;
max_hp = rs->P.hitpoints; max_hp = rs->P.hitpoints;
pstats.s_str = rs->P.strength & 0xffff; pstats.s_str = rs->P.strength & 0xffff;
max_stats.s_str = rs->P.strength >> 16; max_stats.s_str = (rs->P.strength >> 16) & 0xffff;
if ( max_stats.s_str < 12 )
max_stats.s_str = 12;
if ( pstats.s_str > max_stats.s_str ) if ( pstats.s_str > max_stats.s_str )
pstats.s_str = max_stats.s_str; pstats.s_str = max_stats.s_str;
pstats.s_lvl = rs->P.level; pstats.s_lvl = rs->P.level;

23
src/cc/rogue_rpc.cpp
View File

@@ -1226,9 +1226,18 @@ bool rogue_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const C
if ( vopret.size() > 2 ) if ( vopret.size() > 2 )
{ {
script = (uint8_t *)vopret.data(); script = (uint8_t *)vopret.data();
if ( script[0] == EVAL_TOKENS )
{
if ( script[1] == 'c' )
{
}
else if ( script[1] == 't' )
{
} else return eval->Invalid("illegal tokens funcid");
}
if ( script[0] == EVAL_ROGUE ) if ( script[0] == EVAL_ROGUE )
{ {
switch ( script[1] ) switch ( funcid )
{ {
case 'G': // newgame case 'G': // newgame
case 'R': // register case 'R': // register
@@ -1242,18 +1251,6 @@ bool rogue_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const C
return eval->Invalid("illegal rogue funcid"); return eval->Invalid("illegal rogue funcid");
break; break;
} }
}
else if ( script[0] == EVAL_TOKENS )
{
fprintf(stderr,"ht.%d tokens.(%c)\n",height,script[1]);
if ( script[1] == 'c' )
{
return(true);
}
else
{
return(true);
}
} else return eval->Invalid("illegal evalcode"); } else return eval->Invalid("illegal evalcode");
} else return eval->Invalid("opret too small"); } else return eval->Invalid("opret too small");
} else return eval->Invalid("not enough vouts"); } else return eval->Invalid("not enough vouts");