changeset 304:e52a8a7ad4c5

Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.
author John "Elwin" Edwards
date Wed, 14 Apr 2021 18:55:33 -0400
parents e06ebc407615
children 3900f3cfe07d
files arogue5/chase.c arogue5/command.c arogue5/main.c arogue5/mdport.c arogue5/misc.c arogue5/monsters.c arogue5/move.c arogue5/options.c arogue5/passages.c arogue5/player.c arogue5/rip.c arogue5/save.c arogue5/state.c arogue5/sticks.c arogue5/util.c arogue5/wizard.c arogue5/xcrypt.c arogue7/chase.c arogue7/command.c arogue7/fight.c arogue7/init.c arogue7/mdport.c arogue7/misc.c arogue7/move.c arogue7/options.c arogue7/passages.c arogue7/player.c arogue7/rip.c arogue7/scrolls.c arogue7/state.c arogue7/sticks.c arogue7/util.c arogue7/wizard.c arogue7/xcrypt.c rogue3/command.c rogue3/fight.c rogue3/init.c rogue3/main.c rogue3/misc.c rogue3/options.c rogue3/pack.c rogue3/passages.c rogue3/rip.c rogue3/state.c rogue3/weapons.c rogue4/chase.c rogue4/command.c rogue4/extern.h rogue4/fight.c rogue4/mdport.c rogue4/misc.c rogue4/monsters.c rogue4/options.c rogue4/pack.c rogue4/rip.c rogue4/rogue.h rogue4/rooms.c rogue4/state.c rogue4/sticks.c rogue4/things.c rogue4/weapons.c rogue5/mach_dep.c rogue5/rip.c rogue5/state.c srogue/armor.c srogue/chase.c srogue/command.c srogue/disply.c srogue/init.c srogue/io.c srogue/misc.c srogue/monsters.c srogue/move.c srogue/new_leve.c srogue/passages.c srogue/rings.c srogue/rip.c srogue/rooms.c srogue/save.c srogue/scrolls.c srogue/state.c srogue/sticks.c srogue/things.c srogue/trader.c srogue/weapons.c srogue/wizard.c urogue/command.c urogue/fight.c urogue/io.c urogue/mdport.c urogue/memory.c urogue/misc.c urogue/monsters.c urogue/move.c urogue/newlvl.c urogue/options.c urogue/potions.c urogue/rip.c urogue/scrolls.c urogue/sticks.c urogue/xcrypt.c xrogue/actions.c xrogue/bolt.c xrogue/chase.c xrogue/command.c xrogue/encumb.c xrogue/fight.c xrogue/io.c xrogue/main.c xrogue/monsters.c xrogue/move.c xrogue/n_level.c xrogue/options.c xrogue/outside.c xrogue/passages.c xrogue/rip.c xrogue/scrolls.c xrogue/state.c xrogue/sticks.c xrogue/things.c xrogue/util.c xrogue/xcrypt.c
diffstat 122 files changed, 374 insertions(+), 280 deletions(-) [+]
line wrap: on
line diff
--- a/arogue5/chase.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/arogue5/chase.c	Wed Apr 14 18:55:33 2021 -0400
@@ -65,7 +65,7 @@
 
 	    /* Is it OK to move there? */
 	    if (step_ok(y, x, NOMONST, tp) &&
-		(!isatrap(mvwinch(cw, y, x)) ||
+		(!isatrap(CCHAR( mvwinch(cw, y, x) )) ||
 		  rnd(10) >= tp->t_stats.s_intel ||
 		  on(*tp, ISFLY))) {
 		/* OK, we can go here.  But don't go there if
--- a/arogue5/command.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/arogue5/command.c	Wed Apr 14 18:55:33 2021 -0400
@@ -921,7 +921,7 @@
 	    }
 	    else know = (bool *) 0;
     }
-    if ((obj->o_flags & ISPOST)	|| (know && know[obj->o_which]) && !mark) {
+    if ((obj->o_flags & ISPOST)	|| (know && know[obj->o_which] && !mark)) {
 	msg("That has already been identified.");
 	return;
     }
--- a/arogue5/main.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/arogue5/main.c	Wed Apr 14 18:55:33 2021 -0400
@@ -50,9 +50,11 @@
 main(int argc, char *argv[], char *envp[])
 {
     register char *env;
+#ifndef SCOREFILE
     char *roguedir;
 
     roguedir = md_getroguedir();
+#endif
     md_init();
 
     /*
--- a/arogue5/mdport.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/arogue5/mdport.c	Wed Apr 14 18:55:33 2021 -0400
@@ -112,7 +112,9 @@
 # define	SE		exit_standout_mode
 #endif
 
+#ifdef _WIN32
 static int md_standout_mode = 0;
+#endif
 
 void
 md_raw_standout(void)
@@ -292,7 +294,9 @@
 #endif
 
     if ( (h == NULL) || (*h == '\0') )
+    {
         if ( (h = getenv("HOME")) == NULL )
+        {
             if ( (h = getenv("HOMEDRIVE")) == NULL)
                 h = "";
             else
@@ -303,6 +307,8 @@
                 if ( (h = getenv("HOMEPATH")) == NULL)
                     h = "";
             }
+        }
+    }
 
 
     len = strlen(homedir);
@@ -375,7 +381,7 @@
          */
         setuid(getuid());
         setgid(getgid());
-        execl(sh == NULL ? "/bin/sh" : sh, "shell", "-i", 0);
+        execl(sh == NULL ? "/bin/sh" : sh, "shell", "-i", (char *) NULL);
         perror("No shelly");
         _exit(-1);
     }
--- a/arogue5/misc.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/arogue5/misc.c	Wed Apr 14 18:55:33 2021 -0400
@@ -447,10 +447,9 @@
 {
     register struct object *obj = NULL;
     register struct linked_list *item = NULL;
-    bool cursed, blessed, is_mm;
+    bool is_mm;
     char buf[LINELEN];
 
-    cursed = FALSE;
     is_mm = FALSE;
 
     if (which < 0) {	/* A real miscellaneous magic item  */
@@ -463,8 +462,6 @@
 	    return;
 
 	obj = OBJPTR(item);
-	cursed = (obj->o_flags & ISCURSED) != 0;
-	blessed = (obj->o_flags & ISBLESSED) != 0;
 	which = obj->o_which;
     }
 
--- a/arogue5/monsters.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/arogue5/monsters.c	Wed Apr 14 18:55:33 2021 -0400
@@ -730,14 +730,12 @@
     register struct room *trp;
     register const char *mname;
     bool nasty;	/* Will the monster "attack"? */
-    char ch;
 
     if ((it = find_mons(y, x)) == NULL) {
 	msg("Can't find monster in show");
 	return (NULL);
     }
     tp = THINGPTR(it);
-    ch = tp->t_type;
 
     trp = roomin(&tp->t_pos); /* Current room for monster */
     mname = monsters[tp->t_index].m_name;
--- a/arogue5/move.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/arogue5/move.c	Wed Apr 14 18:55:33 2021 -0400