svn commit: r400979 - head/games/nlarn/files

[Dimitry Andric]

Author: dim (src committer)
Date: Sat Nov  7 11:32:53 2015
New Revision: 400979
URL: https://svnweb.freebsd.org/changeset/ports/400979

Log:
  Fix busted patches for games/nlarn from r400954.
  
  Noticed by:	antoine
  PR:		202499
  MFH:		2015Q4

Modified:
  head/games/nlarn/files/patch-src-monsters.c
  head/games/nlarn/files/patch-src-player.c

Modified: head/games/nlarn/files/patch-src-monsters.c
==============================================================================
--- head/games/nlarn/files/patch-src-monsters.c	Sat Nov  7 11:18:11 2015	(r400978)
+++ head/games/nlarn/files/patch-src-monsters.c	Sat Nov  7 11:32:53 2015	(r400979)
@@ -12,17 +12,3 @@
  
          if (path != NULL)
              map_path_destroy(path);
---- src/monsters.c.orig	2012-07-06 19:29:35.000000000 +0200
-+++ src/monsters.c	2015-08-19 23:52:50.496120000 +0200
-@@ -2725,6 +2725,11 @@ static position monster_move_serve(monst
-             map_path_element *pe = g_queue_pop_head(path->path);
-             npos = pe->pos;
-         }
-+        else
-+        {
-+            /* ensure npos is initialized */
-+            npos = m->pos;
-+        }
- 
-         if (path != NULL)
-             map_path_destroy(path);

Modified: head/games/nlarn/files/patch-src-player.c
==============================================================================
--- head/games/nlarn/files/patch-src-player.c	Sat Nov  7 11:18:11 2015	(r400978)
+++ head/games/nlarn/files/patch-src-player.c	Sat Nov  7 11:32:53 2015	(r400979)
@@ -12,17 +12,3 @@
  
      if (l->nlevel == 0)
      {
---- src/player.c.orig	2012-07-06 19:29:35.000000000 +0200
-+++ src/player.c	2015-08-19 23:56:03.671153000 +0200
-@@ -1605,6 +1605,11 @@ int player_map_enter(player *p, map *l, 
-         else
-             pos = map_find_sobject(l, LS_STAIRSUP);
-     }
-+    /* doing nothing? */
-+    else
-+    {
-+        pos = p->pos;
-+    }
- 
-     if (l->nlevel == 0)
-     {