Attachment #162853 for bug #202499

Lines 6-12 Link Here

(-)Makefile (-1 / +1 lines)
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8		8
9	MAINTAINER= martin@arp242.net	9	MAINTAINER= ports@toco-domains.de
10	COMMENT= Roguelike game and as such a remake of the classic game Larn	10	COMMENT= Roguelike game and as such a remake of the classic game Larn
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3

Lines 1-6 Link Here

(-)files/patch-Makefile (-4 / +4 lines)
1	--- Makefile.orig 2012-07-06 20:29:35.000000000 +0300	1	--- Makefile.orig 2012-07-06 17:29:35 UTC
2	+++ Makefile 2013-03-09 11:15:05.000000000 +0200	2	+++ Makefile
3	@@ -102,13 +102,13 @@	3	@@ -102,13 +102,13 @@ else
4	LDFLAGS += $(shell pkg-config --libs glib-2.0)	4	LDFLAGS += $(shell pkg-config --libs glib-2.0)
5		5
6	# Configuration for ncurses	6	# Configuration for ncurses
Lines 16-22 Link Here
16	LDFLAGS += -lncurses -lpanel	16	LDFLAGS += -lncurses -lpanel
17	endif	17	endif
18	endif	18	endif
19	@@ -117,6 +117,8 @@	19	@@ -117,6 +117,8 @@ else
20	# Debian and derivates use lua5.1, the rest of the world lua	20	# Debian and derivates use lua5.1, the rest of the world lua
21	ifneq ($(wildcard /etc/debian_version),)	21	ifneq ($(wildcard /etc/debian_version),)
22	lua = lua5.1	22	lua = lua5.1

Lines 1-6 Link Here

(-)files/patch-src-game.c (-3 / +3 lines)
1	--- src/game.c.orig 2012-07-06 20:29:35.000000000 +0300	1	--- src/game.c.orig 2012-07-06 17:29:35 UTC
2	+++ src/game.c 2013-03-09 12:23:13.000000000 +0200	2	+++ src/game.c
3	@@ -1353,7 +1354,7 @@	3	@@ -1353,7 +1353,7 @@ static void game_scores_save(game *g, GL
4	if (sb == NULL)	4	if (sb == NULL)
5	{	5	{
6	/* opening the file failed */	6	/* opening the file failed */




--- src/monsters.c.orig	2012-07-06 17:29:35 UTC
+++ src/monsters.c
@@ -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);
yes
native
text/plain




--- src/player.c.orig	2012-07-06 17:29:35 UTC
+++ src/player.c
@@ -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)
     {
yes
native
text/plain

Return to bug 202499

Line 0 Link Here

(-)files/patch-src-monsters.c (+17 lines)
	1	--- src/monsters.c.orig 2012-07-06 17:29:35 UTC
	2	+++ src/monsters.c
	3	@@ -2725,6 +2725,11 @@ static position monster_move_serve(monst
	4	map_path_element *pe = g_queue_pop_head(path->path);
	5	npos = pe->pos;
	6	}
	7	+ else
	8	+ {
	9	+ /* ensure npos is initialized */
	10	+ npos = m->pos;
	11	+ }
	12
	13	if (path != NULL)
	14	map_path_destroy(path);
	15	yes
	16	native
	17	text/plain

Line 0 Link Here

(-)files/patch-src-player.c (+17 lines)
	1	--- src/player.c.orig 2012-07-06 17:29:35 UTC
	2	+++ src/player.c
	3	@@ -1605,6 +1605,11 @@ int player_map_enter(player p, map l,
	4	else
	5	pos = map_find_sobject(l, LS_STAIRSUP);
	6	}
	7	+ /* doing nothing? */
	8	+ else
	9	+ {
	10	+ pos = p->pos;
	11	+ }
	12
	13	if (l->nlevel == 0)
	14	{
	15	yes
	16	native
	17	text/plain