From owner-svn-ports-head@FreeBSD.ORG Tue Sep 17 12:31:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 265C0B21; Tue, 17 Sep 2013 12:31:29 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 13CFC2251; Tue, 17 Sep 2013 12:31:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HCVSg2018505; Tue, 17 Sep 2013 12:31:28 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HCVSY8018501; Tue, 17 Sep 2013 12:31:28 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201309171231.r8HCVSY8018501@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 17 Sep 2013 12:31:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327471 - head/games/flare/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.14 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: Tue, 17 Sep 2013 12:31:29 -0000 Author: amdmi3 Date: Tue Sep 17 12:31:27 2013 New Revision: 327471 URL: http://svnweb.freebsd.org/changeset/ports/327471 Log: Fix build with clang/libc++ Added: head/games/flare/files/ head/games/flare/files/patch-src-Hazard.cpp (contents, props changed) head/games/flare/files/patch-src-MapCollision.cpp (contents, props changed) head/games/flare/files/patch-src-Utils.cpp (contents, props changed) head/games/flare/files/patch-src-Utils.h (contents, props changed) Added: head/games/flare/files/patch-src-Hazard.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flare/files/patch-src-Hazard.cpp Tue Sep 17 12:31:27 2013 (r327471) @@ -0,0 +1,34 @@ +--- src/Hazard.cpp.orig 2013-04-01 18:21:13.000000000 +0400 ++++ src/Hazard.cpp 2013-09-17 05:59:52.364226200 +0400 +@@ -91,17 +91,17 @@ + activeAnimation->advanceFrame(); + + // handle movement +- if (!(round(speed.x) == 0 && round(speed.y) == 0)) { ++ if (!(myround(speed.x) == 0 && myround(speed.y) == 0)) { + pos.x += speed.x; + pos.y += speed.y; + + // very simplified collider, could skim around corners + // or even pass through thin walls if speed > tilesize +- if (collider->is_wall(round(pos.x), round(pos.y))) { ++ if (collider->is_wall(myround(pos.x), myround(pos.y))) { + lifespan = 0; + hit_wall = true; + +- if (collider->is_outside_map(round(pos.x) >> TILE_SHIFT, round(pos.y) >> TILE_SHIFT)) ++ if (collider->is_outside_map(myround(pos.x) >> TILE_SHIFT, myround(pos.y) >> TILE_SHIFT)) + remove_now = true; + } + } +@@ -143,8 +143,8 @@ + { + if (delay_frames == 0 && activeAnimation) { + Renderable re = activeAnimation->getCurrentFrame(animationKind); +- re.map_pos.x = round(pos.x); +- re.map_pos.y = round(pos.y); ++ re.map_pos.x = myround(pos.x); ++ re.map_pos.y = myround(pos.y); + (floor ? r_dead : r).push_back(re); + } + } Added: head/games/flare/files/patch-src-MapCollision.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flare/files/patch-src-MapCollision.cpp Tue Sep 17 12:31:27 2013 (r327471) @@ -0,0 +1,20 @@ +--- src/MapCollision.cpp.orig 2013-04-01 18:21:13.000000000 +0400 ++++ src/MapCollision.cpp 2013-09-17 06:00:27.655226476 +0400 +@@ -238,7 +238,7 @@ + for (int i=0; i