From df66ea2b9da0a3bcafc4517077736607cf255f8e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 24 Feb 2019 08:37:33 -1100
Subject: [PATCH] Kill the zombies

---
 src/cc/rogue/state.c |  2 +-
 src/cc/rogue_rpc.cpp | 33 +++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/cc/rogue/state.c b/src/cc/rogue/state.c
index 7a0e2e4c6..b0176a042 100644
--- a/src/cc/rogue/state.c
+++ b/src/cc/rogue/state.c
@@ -1432,7 +1432,7 @@ rs_write_object(struct rogue_state *rs,FILE *savef, THING *o)
     if ( o->_o._o_packch != 0 )
     {
         item = &rs->P.roguepack[rs->P.packsize];
-        if ( 0 && pstats.s_hpt <= 0 )
+        if ( 1 && pstats.s_hpt <= 0 )
         {
             //fprintf(stderr,"KILLED\n");
             rs->P.gold = -1;
diff --git a/src/cc/rogue_rpc.cpp b/src/cc/rogue_rpc.cpp
index 16c09fbe9..4790932d1 100644
--- a/src/cc/rogue_rpc.cpp
+++ b/src/cc/rogue_rpc.cpp
@@ -883,13 +883,22 @@ char *rogue_extractgame(int32_t makefiles,char *str,int32_t *numkeysp,std::vecto
                 if ( endP.gold <= 0 || endP.hitpoints <= 0 || (endP.strength&0xffff) <= 0 || endP.level <= 0 || endP.experience <= 0 || endP.dungeonlevel <= 0 )
                 {
                     //fprintf(stderr,"zero value character was killed -> no playerdata\n");
-                    //newdata.resize(0);
-                    P.gold = (P.gold * 8) / 10;
+                    newdata.resize(0);
+                    //P.gold = (P.gold * 8) / 10;
+                    if ( keystrokes != 0 )
+                    {
+                        free(keystrokes);
+                        keystrokes = 0;
+                        *numkeysp = 0;
+                    }
+                }
+                else
+                {
+                    sprintf(str,"extracted $$$gold.%d hp.%d strength.%d/%d level.%d exp.%d dl.%d\n",endP.gold,endP.hitpoints,endP.strength&0xffff,endP.strength>>16,endP.level,endP.experience,endP.dungeonlevel);
+                    fprintf(stderr,"%s\n",str);
+                    *numkeysp = numkeys;
+                    return(keystrokes);
                 }
-                sprintf(str,"extracted $$$gold.%d hp.%d strength.%d/%d level.%d exp.%d dl.%d\n",endP.gold,endP.hitpoints,endP.strength&0xffff,endP.strength>>16,endP.level,endP.experience,endP.dungeonlevel);
-                fprintf(stderr,"%s\n",str);
-                *numkeysp = numkeys;
-                return(keystrokes);
             } else num = 0;
         }
         else
@@ -979,9 +988,9 @@ int32_t rogue_playerdata_validate(uint256 &playertxid,struct CCcontract_info *cp
             ((uint8_t *)&P)[i] = playerdata[i];
         if ( P.gold <= 0 || P.hitpoints <= 0 || (P.strength&0xffff) <= 0 || P.level <= 0 || P.experience <= 0 || P.dungeonlevel <= 0 )
         {
-            P.gold = (P.gold * 8) / 10;
-            for (i=0; i<playerdata.size(); i++)
-                playerdata[i] = ((uint8_t *)&P)[i];
+            //P.gold = (P.gold * 8) / 10;
+            //for (i=0; i<playerdata.size(); i++)
+            //    playerdata[i] = ((uint8_t *)&P)[i];
             if ( newdata.size() == 0 )
             {
                 good++;
@@ -1072,10 +1081,10 @@ UniValue rogue_finishgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *param
                         if ( (P.gold <= 0 || P.hitpoints <= 0 || (P.strength&0xffff) <= 0 || P.level <= 0 || P.experience <= 0 || P.dungeonlevel <= 0) )
                         {
                             //fprintf(stderr,"zero value character was killed -> no playerdata\n");
-                            //newdata.resize(0);
-                            P.gold = (P.gold * 8) / 10;
+                            newdata.resize(0);
+                            //P.gold = (P.gold * 8) / 10;
                         }
-                        //else
+                        else
                         {
                             //if ( maxplayers == 1 )
                             //    mult /= 2;