From owner-svn-ports-all@freebsd.org Tue Dec 20 02:01:07 2016 Return-Path: Delivered-To: svn-ports-all@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 68C32C89533; Tue, 20 Dec 2016 02:01:07 +0000 (UTC) (envelope-from jbeich@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 1E3BAB0; Tue, 20 Dec 2016 02:01:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBK216Qp000882; Tue, 20 Dec 2016 02:01:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBK216N3000881; Tue, 20 Dec 2016 02:01:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201612200201.uBK216N3000881@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 20 Dec 2016 02:01:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428971 - head/games/openbor/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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2016 02:01:07 -0000 Author: jbeich Date: Tue Dec 20 02:01:06 2016 New Revision: 428971 URL: https://svnweb.freebsd.org/changeset/ports/428971 Log: games/openbor: unbreak patching Modified: head/games/openbor/files/patch-openbor.c (contents, props changed) Modified: head/games/openbor/files/patch-openbor.c ============================================================================== --- head/games/openbor/files/patch-openbor.c Tue Dec 20 01:51:59 2016 (r428970) +++ head/games/openbor/files/patch-openbor.c Tue Dec 20 02:01:06 2016 (r428971) @@ -1,23 +1,23 @@ --- openbor.c.orig 2016-12-19 15:29:57 UTC +++ openbor.c @@ -5810,7 +5810,7 @@ s_collision_attack **collision_alloc_att - size_t alloc_size; - - // Get amount of memory we'll need. -- alloc_size = sizeof(*result); -+ alloc_size = max_collisons * sizeof(*result); - - // Allocate memory and get pointer. - result = malloc(alloc_size); + size_t alloc_size; + + // Get amount of memory we'll need. +- alloc_size = sizeof(*result); ++ alloc_size = max_collisons * sizeof(*result); + + // Allocate memory and get pointer. + result = malloc(alloc_size); @@ -5859,7 +5859,7 @@ s_collision_body **collision_alloc_body_ - size_t alloc_size; - - // Get amount of memory we'll need. -- alloc_size = sizeof(*result); -+ alloc_size = max_collisons * sizeof(*result); - - // Allocate memory and get pointer. - result = malloc(alloc_size); + size_t alloc_size; + + // Get amount of memory we'll need. +- alloc_size = sizeof(*result); ++ alloc_size = max_collisons * sizeof(*result); + + // Allocate memory and get pointer. + result = malloc(alloc_size); @@ -20480,7 +20480,7 @@ void common_dot() entity *eOpp; //Owner of dot effect. s_collision_attack attack; //Attack struct. @@ -30,7 +30,7 @@ @@ -34617,7 +34617,7 @@ void keyboard_setup(int player) strncpy(buttonnames[SDID_SPECIAL], "Special", 16); strncpy(buttonnames[SDID_START], "Start", 16); - strncpy(buttonnames[SDID_SCREENSHOT], "Screenshot", 16); + strncpy(buttonnames[SDID_SCREENSHOT], "Screenshot", 16); - strncpy(buttonnames[SDID_ESC], "Exit", 16); +// strncpy(buttonnames[SDID_ESC], "Exit", 16);