From owner-svn-ports-head@freebsd.org Sat Nov 7 11:32:55 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2577AA27705; Sat, 7 Nov 2015 11:32:55 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB01219C2; Sat, 7 Nov 2015 11:32:54 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7BWrkF014260; Sat, 7 Nov 2015 11:32:53 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7BWrFW014258; Sat, 7 Nov 2015 11:32:53 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201511071132.tA7BWrFW014258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 7 Nov 2015 11:32:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400979 - head/games/nlarn/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 11:32:55 -0000 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) - {