diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-11-07 11:32:53 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-11-07 11:32:53 +0000 |
| commit | 2bd2dbbc364ce94d1c3c8a43e82ba5e76c4e7ff2 (patch) | |
| tree | d465aa2993a7fed802c8a79230b8842beb1a1ea7 /games/nlarn | |
| parent | 52472fb5ca58cd66ffa9bc2ac76dde78bad14117 (diff) | |
Fix busted patches for games/nlarn from r400954.
Noticed by: antoine
PR: 202499
MFH: 2015Q4
Notes
Notes:
svn path=/head/; revision=400979
Diffstat (limited to 'games/nlarn')
| -rw-r--r-- | games/nlarn/files/patch-src-monsters.c | 14 | ||||
| -rw-r--r-- | games/nlarn/files/patch-src-player.c | 14 |
2 files changed, 0 insertions, 28 deletions
diff --git a/games/nlarn/files/patch-src-monsters.c b/games/nlarn/files/patch-src-monsters.c index 1e7f40a6b990..2429c25f8a68 100644 --- a/games/nlarn/files/patch-src-monsters.c +++ b/games/nlarn/files/patch-src-monsters.c @@ -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); diff --git a/games/nlarn/files/patch-src-player.c b/games/nlarn/files/patch-src-player.c index 3ca1a666f0f1..a511c9f18afd 100644 --- a/games/nlarn/files/patch-src-player.c +++ b/games/nlarn/files/patch-src-player.c @@ -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) - { |