X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fclient%2Fdraw_wins.c;h=f10e9cb80a20d50d15c9a49a0b1312baa7879379;hb=f9c94db47aa883149aa762fa128ac1ff1b3f92e1;hp=9fd78fc9088fdc1b419256dd10910bbca77b5513;hpb=024b404c0db59dc6651b1c8f3d379c2797654fdf;p=plomrogue

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index 9fd78fc..f10e9cb 100644
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -323,7 +323,7 @@ extern void draw_win_map(struct Win * win)
 {
     try_resize_winmap(win, world.map.size.y, world.map.size.x);
     uint16_t z = 0;
-    uint16_t x, y;
+    uint8_t x, y;
     for (y = 0; y < world.map.size.y; y++)
     {
         for (x = 0; x < world.map.size.x; x++)
@@ -347,7 +347,7 @@ extern void draw_win_info(struct Win * win)
     sprintf(text, "%s%d%s%d%s%d",
             dsc_turn, world.turn,
             dsc_hitpoints, world.player_lifepoints,
-            dsc_score, world.score);
+            dsc_score, world.player_score);
     add_text_with_linebreaks(win, text);
 }
 
@@ -358,12 +358,12 @@ extern void draw_win_inventory(struct Win * win)
     win->center.y = world.player_inventory_select;
     char inventory_copy[strlen(world.player_inventory) + 1];
     sprintf(inventory_copy, "%s", world.player_inventory);
-    char * foo = inventory_copy;
+    char * strtok_target = inventory_copy;
     uint8_t i = 0;
     while (1)
     {
-        char * object = strtok(foo, "\n");
-        foo = NULL;
+        char * object = strtok(strtok_target, "\n");
+        strtok_target = NULL;
         if (NULL == object)
         {
             return;
@@ -384,7 +384,7 @@ extern void draw_win_available_keybindings(struct Win * win)
 {
     char * title = "Active window's keybindings:";
     struct KeyBinding * kb_p;
-    struct Win * w = get_win_by_id(world.windb.active);
+    struct Win * w = get_win_by_id(world.winDB.active);
     if     (0 == w->view)
     {
         kb_p = w->kb.kbs;