Date: Fri, 6 Nov 2015 19:29:42 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400954 - in head/games/nlarn: . files Message-ID: <201511061929.tA6JTgIm028092@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim (src committer) Date: Fri Nov 6 19:29:42 2015 New Revision: 400954 URL: https://svnweb.freebsd.org/changeset/ports/400954 Log: Fix a number of uninitialized variable warnings in games/nlarn. Also reset the maintainer to Torsten Zühlsdorff, and bump the port revision. PR: 202499 MFH: 2015Q4 Added: head/games/nlarn/files/patch-src-monsters.c (contents, props changed) head/games/nlarn/files/patch-src-player.c (contents, props changed) Modified: head/games/nlarn/Makefile head/games/nlarn/files/patch-Makefile head/games/nlarn/files/patch-src-game.c Modified: head/games/nlarn/Makefile ============================================================================== --- head/games/nlarn/Makefile Fri Nov 6 19:28:42 2015 (r400953) +++ head/games/nlarn/Makefile Fri Nov 6 19:29:42 2015 (r400954) @@ -3,10 +3,11 @@ PORTNAME= nlarn PORTVERSION= 0.7.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF -MAINTAINER= martin@arp242.net +MAINTAINER= ports@toco-domains.de COMMENT= Roguelike game and as such a remake of the classic game Larn LICENSE= GPLv3 Modified: head/games/nlarn/files/patch-Makefile ============================================================================== --- head/games/nlarn/files/patch-Makefile Fri Nov 6 19:28:42 2015 (r400953) +++ head/games/nlarn/files/patch-Makefile Fri Nov 6 19:29:42 2015 (r400954) @@ -1,6 +1,6 @@ ---- Makefile.orig 2012-07-06 20:29:35.000000000 +0300 -+++ Makefile 2013-03-09 11:15:05.000000000 +0200 -@@ -102,13 +102,13 @@ +--- Makefile.orig 2012-07-06 17:29:35 UTC ++++ Makefile +@@ -102,13 +102,13 @@ else LDFLAGS += $(shell pkg-config --libs glib-2.0) # Configuration for ncurses @@ -16,7 +16,7 @@ LDFLAGS += -lncurses -lpanel endif endif -@@ -117,6 +117,8 @@ +@@ -117,6 +117,8 @@ else # Debian and derivates use lua5.1, the rest of the world lua ifneq ($(wildcard /etc/debian_version),) lua = lua5.1 Modified: head/games/nlarn/files/patch-src-game.c ============================================================================== --- head/games/nlarn/files/patch-src-game.c Fri Nov 6 19:28:42 2015 (r400953) +++ head/games/nlarn/files/patch-src-game.c Fri Nov 6 19:29:42 2015 (r400954) @@ -1,6 +1,6 @@ ---- src/game.c.orig 2012-07-06 20:29:35.000000000 +0300 -+++ src/game.c 2013-03-09 12:23:13.000000000 +0200 -@@ -1353,7 +1354,7 @@ +--- src/game.c.orig 2012-07-06 17:29:35 UTC ++++ src/game.c +@@ -1353,7 +1353,7 @@ static void game_scores_save(game *g, GL if (sb == NULL) { /* opening the file failed */ Added: head/games/nlarn/files/patch-src-monsters.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/nlarn/files/patch-src-monsters.c Fri Nov 6 19:29:42 2015 (r400954) @@ -0,0 +1,28 @@ +--- 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); +--- 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); Added: head/games/nlarn/files/patch-src-player.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/nlarn/files/patch-src-player.c Fri Nov 6 19:29:42 2015 (r400954) @@ -0,0 +1,28 @@ +--- 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) + { +--- 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) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511061929.tA6JTgIm028092>