Mercurial > hg > early-roguelike

diff xrogue/state.c @ 304:e52a8a7ad4c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 17005af49963
children 32bc72dcbf4f
line wrap: on
line diff
--- a/xrogue/state.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/xrogue/state.c	Wed Apr 14 18:55:33 2021 -0400
@@ -3259,8 +3259,8 @@
 		h = szPath;
 #endif
 
-	if ( (h == NULL) || (*h == '\0') )
-        if ( (h = getenv("HOME")) == NULL ) 
+    if ( (h == NULL) || (*h == '\0') ) {
+        if ( (h = getenv("HOME")) == NULL ) {
             if ( (h = getenv("HOMEDRIVE")) == NULL) 
                 h = "";
             else
@@ -3271,6 +3271,8 @@
                 if ( (h = getenv("HOMEPATH")) == NULL)
                     h = "";
             }
+        }
+    }
 
 
     len = strlen(homedir);
@@ -3409,7 +3411,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);
     }