Server/C: In parse_palyer_command_0arg, don't set zero argument.

[plomrogue] / src / server / run.c

diff --git a/src/server/run.c b/src/server/run.c
index 38dc5a04174edc6b68832f227cbb40f9a7a2ac8d..4351b9ffce236b57dd89752a41d87a878fbb5551 100644 (file)
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -30,6 +30,7 @@
 #include "god_commands.h" /* parse_god_command_(1|2|3)arg() */
 #include "hardcoded_strings.h" /* s */
 #include "io.h" /* io_round(), save_world() */
+#include "thing_actions.h" /* hunger(), try_healing() */
 #include "things.h" /* Thing, ThingType, ThingInMemory, get_player(),
                      * get_thing_action_id_by_name(), try_thing_proliferation()
                      */
@@ -116,7 +117,6 @@ static uint8_t parse_player_command_0arg(char * tok0)
             else
             {
                 player->command = get_thing_action_id_by_name(tok0);
-                player->arg = 0;
             }
             turn_over();
         }
@@ -222,7 +222,8 @@ static uint8_t parse_command_meta(char * tok0)
             }
             send_to_outfile("THINGS_HERE START\n", 1);
             struct Thing * player = get_player();
-            if ('v' == player->fov_map[atoi(tok1)*world.map.length+atoi(tok2)])
+            if (player->fov_map &&
+                'v' == player->fov_map[atoi(tok1)*world.map.length+atoi(tok2)])
             {
                 struct Thing * t;
                 for (t = world.things; t; t = t->next)
@@ -333,6 +334,7 @@ static void turn_over()
                     }
                     ai(thing);
                 }
+                try_healing(thing);
                 thing->progress++;
                 struct ThingAction * ta = get_thing_action(thing->command);
                 if (thing->progress == ta->effort)
@@ -341,6 +343,7 @@ static void turn_over()
                     thing->command = 0;
                     thing->progress = 0;
                 }
+                hunger(thing);
             }
             try_thing_proliferation(thing);
         }