Use "uint8_t" instead of "unsigned char".

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index d2fb9bf2140c1b84b9b1495391bacf322c3d8f76..24e0058d684247890d9bfbd64395d5a18bc3c7c0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -6,6 +6,7 @@
 #include <ncurses.h> /* for initscr(), noecho(), curs_set(), keypad(), raw() */
 #include <time.h> /* for time() */
 #include <unistd.h> /* for getopt(), optarg */
+#include <stdint.h> /* for uint8_t */
 #include "windows.h" /* for structs WinMeta, Win, init_win(), init_win_meta(),
                       * draw_all_wins()
                       */
@@ -60,22 +61,22 @@ int main(int argc, char *argv[])
     world.monster = 0;
     world.item = 0;
     init_map_object_defs(&world, "defs");
-    uint8_t fail = 0;
+    uint8_t err = 0;
 
     /* For interactive mode, try to load world state from savefile. */
     FILE * file;
     if (1 == world.interactive && 0 == access("savefile", F_OK))
     {
         file = fopen("savefile", "r");
-        fail = fail | read_uint32_bigendian(file, &world.seed);
-        fail = fail | read_uint32_bigendian(file, &world.turn);
-        fail = fail | read_uint16_bigendian(file, &player.pos.y);
-        fail = fail | read_uint16_bigendian(file, &player.pos.x);
+        err = err | read_uint32_bigendian(file, &world.seed);
+        err = err | read_uint32_bigendian(file, &world.turn);
+        err = err | read_uint16_bigendian(file, &player.pos.y);
+        err = err | read_uint16_bigendian(file, &player.pos.x);
         player.pos.y--;
         player.pos.x--;
-        fail = fail | read_uint8(file, &player.hitpoints);
-        fail = fail | read_map_objects(&world, &world.monster, file);
-        fail = fail | read_map_objects(&world, &world.item,    file);
+        err = err | read_uint8(file, &player.hitpoints);
+        err = err | read_map_objects(&world, &world.monster, file);
+        err = err | read_map_objects(&world, &world.item,    file);
         fclose(file);
     }
 
@@ -86,7 +87,7 @@ int main(int argc, char *argv[])
         if (0 == world.interactive)
         {
             file = fopen("record", "r");
-            fail = fail | read_uint32_bigendian(file, &world.seed);
+            err = err | read_uint32_bigendian(file, &world.seed);
         }
 
         /* For interactive-mode in newly started world, generate a start seed
@@ -96,12 +97,12 @@ int main(int argc, char *argv[])
         {
             file = fopen("record", "w");
             world.seed = time(NULL);
-            fail = fail | write_uint32_bigendian(world.seed, file);
+            err = err | write_uint32_bigendian(world.seed, file);
             fclose(file);
         }
     }
 
-    exit_err(fail, &world, "Failure initializing game.");
+    exit_err(err, &world, "Failure initializing game.");
 
 
     /* Generate map from seed and, if newly generated world, start positions of
@@ -151,8 +152,8 @@ int main(int argc, char *argv[])
 
     /* Replay mode. */
     int key;
-    unsigned char quit_called = 0;
-    unsigned char await_actions = 1;
+    uint8_t quit_called = 0;
+    uint8_t await_actions = 1;
     if (0 == world.interactive)
     {
         int action;