summaryrefslogtreecommitdiff
path: root/games/wormz
diff options
context:
space:
mode:
authortron <tron>2002-08-14 16:18:40 +0000
committertron <tron>2002-08-14 16:18:40 +0000
commit407290f3ccef504b4f21f26c934753ebf60f3e24 (patch)
tree1f14018b5b0f5b7207ba7005ad2f70f636e35574 /games/wormz
parent4280121620cc633039c56084515ff32829335e06 (diff)
downloadpkgsrc-407290f3ccef504b4f21f26c934753ebf60f3e24.tar.gz
Fix C++ sloppiness to make this build with g++ 2.95.3.
Diffstat (limited to 'games/wormz')
-rw-r--r--games/wormz/distinfo11
-rw-r--r--games/wormz/patches/patch-ad13
-rw-r--r--games/wormz/patches/patch-ae31
-rw-r--r--games/wormz/patches/patch-af13
-rw-r--r--games/wormz/patches/patch-ag13
-rw-r--r--games/wormz/patches/patch-ah13
-rw-r--r--games/wormz/patches/patch-ai15
-rw-r--r--games/wormz/patches/patch-aj13
-rw-r--r--games/wormz/patches/patch-ak13
-rw-r--r--games/wormz/patches/patch-al29
10 files changed, 163 insertions, 1 deletions
diff --git a/games/wormz/distinfo b/games/wormz/distinfo
index 59319082ac1..fadf92a73a6 100644
--- a/games/wormz/distinfo
+++ b/games/wormz/distinfo
@@ -1,7 +1,16 @@
-$NetBSD: distinfo,v 1.3 2002/07/17 18:22:24 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/14 16:18:40 tron Exp $
SHA1 (Wormz-1.0b5.tar.gz) = a5e45e90fcc0eb4d188508bdffe71220ddcd20a4
Size (Wormz-1.0b5.tar.gz) = 436954 bytes
SHA1 (patch-aa) = d662af7e771fe1cec709bc09dbc9df5d9e634adf
SHA1 (patch-ab) = 44c938189653de05b48a3ea8ec01442a1c5f22f6
SHA1 (patch-ac) = 7a7764b24bd5c1c6f5121508b9bf618a71cdc8de
+SHA1 (patch-ad) = 8754a4a826273354e5b98586c44add9b818a3d53
+SHA1 (patch-ae) = e01abdeb3334139d2ab0d46e191edc876639960b
+SHA1 (patch-af) = 0ff265b68256d11581cb10a7a68234f9c3de834e
+SHA1 (patch-ag) = d1e50491f1dcdcc6e35540f4bebc40504263c8a3
+SHA1 (patch-ah) = 4b5cbc48bc7687f36ce9b634d38011bfedb4b11e
+SHA1 (patch-ai) = 74bcb1fbb9ff8f3c7343e0a88a29b588306298c3
+SHA1 (patch-aj) = 08e2f50d2eda949f5280032dc261da7d17507d06
+SHA1 (patch-ak) = ee385419310c476d27703b856b8a11f9eddcae9d
+SHA1 (patch-al) = 2a02642b1c3f1aad2e28020770a0d046b568abd7
diff --git a/games/wormz/patches/patch-ad b/games/wormz/patches/patch-ad
new file mode 100644
index 00000000000..0206d24063f
--- /dev/null
+++ b/games/wormz/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/08/14 16:18:41 tron Exp $
+
+--- Game/Players.hh.orig Wed Sep 10 18:52:12 1997
++++ Game/Players.hh Wed Aug 14 18:01:20 2002
+@@ -23,7 +23,7 @@
+ void InitializeCrashBuffer();
+ bool IsSurround;
+ public:
+- const int MAXPlayers = 100;
++ static const int MAXPlayers = 100;
+ Players(FrameBuffer * _arena, FrameBuffer * _scorepanel,
+ Picture * _background, Picture * _wallborder, NetConnector * _network);
+ ~Players();
diff --git a/games/wormz/patches/patch-ae b/games/wormz/patches/patch-ae
new file mode 100644
index 00000000000..d6e732aa20b
--- /dev/null
+++ b/games/wormz/patches/patch-ae
@@ -0,0 +1,31 @@
+$NetBSD: patch-ae,v 1.1 2002/08/14 16:18:41 tron Exp $
+
+--- Network/UDPConnection.cc.orig Tue Jul 7 23:02:47 1998
++++ Network/UDPConnection.cc Wed Aug 14 18:05:03 2002
+@@ -66,7 +66,7 @@
+ }
+
+ DEBUGP("Connecting to server" << hostname << ", port " << peer_port);
+- int addr_len = sizeof(addr);
++ socklen_t addr_len = sizeof(addr);
+ if (getsockname (socket_fd, (sockaddr *) &a, &addr_len)) {
+ close(socket_fd);
+ StdError("can't get sockname");
+@@ -116,7 +116,7 @@
+ StdError("can't bind socket");
+ return FALSE;
+ }
+- int addr_len = sizeof(addr);
++ socklen_t addr_len = sizeof(addr);
+ if (getsockname (socket_fd, (sockaddr *) &addr, &addr_len)) {
+ close(socket_fd);
+ StdError("can't get sockname");
+@@ -166,7 +166,7 @@
+ return 0;
+
+ // some data!
+- int addr_len = sizeof(addr);
++ socklen_t addr_len = sizeof(addr);
+ sockaddr_in in_addr;
+ bzero(&in_addr, addr_len);
+ int ret = recvfrom (socket_fd, buffer, maxsize, 0, (sockaddr *) &in_addr, &addr_len);
diff --git a/games/wormz/patches/patch-af b/games/wormz/patches/patch-af
new file mode 100644
index 00000000000..7d911278035
--- /dev/null
+++ b/games/wormz/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2002/08/14 16:18:41 tron Exp $
+
+--- include/Event.hh.orig Sat Nov 1 12:49:56 1997
++++ include/Event.hh Wed Aug 14 18:07:43 2002
+@@ -105,7 +105,7 @@
+ const int ktMAX = 1056;
+
+
+-const cmInvalid = 0;
++const int cmInvalid = 0;
+
+ class EventManager {
+ protected:
diff --git a/games/wormz/patches/patch-ag b/games/wormz/patches/patch-ag
new file mode 100644
index 00000000000..32afb0ad2ec
--- /dev/null
+++ b/games/wormz/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2002/08/14 16:18:42 tron Exp $
+
+--- include/FontCreator.hh.orig Mon Apr 13 17:47:20 1998
++++ include/FontCreator.hh Wed Aug 14 18:09:37 2002
+@@ -5,7 +5,7 @@
+
+ enum TextDirection { tdNorth, tdEast, tdSouth, tdWest };
+ enum FontShape { fsRegular, fsOblique, fsSmallRegular, fsSmallOblique };
+-const FontShapeCount = 4;
++const int FontShapeCount = 4;
+
+ class FontCreator {
+ protected:
diff --git a/games/wormz/patches/patch-ah b/games/wormz/patches/patch-ah
new file mode 100644
index 00000000000..4d4a56f1ae2
--- /dev/null
+++ b/games/wormz/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2002/08/14 16:18:42 tron Exp $
+
+--- XVision/View.hh.orig Sat Nov 1 12:50:51 1997
++++ XVision/View.hh Wed Aug 14 18:10:26 2002
+@@ -7,7 +7,7 @@
+ enum Align { VAHorizontal, VAVertical };
+ enum ColorIndex { ciForeground, ciHighlightedFG, ciDisabledFG,
+ ciBackground, ciHighlightedBG };
+-const ColorIndexCount = 5;
++const int ColorIndexCount = 5;
+
+ const CommandType cmSizeChanged = 1000;
+ const CommandType cmCancel = 1001;
diff --git a/games/wormz/patches/patch-ai b/games/wormz/patches/patch-ai
new file mode 100644
index 00000000000..15e0b381205
--- /dev/null
+++ b/games/wormz/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2002/08/14 16:18:42 tron Exp $
+
+--- Game/AI.cc.orig Sat Nov 1 12:55:25 1997
++++ Game/AI.cc Wed Aug 14 18:11:12 2002
+@@ -12,8 +12,8 @@
+ static const int RStep = R/Step;
+ static const double AngleStep = 1/double(R);
+ static const int AngleCount = int(2*PI*R/Parts);
+-static const PartPoints = RStep*AngleCount;
+-static const Rshift = 5;
++static const int PartPoints = RStep*AngleCount;
++static const int Rshift = 5;
+
+ static int linear2crash[Parts][PartPoints];
+
diff --git a/games/wormz/patches/patch-aj b/games/wormz/patches/patch-aj
new file mode 100644
index 00000000000..75ebcad3ee5
--- /dev/null
+++ b/games/wormz/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2002/08/14 16:18:42 tron Exp $
+
+--- include/Filler.hh.orig Sat Nov 1 12:49:56 1997
++++ include/Filler.hh Wed Aug 14 18:11:57 2002
+@@ -9,7 +9,7 @@
+ class Filler {
+ public:
+ int ImageWidth;
+- const int ImageSize = 5;
++ static const int ImageSize = 5;
+ FillerType_t type;
+ int ImageHS;
+ protected:
diff --git a/games/wormz/patches/patch-ak b/games/wormz/patches/patch-ak
new file mode 100644
index 00000000000..eb8e3b2fb80
--- /dev/null
+++ b/games/wormz/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2002/08/14 16:18:42 tron Exp $
+
+--- Client/ScoreTable.hh.orig Sat Nov 1 12:50:14 1997
++++ Client/ScoreTable.hh Wed Aug 14 18:12:55 2002
+@@ -8,7 +8,7 @@
+
+ class ScoreTable : public Group {
+ protected:
+- const int showitems = 10;
++ static const int showitems = 10;
+ StaticText * points[showitems];
+ StaticText * names[showitems];
+ public:
diff --git a/games/wormz/patches/patch-al b/games/wormz/patches/patch-al
new file mode 100644
index 00000000000..7ccccb4fd73
--- /dev/null
+++ b/games/wormz/patches/patch-al
@@ -0,0 +1,29 @@
+$NetBSD: patch-al,v 1.1 2002/08/14 16:18:42 tron Exp $
+
+--- Client/WormApp.cc.orig Tue Apr 7 14:34:35 1998
++++ Client/WormApp.cc Wed Aug 14 18:15:25 2002
+@@ -374,7 +374,7 @@
+ sprintf(s, "Player %s wins round %i!", w->GetName(), current_round);
+ else
+ sp = "No winner";
+- TypeText(sp, Pixel_t_HiBlue, usec2sec, &EndRoundCallback1);
++ TypeText(sp, Pixel_t_HiBlue, usec2sec, &WormApp::EndRoundCallback1);
+ }
+
+ void WormApp::EndRoundCallback1()
+@@ -401,13 +401,13 @@
+ players->NewRound();
+ char s[40];
+ sprintf(s, "Round %i of %i", current_round, rounds);
+- TypeText(s, Pixel_t_Blue, usec2sec, &StartRoundCallback1);
++ TypeText(s, Pixel_t_Blue, usec2sec, &WormApp::StartRoundCallback1);
+ }
+
+ void WormApp::StartRoundCallback1()
+ {
+ players->DrawAll();
+- TypeText("GET READY!", Pixel_t_Red, usec2sec, &StartRoundCallback2);
++ TypeText("GET READY!", Pixel_t_Red, usec2sec, &WormApp::StartRoundCallback2);
+ }
+
+ void WormApp::StartRoundCallback2()