forked from Lainports/freebsd-ports
Fix busted patches for games/nlarn from r400954.
Noticed by: antoine PR: 202499 MFH: 2015Q4
This commit is contained in:
parent
52472fb5ca
commit
2bd2dbbc36
2 changed files with 0 additions and 28 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue