Re-wrote large parts of the server client architecture. No more fifo.

[plomrogue] / src / server / map_object_actions.c

diff --git a/src/server/map_object_actions.c b/src/server/map_object_actions.c
index a30809b33336dbea3695bd3d471f796cb111df7f..694300dccef5116acfb2a1031d001c034490d7ff 100644 (file)
--- a/src/server/map_object_actions.c
+++ b/src/server/map_object_actions.c
@@ -77,7 +77,7 @@ static void update_log(char * text)
             }
             last_stop--;
         }
-        if (   (last_stop + 1) - last_nl == strlen(text)
+        if (   (last_stop + 1) - last_nl == (uint16_t) strlen(text)
             && 0 == strncmp(world.log + last_nl, text, strlen(text)))
         {
             text = ".";
@@ -137,10 +137,6 @@ static void actor_hits_actor(struct MapObj * hitter, struct MapObj * hitted)
             return;
         }
         update_log(" It dies.");
-        if (player == hitter)
-        {
-            world.score = world.score + mod_hitted->lifepoints;
-        }
     }
 }
 
@@ -174,7 +170,10 @@ static void playerbonus_move(char d, uint8_t passable)
         || match_dir(d, &dsc_dir, '7', "north-west")
         || match_dir(d, &dsc_dir, '9', "north-east")
         || match_dir(d, &dsc_dir, '1', "south-west")
-        || match_dir(d, &dsc_dir, '3', "south-east"));
+        || match_dir(d, &dsc_dir, '3', "south-east"))
+    {
+        ;
+    }
     char * dsc_move = "You move ";
     if (0 == passable)
     {