From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 1 May 2013 02:18:02 +0000 (+0200)
Subject: Enforced -Wall on compiling, corrected some minor stuff diagnosed by it.
X-Git-Tag: tce~1329
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/task?a=commitdiff_plain;h=ddf0e5d24690e9985c51d9960e035ee21286dd49;p=plomrogue

Enforced -Wall on compiling, corrected some minor stuff diagnosed by it.
---

diff --git a/Makefile b/Makefile
index 7bb72f6..1b83a3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 roguelike:
-	cc -g -o windows.o -c windows.c
-	cc -g -o roguelike.o -c roguelike.c
-	cc -g -o roguelike windows.o roguelike.o -lncurses -lm
+	cc -Wall -g -o windows.o -c windows.c
+	cc -Wall -g -o roguelike.o -c roguelike.c
+	cc -Wall -g -o roguelike windows.o roguelike.o -lncurses -lm
 
 clean:
 	rm *.o; rm roguelike
diff --git a/roguelike.c b/roguelike.c
index 0e7012e..ee5dbe4 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -208,11 +208,11 @@ void draw_keys_window (struct Win * win) {
   struct KeyBinding * keybindings = world->keybindings;
   int offset = 0;
   if (keyswindata->max >= win->height) {
-    if (keyswindata->select > win->height / 2)
+    if (keyswindata->select > win->height / 2) {
       if (keyswindata->select < (keyswindata->max - (win->height / 2)))
         offset = keyswindata->select - (win->height / 2);
       else
-        offset = keyswindata->max - win->height + 1; }
+        offset = keyswindata->max - win->height + 1; } }
   int keydescwidth = 9 + 1; // max length assured by get_keyname() + \0
   char * keydesc = malloc(keydescwidth);
   attr_t attri;
@@ -254,9 +254,9 @@ void init_keybindings(struct World * world) {
   struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
   fseek(file, 0, SEEK_SET);
   char * command = malloc(linemax);
-  char commcount = 0;
+  int commcount = 0;
   char * digits = malloc(3);
-  char digicount = 0;
+  int digicount = 0;
   int key, digimax;
   int keycount = 0;
   c = getc(file);