Jl777 (#1315)

* Remove voutsum check * Teach RPC interface about dpow-enabled minconfs (#1231) * Make minconfs dpow-aware in z_listunspent + z_listreceivedbyaddress * Add dpow-related test files to test suite * Add dpow simulation to regtest every 7 blocks * Fix compiler errors * Fix link error * Fix stdout spam when running regtests * Dpowminconfs for listreceivedbyaddress * dpowconfs tests * Start adding specific tests for dpowminconfs in listreceivedbyaddress * Get dpowminconfs tests for listreceivedbyaddress working * Add dpowminconfs to getreceivedbyaddress + listunspent * Add test for listtransactions + getreceivedbyaddress support * Reliably passing dpowminconf tests. We only check for notarized-ness now, not exact confirmation numbers, to avoid race conditions * Poll for the expected notarization info before running further tests; add support for getbalance * Migrate tx_height() to a place where asyncrpcoperation_sendmany.cpp can use it * fix * Teach GetFilteredNotes about dpowconfs Many RPCs rely on this internal function, which now correctly uses dpowconfs to filter by the minconf/maxconf parameters. * Fix sendmany when using non-default minconf * inline seems to make things happy * cleanup * Add some code to test z_sendmany, which points out https://github.com/jl777/komodo/issues/1247 * try this * Use already calculated value of dpowconfs instead of calculating it again * Cleanup .pack file * Remove * Remove .pack * Disable passkeys * Rvalidate * Syntax * Allow overwrite by same pub33 * Tx * Declare variables * Allow replacement handle * Grandfather existing handles * Test * Handleinfo * Char * * Begin * Add mutex * CCaddr * Casts for windows * +debugs * Syntax * Item * Skeet * +print * Error check things * +prints * -sleep * Brute force inventory check * Revert * num_packitems * Log file * Test * ABC * Test * Add help docs for all -ac_* params of komodod (#1313) * Remove myAddress from roc * +print * Test * Test * Leave pack all * Dont discard unless last o_count * Prevent pack corruption * -ddebugs * Merge branch 'FSM' into jl777 # Conflicts: # src/cc/rogue/main.c
2019-03-06 03:38:14 -11:00
parent a6e030004f
commit 100eac1654
19 changed files with 449 additions and 150 deletions
--- a/src/cc/rogue/fight.c
+++ b/src/cc/rogue/fight.c
@@ -290,27 +290,27 @@ attack(struct rogue_state *rs,THING *mp)
 		}
 		when 'N':
 		{
-		    register THING *obj, *steal;
-		    register int nobj;
-
-		    /*
-		     * Nymph's steal a magic item, look through the pack
-		     * and pick out one we like.
-		     */
-		    steal = NULL;
-		    for (nobj = 0, obj = pack; obj != NULL; obj = next(obj))
-			if (obj != cur_armor && obj != cur_weapon
-			    && obj != cur_ring[LEFT] && obj != cur_ring[RIGHT]
-			    && is_magic(obj) && rnd(++nobj) == 0)
-				steal = obj;
-		    if (steal != NULL)
-		    {
-			remove_mon(rs,&mp->t_pos, moat(mp->t_pos.y, mp->t_pos.x), FALSE);
-                        mp=NULL;
-			leave_pack(rs,steal, FALSE, FALSE);
-			msg(rs,"she stole %s!", inv_name(steal, TRUE));
-			discard(steal);
-		    }
+            THING *obj, *steal; int nobj;
+            
+            /*
+             * Nymph's steal a magic item, look through the pack
+             * and pick out one we like.
+             */
+            steal = NULL;
+            for (nobj = 0, obj = pack; obj != NULL; obj = next(obj))
+                if (obj != cur_armor && obj != cur_weapon
+                    && obj != cur_ring[LEFT] && obj != cur_ring[RIGHT]
+                    && is_magic(obj) && rnd(++nobj) == 0)
+                    steal = obj;
+            if (steal != NULL)
+            {
+                remove_mon(rs,&mp->t_pos, moat(mp->t_pos.y, mp->t_pos.x), FALSE);
+                mp=NULL;
+                leave_pack(rs,steal, FALSE, FALSE);
+                msg(rs,"she stole %s!", inv_name(steal, TRUE));
+                if ( steal->o_count <= 0 )
+                    discard(steal);
+            }
 		}
 		otherwise:
 		    break;
@@ -594,26 +594,24 @@ void
 remove_mon(struct rogue_state *rs,coord *mp, THING *tp, bool waskill)
 {
    register THING *obj, *nexti;
-
    for (obj = tp->t_pack; obj != NULL; obj = nexti)
    {
-	nexti = next(obj);
-	obj->o_pos = tp->t_pos;
-	detach(tp->t_pack, obj);
-	if (waskill)
-	    fall(rs,obj, FALSE);
-	else
-	    discard(obj);
+        nexti = next(obj);
+        obj->o_pos = tp->t_pos;
+        detach(tp->t_pack, obj);
+        if (waskill)
+            fall(rs,obj, FALSE);
+        else discard(obj);
    }
    moat(mp->y, mp->x) = NULL;
    mvaddch(mp->y, mp->x, tp->t_oldch);
    detach(mlist, tp);
    if (on(*tp, ISTARGET))
    {
-	kamikaze = FALSE;
-	to_death = FALSE;
-	if (fight_flush)
-	    flush_type();
+        kamikaze = FALSE;
+        to_death = FALSE;
+        if (fight_flush)
+            flush_type();
    }
    discard(tp);
 }