From: NHOrus <jy6x2b32pie9@yahoo.com>
Date: Wed, 28 Jun 2017 17:40:46 +0000 (+0300)
Subject: Some more linter warnings
X-Git-Tag: 1.1~43
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=aca6d79087dc9ef6f9f1b4e1d2ef0d25d405db9b;p=open-adventure.git

Some more linter warnings
---

diff --git a/Makefile b/Makefile
index a435d07..c5ce654 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ newdb.c newdb.h: newdungeon.py adventure.yaml
 	python3 newdungeon.py
 
 linenoise.o:	linenoise/linenoise.h
-	$(CC) -c linenoise/linenoise.c
+	$(CC) $(CCFLAGS) -c linenoise/linenoise.c
 
 dungeon: dungeon.o common.o
 	$(CC) $(CCFLAGS) -o $@ dungeon.o common.o
diff --git a/actions.c b/actions.c
index 16d303f..6189c36 100644
--- a/actions.c
+++ b/actions.c
@@ -14,7 +14,7 @@ static int attack(FILE *input, struct command_t *command)
 {
     vocab_t verb = command->verb;
     vocab_t obj = command->obj;
-    int spk = actions[verb].message;
+    long spk = actions[verb].message;
     if (obj == 0 || obj == INTRANSITIVE) {
         if (atdwrf(game.loc) > 0)
             obj = DWARF;
diff --git a/dungeon.c b/dungeon.c
index 725152d..5f49068 100644
--- a/dungeon.c
+++ b/dungeon.c
@@ -159,7 +159,7 @@ static long GETNUM(FILE *source)
      *  scanned).  If we're at the end of the line or encounter an illegal
      *  character (not a digit, hyphen, or blank), we return 0. */
 
-    long DIGIT, GETNUM, sign;
+    long GETNUM, sign;
 
     if (source != NULL) MAPLIN(source);
     GETNUM = 0;
@@ -176,7 +176,7 @@ static long GETNUM(FILE *source)
         LNPOSN = LNPOSN + 1;
     }
     while (!(LNPOSN > LNLENG || INLINE[LNPOSN] == 0)) {
-        DIGIT = INLINE[LNPOSN] - 64;
+        long DIGIT = INLINE[LNPOSN] - 64;
         if (DIGIT < 0 || DIGIT > 9) {
             GETNUM = 0;
             break;
diff --git a/misc.c b/misc.c
index 0b28f00..45528c2 100644
--- a/misc.c
+++ b/misc.c
@@ -535,7 +535,7 @@ long atdwrf(long where)
 long setbit(long bit)
 /*  Returns 2**bit for use in constructing bit-masks. */
 {
-    return (1 << bit);
+    return (1L << bit);
 }
 
 bool tstbit(long mask, int bit)