From 295a180ea18a5a24e176b6edb559f0d0c2463cd1 Mon Sep 17 00:00:00 2001
From: "John \"Elwin\" Edwards" <elwin@rlgallery.org>
Date: Wed, 12 Aug 2015 15:42:02 -0400
Subject: [PATCH] Advanced Rogue 7: initialize multiple variables.

MSVC complained that they might be used uninitialized.  In some cases,
this might have been possible.

XRogue already has initializations for all these variables.
---
 arogue7/actions.c  | 4 ++--
 arogue7/command.c  | 2 +-
 arogue7/daemons.c  | 4 ++--
 arogue7/fight.c    | 2 +-
 arogue7/misc.c     | 6 +++---
 arogue7/move.c     | 6 +++---
 arogue7/pack.c     | 6 +++---
 arogue7/passages.c | 4 ++--
 arogue7/scrolls.c  | 2 +-
 arogue7/sticks.c   | 4 ++--
 arogue7/util.c     | 4 ++--
 arogue7/wizard.c   | 2 +-
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/arogue7/actions.c b/arogue7/actions.c
index bec859b..21d0eda 100644
--- a/arogue7/actions.c
+++ b/arogue7/actions.c
@@ -239,7 +239,7 @@ m_breathe(tp)
 register struct thing *tp;
 {
     register int damage;
-    register char *breath;
+    register char *breath = "";
 
     damage = tp->t_stats.s_hpt;
     turn_off(*tp, CANSURPRISE);
@@ -783,7 +783,7 @@ runners(segments)
 int segments;    /* Number of segments since last called */
 {
     register struct linked_list *item;
-    register struct thing *tp;
+    register struct thing *tp = NULL;
     register min_time = 20;	/* Minimum time until a monster can act */
 
     /*
diff --git a/arogue7/command.c b/arogue7/command.c
index c917afa..86e7526 100644
--- a/arogue7/command.c
+++ b/arogue7/command.c
@@ -1078,7 +1078,7 @@ struct linked_list *item;
 bool mark;
 {
     register struct object *obj;
-    register char **guess, *elsewise;
+    register char **guess = NULL, *elsewise = NULL;
     register bool *know;
 
     if (item == NULL) {
diff --git a/arogue7/daemons.c b/arogue7/daemons.c
index 214c3c6..54eeebe 100644
--- a/arogue7/daemons.c
+++ b/arogue7/daemons.c
@@ -417,7 +417,7 @@ unchoke()
 alchemy(obj)
 register struct object *obj;
 {
-    register struct object *tobj;
+    register struct object *tobj = NULL;
     register struct linked_list *item;
 
     /*
@@ -535,7 +535,7 @@ ring_teleport()
  */
 quill_charge()
 {
-    register struct object *tobj;
+    register struct object *tobj = NULL;
     register struct linked_list *item;
 
     /*
diff --git a/arogue7/fight.c b/arogue7/fight.c
index d053c7a..82a842a 100644
--- a/arogue7/fight.c
+++ b/arogue7/fight.c
@@ -331,7 +331,7 @@ struct object *cur_weapon;
 bool back_stab;
 {
     register struct stats *att, *def;
-    register char *cp;
+    register char *cp = NULL;
     register int ndice, nsides, nplus, def_arm;
     bool did_hit = FALSE;
     int prop_hplus, prop_dplus;
diff --git a/arogue7/misc.c b/arogue7/misc.c
index 5808f51..ebfc086 100644
--- a/arogue7/misc.c
+++ b/arogue7/misc.c
@@ -277,7 +277,7 @@ do_bag(item)
 register struct linked_list *item;
 {
 
-    register struct linked_list *titem;
+    register struct linked_list *titem = NULL;
     register struct object *obj, *tobj;
     bool doit = TRUE;
 
@@ -838,8 +838,8 @@ got_scroll:
 use_mm(which)
 int which;
 {
-    register struct object *obj;
-    register struct linked_list *item;
+    register struct object *obj = NULL;
+    register struct linked_list *item = NULL;
     bool cursed, blessed, is_mm;
 
     cursed = FALSE;
diff --git a/arogue7/move.c b/arogue7/move.c
index a42dbbb..7a844f8 100644
--- a/arogue7/move.c
+++ b/arogue7/move.c
@@ -46,10 +46,10 @@ register struct thing *th;
 register coord *tc;
 {
     register struct trap *tp;
-    register char ch, *mname;
+    register char ch, *mname = "";
     register bool is_player = (th == &player),
 	          can_see;
-    register struct linked_list *mitem;
+    register struct linked_list *mitem = NULL;
     register struct thing *mp;
 
 
@@ -764,7 +764,7 @@ int dy, dx;
     register struct room *rp, *orp;
     register char ch;
     struct linked_list *item;
-    register struct thing *tp;
+    register struct thing *tp = NULL;
     coord old_hero;
     register int wasfirstmove, moved, num_hits;
     bool changed=FALSE;	/* Did we switch places with a friendly monster? */
diff --git a/arogue7/pack.c b/arogue7/pack.c
index 0f92605..b2c1156 100644
--- a/arogue7/pack.c
+++ b/arogue7/pack.c
@@ -34,8 +34,8 @@ add_pack(item, silent, packret)
 register struct linked_list *item, **packret;
 bool silent;
 {
-    register struct linked_list *ip, *lp, *ap;
-    register struct object *obj, *op;
+    register struct linked_list *ip, *lp = NULL, *ap;
+    register struct object *obj, *op = NULL;
     register bool exact, from_floor;
 
     if (packret != NULL)
@@ -576,7 +576,7 @@ bool askfirst, showcost;
     reg struct linked_list *item;
     reg struct object *obj;
     reg int cnt, pagecnt, ch, och, maxx, curx, confused;
-    struct linked_list *saveitem;
+    struct linked_list *saveitem = NULL;
     char description[2*LINELEN+1];
     char cost[LINELEN/2];
 #ifdef PC7300
diff --git a/arogue7/passages.c b/arogue7/passages.c
index 26267d9..c432ece 100644
--- a/arogue7/passages.c
+++ b/arogue7/passages.c
@@ -28,7 +28,7 @@
 
 do_passages()
 {
-    register struct rdes *r1, *r2;
+    register struct rdes *r1, *r2 = NULL;
     register int i, j;
     register int roomcount;
     static struct rdes
@@ -137,7 +137,7 @@ do_passages()
 conn(r1, r2)
 int r1, r2;
 {
-    register struct room *rpf, *rpt;
+    register struct room *rpf, *rpt = NULL;
     register char rmt;
     register int distance, max_diag, offset, i;
     register int rm;
diff --git a/arogue7/scrolls.c b/arogue7/scrolls.c
index 68c7429..480c6e2 100644
--- a/arogue7/scrolls.c
+++ b/arogue7/scrolls.c
@@ -62,7 +62,7 @@ register int which;
 int flag;
 bool is_scroll;
 {
-    register struct object *obj, *nobj;
+    register struct object *obj = NULL, *nobj;
     register struct linked_list *item, *nitem;
     register int i,j;
     register char ch, nch;
diff --git a/arogue7/sticks.c b/arogue7/sticks.c
index 829f5c0..7498f16 100644
--- a/arogue7/sticks.c
+++ b/arogue7/sticks.c
@@ -33,13 +33,13 @@ coord *direction;
 int which;
 int flags;
 {
-    register struct linked_list *item;
+    register struct linked_list *item = NULL;
     register struct thing *tp;
     register int y, x, bonus;
     struct linked_list *nitem;
     struct object *nobj;
     bool cursed, blessed, is_player;
-    char *mname;
+    char *mname = "";
 
     cursed = flags & ISCURSED;
     blessed = flags & ISBLESSED;
diff --git a/arogue7/util.c b/arogue7/util.c
index c3b40d3..9120b38 100644
--- a/arogue7/util.c
+++ b/arogue7/util.c
@@ -1006,7 +1006,7 @@ bool
 move_hero(why)
 int why;
 {
-    char *action;
+    char *action = "";
     char which;
     coord c;
 
@@ -1207,7 +1207,7 @@ char *
 tr_name(ch)
 char ch;
 {
-    register char *s;
+    register char *s = "";
 
     switch (ch)
     {
diff --git a/arogue7/wizard.c b/arogue7/wizard.c
index 283fbb6..b5a2bb8 100644
--- a/arogue7/wizard.c
+++ b/arogue7/wizard.c
@@ -537,7 +537,7 @@ passwd()
 
 teleport()
 {
-    register struct room *new_rp, *old_rp = roomin(&hero);
+    register struct room *new_rp = NULL, *old_rp = roomin(&hero);
     register int rm, which;
     coord old;
     bool got_position = FALSE;