svn commit: r432976 - in head/games/edge: . files

[Jan Beich]

Author: jbeich
Date: Wed Feb  1 05:26:51 2017
New Revision: 432976
URL: https://svnweb.freebsd.org/changeset/ports/432976

Log:
  games/edge: unbreak with clang 4.0
  
  src/p_enemy.cc:531:26: error: ordered comparison between pointer and zero
        ('struct mobj_s **' and 'int')
          if (brain_spots.targets > 0)
              ~~~~~~~~~~~~~~~~~~~ ^ ~
  src/w_sprite.cc:578:42: error: ordered comparison between pointer and zero
        ('spriteframe_c *' and 'int')
                          if (sprites[states[i].sprite]->frames > 0)
                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
  
  Reported by:	antoine (via exp-run)

Added:
  head/games/edge/files/patch-src_p__enemy.cc   (contents, props changed)
  head/games/edge/files/patch-src_w__sprite.cc   (contents, props changed)
Modified:
  head/games/edge/Makefile   (contents, props changed)

Modified: head/games/edge/Makefile
==============================================================================
--- head/games/edge/Makefile	Wed Feb  1 05:26:37 2017	(r432975)
+++ head/games/edge/Makefile	Wed Feb  1 05:26:51 2017	(r432976)
@@ -3,7 +3,7 @@
 
 PORTNAME=	edge
 PORTVERSION=	1.35
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION} \
 		SF/${PORTNAME}/EDGE%20Binaries/${PORTVERSION}:wad

Added: head/games/edge/files/patch-src_p__enemy.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/edge/files/patch-src_p__enemy.cc	Wed Feb  1 05:26:51 2017	(r432976)
@@ -0,0 +1,11 @@
+--- src/p_enemy.cc.orig	2011-03-31 12:12:40 UTC
++++ src/p_enemy.cc
+@@ -528,7 +528,7 @@ void P_FreeShootSpots(void)
+ 	if (brain_spots.number < 0)
+ 		return;
+ 
+-	if (brain_spots.targets > 0)
++	if (brain_spots.targets)
+ 	{
+ 		SYS_ASSERT(brain_spots.targets);
+ 

Added: head/games/edge/files/patch-src_w__sprite.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/edge/files/patch-src_w__sprite.cc	Wed Feb  1 05:26:51 2017	(r432976)
@@ -0,0 +1,11 @@
+--- src/w_sprite.cc.orig	2010-12-31 04:28:14 UTC
++++ src/w_sprite.cc
+@@ -575,7 +575,7 @@ bool W_CheckSpritesExist(const state_gro
+ 			if (states[i].sprite == SPR_NULL)
+ 				continue;
+ 
+-			if (sprites[states[i].sprite]->frames > 0)
++			if (sprites[states[i].sprite]->numframes > 0)
+ 				return true;	
+ 
+ 			// -AJA- only check one per group.  It _should_ check them all,