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

diff --git a/Makefile b/Makefile
index 7bb72f66f96f13a13d4183ee5c190e2101241a2c..1b83a3f1622938d2c309b543835f08ab6968339f 100644 (file)
--- 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 0e7012e15f8e0ccc07dcb0cea8ab5489d11827b6..ee5dbe48be76fa54e3e9f7cafd2993a0c13404d6 100644 (file)
--- 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);