Mercurial > hg > early-roguelike

changeset 111:7f8f43943b1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some terribly depressing corruption during restore. In rogue5/state.c, rs_read_daemons() zeroes out the argument and delay if the daemon slot is empty. Unfortunately that code ended up on the wrong side of the brace that closes the for loop, so instead of running after each daemon, it got run once after the loop exited, when the index was of course out of bounds. This tended to manifest, when compiled with -O2, by overwriting hw and setting it to NULL. When inventory() next ran, hw would be passed to wgetch(), which returns ERR when it gets a NULL argument. This made md_readchar() think something was wrong and autosave the game. Upon investigation, rogue3 was found to commit the same mistake. rogue4 and srogue don't zero the data. arogue5 already does it properly. Someday I am going to run all this through Valgrind. Someday when I am a kinder person who will not be driven to invoke hordes of trolls and centaurs upon the original authors.
author John "Elwin" Edwards
date Wed, 08 Jan 2014 16:44:16 -0500
parents 5f51f7d9805f
children ee250e3646fd
files rogue3/state.c rogue5/state.c
diffstat 2 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/rogue3/state.c	Mon Jan 06 15:57:17 2014 -0500
+++ b/rogue3/state.c	Wed Jan 08 16:44:16 2014 -0500
@@ -681,14 +681,13 @@
             default:dlist[i].d_func = NULL;
                     break;
 	}   
+        if (dlist[i].d_func == NULL)
+        {
+            dlist[i].d_type = 0;
+            dlist[i].d_arg = 0;
+            dlist[i].d_time = 0;
+        } 
     }
-
-    if (dlist[i].d_func == NULL)
-    {
-        dlist[i].d_type = 0;
-        dlist[i].d_arg = 0;
-        dlist[i].d_time = 0;
-    } 
 }       
 
 void
--- a/rogue5/state.c	Mon Jan 06 15:57:17 2014 -0500
+++ b/rogue5/state.c	Wed Jan 08 16:44:16 2014 -0500
@@ -660,14 +660,15 @@
             default:dlist[i].d_func = NULL;
                     break;
         }
+
+        if (dlist[i].d_func == NULL)
+        {
+            dlist[i].d_type = 0;
+            dlist[i].d_arg = 0;
+            dlist[i].d_time = 0;
+        }
     }
 
-    if (dlist[i].d_func == NULL)
-    {
-        dlist[i].d_type = 0;
-        dlist[i].d_arg = 0;
-        dlist[i].d_time = 0;
-    }
 }       
         
 void