Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 12 Sep 2013 00:18:04 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r327017 - in head/games/intensityengine: . files
Message-ID:  <201309120018.r8C0I4sU059353@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: amdmi3
Date: Thu Sep 12 00:18:03 2013
New Revision: 327017
URL: http://svnweb.freebsd.org/changeset/ports/327017

Log:
  - Fix build with clang

Added:
  head/games/intensityengine/files/patch-src-engine-cubeloader.cpp   (contents, props changed)
Modified:
  head/games/intensityengine/Makefile

Modified: head/games/intensityengine/Makefile
==============================================================================
--- head/games/intensityengine/Makefile	Wed Sep 11 22:46:00 2013	(r327016)
+++ head/games/intensityengine/Makefile	Thu Sep 12 00:18:03 2013	(r327017)
@@ -18,7 +18,6 @@ USE_SDL=	sdl mixer image
 USE_GL=		gl glu
 USES=		cmake
 SUB_FILES=	intensity_client
-USE_GCC=	4.2+
 
 ONLY_FOR_ARCHS=	i386 amd64
 

Added: head/games/intensityengine/files/patch-src-engine-cubeloader.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/intensityengine/files/patch-src-engine-cubeloader.cpp	Thu Sep 12 00:18:03 2013	(r327017)
@@ -0,0 +1,28 @@
+diff --git src/engine/cubeloader.cpp src/engine/cubeloader.cpp
+index b7a1504..939cc2c 100755
+--- src/engine/cubeloader.cpp
++++ src/engine/cubeloader.cpp
+@@ -259,12 +259,12 @@ struct cubeloader
+             else
+             {
+                 conoutf(CON_ERROR, "map %s has malformatted header", cgzname); 
+-                gzclose(f); 
++                delete f;
+                 return; 
+             }
+         }
+         else if(hdr.version>5) mod = true;
+-        if(hdr.version>5 && !mod) { conoutf(CON_ERROR, "map %s requires a newer version of the Cube 1 importer", cgzname); gzclose(f); return; }
++        if(hdr.version>5 && !mod) { conoutf(CON_ERROR, "map %s requires a newer version of the Cube 1 importer", cgzname); delete f; return; }
+         if(!haslocalclients()) game::forceedit("");
+         emptymap(12, true, NULL);
+         freeocta(worldroot);
+@@ -280,7 +280,7 @@ struct cubeloader
+         {
+             hdr.waterlevel = -100000;
+         }
+-        if(mod) gzseek(f, hdr.numents*sizeof(c_persistent_entity), SEEK_CUR);
++        if(mod) f->seek(hdr.numents*sizeof(c_persistent_entity), SEEK_CUR);
+         else loopi(hdr.numents)
+         {
+             c_persistent_entity e;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309120018.r8C0I4sU059353>