- Unbreak

- Fix build with gcc 4.2

6 files changed, 55 insertions, 4 deletions

diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile
index f56017ae6e4a..5cb3407a6a05 100644
--- a/games/armagetron/Makefile
+++ b/games/armagetron/Makefile
@@ -30,10 +30,6 @@ OPTIONS=	MUSIC	"Compile in support for background music" on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if !defined(WITHOUT_MUSIC)
 USE_SDL+=	mixer
 CONFIGURE_ARGS+=--enable-music
diff --git a/games/armagetron/files/patch-src-engine_eGrid.h b/games/armagetron/files/patch-src-engine_eGrid.h
new file mode 100644
index 000000000000..6b425490eb39
--- /dev/null
+++ b/games/armagetron/files/patch-src-engine_eGrid.h
@@ -0,0 +1,10 @@
+--- src/engine/eGrid.h.orig	2007-10-02 18:09:58.000000000 +0200
++++ src/engine/eGrid.h	2007-10-02 18:10:10.000000000 +0200
+@@ -39,6 +39,7 @@
+ class ePoint;
+ class eFace;
+ class eHalfEdge;
++class eGameObject;
+ class eWall;
+ class eGrid;
+ class eWallView;
diff --git a/games/armagetron/files/patch-src-engine_eVoter.cpp b/games/armagetron/files/patch-src-engine_eVoter.cpp
new file mode 100644
index 000000000000..03f055c17020
--- /dev/null
+++ b/games/armagetron/files/patch-src-engine_eVoter.cpp
@@ -0,0 +1,11 @@
+--- src/engine/eVoter.cpp.orig	2007-10-02 18:10:33.000000000 +0200
++++ src/engine/eVoter.cpp	2007-10-02 18:10:58.000000000 +0200
+@@ -39,6 +39,8 @@
+ #include "ePlayer.h"
+ #include "eGrid.h"
+ 
++class eMenuItemVote;
++
+ static unsigned short se_votingItemID = 0;
+ static float se_votingTimeout = 300.0f;
+ static nSettingItem< float > se_vt( "VOTING_TIMEOUT", se_votingTimeout );
diff --git a/games/armagetron/files/patch-src-engine_eWall.h b/games/armagetron/files/patch-src-engine_eWall.h
new file mode 100644
index 000000000000..1bd75ade32fd
--- /dev/null
+++ b/games/armagetron/files/patch-src-engine_eWall.h
@@ -0,0 +1,11 @@
+--- src/engine/eWall.h.orig	2007-10-02 18:12:07.000000000 +0200
++++ src/engine/eWall.h	2007-10-02 18:13:02.000000000 +0200
+@@ -53,6 +53,8 @@
+ 
+ 
+ class eWall;
++class eWallView;
++class eWallHolder;
+ class eGameObject;
+ 
+ class eWallView:public tHeapElement{
diff --git a/games/armagetron/files/patch-src-network_nPriorizing.h b/games/armagetron/files/patch-src-network_nPriorizing.h
new file mode 100644
index 000000000000..a82698815e5d
--- /dev/null
+++ b/games/armagetron/files/patch-src-network_nPriorizing.h
@@ -0,0 +1,10 @@
+--- src/network/nPriorizing.h.orig	2007-10-02 18:17:42.000000000 +0200
++++ src/network/nPriorizing.h	2007-10-02 18:18:00.000000000 +0200
+@@ -36,6 +36,7 @@
+ class nSendBuffer;
+ class nBandwidthControl;
+ class nBandwidthTask;
++class nBandwidthTaskPriorizer;
+ 
+ tDECLARE_REFOBJ( nBandwidthTask );
+ tDECLARE_REFOBJ( nBandwidthArbitrator );
diff --git a/games/armagetron/files/patch-src-tron_gCycle.h b/games/armagetron/files/patch-src-tron_gCycle.h
new file mode 100644
index 000000000000..c5a0c5509b4d
--- /dev/null
+++ b/games/armagetron/files/patch-src-tron_gCycle.h
@@ -0,0 +1,13 @@
+--- src/tron/gCycle.h.orig	2007-10-02 18:18:27.000000000 +0200
++++ src/tron/gCycle.h	2007-10-02 18:18:51.000000000 +0200
+@@ -40,6 +40,10 @@
+ class gTextureCycle;
+ class eSoundPlayer;
+ class gSensor;
++class gCycle;
++class gPlayerWall;
++class gNetPlayerWall;
++class gDestination;
+ 
+ // minimum time between two cycle turns
+ extern REAL sg_delayCycle;