Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
games/wormz/DESCR
+7
View File
@@ -0,0 +1,7 @@
A networked game for X11. Up to ten worms can battle it out over the network,
to attempt to cage one another in. Very much like tron. Excellent graphics,
works on 8, 16 and 24 bit displays.
To play, click on the "X" to set up your players, and click on the box
marked <none> to set up your controls, you may then type the key you wish
to use for left, and right.
games/wormz/MESSAGE
+8
View File
@@ -0,0 +1,8 @@
===========================================================================
$NetBSD: MESSAGE,v 1.4 2005/09/28 12:41:40 rillig Exp $
To play, click on the "X" to set up your players, and click on the box
marked <none> to set up your controls, you may then type the keys you
wish to use for left and right.
===========================================================================
games/wormz/Makefile
+29
View File
@@ -0,0 +1,29 @@
# $NetBSD: Makefile,v 1.24 2013/01/11 13:26:20 joerg Exp $
#
DISTNAME= Wormz-1.0b5
PKGNAME= wormz-1.0b5
PKGREVISION= 2
CATEGORIES= games x11
MASTER_SITES= http://lide.punknet.cz/miri/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://lide.punknet.cz/miri/Wormz.html
COMMENT= Networked game for X11
LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/Wormz
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
post-extract:
${MKDIR} ${WRKSRC}/NetBSD
${TOUCH} ${WRKSRC}/NetBSD/.depend
${MKDIR} ${WRKSRC}/DragonFly
${TOUCH} ${WRKSRC}/DragonFly/.depend
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
games/wormz/PLIST
+31
View File
@@ -0,0 +1,31 @@
@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:58 joerg Exp $
bin/Wormz
bin/Wormz-client16
bin/Wormz-client24
bin/Wormz-client8
bin/Wormz-server
share/Wormz/ArrowL.tga
share/Wormz/ArrowR.tga
share/Wormz/CPUChip.tga
share/Wormz/Human.tga
share/Wormz/Network.tga
share/Wormz/None.tga
share/Wormz/README.fonts
share/Wormz/Title.tga
share/Wormz/bchr.afm
share/Wormz/bchr.pfb
share/Wormz/bchri.afm
share/Wormz/bchri.pfb
share/Wormz/blue-wood.tga
share/Wormz/checkbox-c.tga
share/Wormz/checkbox-u.tga
share/Wormz/checker.tga
share/Wormz/darkwood.tga
share/Wormz/grass.tga
share/Wormz/linux.tga
share/Wormz/parquet.tga
share/Wormz/plasma.tga
share/Wormz/plasma2-cubism.tga
share/Wormz/plasma2-mosaic.tga
share/Wormz/plasma2.tga
share/Wormz/plasma3-mosaic.tga
games/wormz/distinfo
+34
View File
@@ -0,0 +1,34 @@
$NetBSD: distinfo,v 1.13 2013/01/11 13:26:20 joerg Exp $
SHA1 (Wormz-1.0b5.tar.gz) = a5e45e90fcc0eb4d188508bdffe71220ddcd20a4
RMD160 (Wormz-1.0b5.tar.gz) = 38411dcc3611d70d5873bf512439cd707372ef9e
Size (Wormz-1.0b5.tar.gz) = 436954 bytes
SHA1 (patch-aa) = 4aaf583300a445de33651983433199c3c503e77c
SHA1 (patch-ab) = b549a5afb22695695bbc1f6c07836632ea57bc65
SHA1 (patch-ac) = 7a7764b24bd5c1c6f5121508b9bf618a71cdc8de
SHA1 (patch-ad) = 8754a4a826273354e5b98586c44add9b818a3d53
SHA1 (patch-ae) = deaf33d7d7e584965e9496f8214a9a2505e75caa
SHA1 (patch-af) = 0ff265b68256d11581cb10a7a68234f9c3de834e
SHA1 (patch-ag) = d1e50491f1dcdcc6e35540f4bebc40504263c8a3
SHA1 (patch-ah) = e3386f64aadbd8d6a1d9f1ed9a8677351321a5e1
SHA1 (patch-ai) = 74bcb1fbb9ff8f3c7343e0a88a29b588306298c3
SHA1 (patch-aj) = 08e2f50d2eda949f5280032dc261da7d17507d06
SHA1 (patch-ak) = ee385419310c476d27703b856b8a11f9eddcae9d
SHA1 (patch-al) = 77ccd9a3d087024b66c9b9d77e742e3c8ed767ce
SHA1 (patch-am) = aa0b9f0b06998f1138795a1d13cd2e968cf48c49
SHA1 (patch-an) = 14c9c4ef9f8ee9faf010b797dec0c8dc57234a71
SHA1 (patch-ao) = 90e77ae1d2f1e606eba06ee985b504e4fa4431c8
SHA1 (patch-ap) = e8b24843effc24515ee81becd75c280b4ce6b548
SHA1 (patch-aq) = 66ed99cc9521ce31f9d155f590ea0d296c0e9eb2
SHA1 (patch-ar) = a43ccd48de0db0018495199af29e8fe6980c5b5b
SHA1 (patch-as) = 8cd06dd210d512644df2aad6fba1ce70abbf0245
SHA1 (patch-at) = 503ecb98bf54787baf655b007daaa3006e591065
SHA1 (patch-au) = e69f4050425dea7705782ac2688df6d19fbe6a2e
SHA1 (patch-av) = 81b507fd7df38f3a894eb45482743027df49df08
SHA1 (patch-aw) = b2d855826ffc9b67876acfe7da3b91a7ff5ea34a
SHA1 (patch-ax) = 514898af5dcf6b88adcbbc2e910dab463099e2f5
SHA1 (patch-ay) = 9f673fd72c1b111163c95038933b9ffb68474138
SHA1 (patch-az) = 334817c8e6f92a39f8df8e0e645ae13c0716bd52
SHA1 (patch-ba) = 80da240b3439b4cbc30e2796189ee94750c9021d
SHA1 (patch-bb) = fd59f3ccf4cd4cf3616199b2990abcced4e6fb42
SHA1 (patch-include_Debug.hh) = 67d9fdf4e214be4695f00d1baf9b43910479c395
games/wormz/patches/patch-aa
+156
View File
@@ -0,0 +1,156 @@
$NetBSD: patch-aa,v 1.5 2011/05/25 06:11:46 obache Exp $
--- Makefile.orig 1998-07-14 13:41:40.000000000 +0000
+++ Makefile
@@ -3,8 +3,8 @@
#BinInstallPath=$(ARCH)/
#LibInstallPath=images/
-BinInstallPath=/usr/X11R6/bin/
-LibInstallPath=/usr/lib/Wormz/
+BinInstallPath=$(PREFIX)/bin/
+LibInstallPath=$(PREFIX)/share/Wormz/
#AllDepths=16
AllDepths=8 16 24
@@ -29,13 +29,23 @@ else
ifeq ($(TYPEOS),Linux)
ARCH=Linux
EXTRALIBS=-lm
+else
+ifeq ($(TYPEOS),NetBSD)
+ARCH=NetBSD
+EXTRALIBS=-lm
+else
+ifeq ($(TYPEOS),DragonFly)
+ARCH=DragonFly
+EXTRALIBS=-lm
+else
#!!!
#EXTRALIBS=-lefence
-else
endif
endif
endif
+endif
+endif
ifdef USE_GGI
EXTRAGGILIBS=-lggi -lt1
@@ -43,11 +53,11 @@ endif
ifdef ARCH
-INSTALL=install
-INSTALLBIN=install -s
+INSTALL=install -c
+INSTALLBIN=install -c -s
INSTALLDIR=install -d
-CC=gcc
+#CC=gcc
CDEFS=-D$(ARCH) -DARCHDIR=\"$(ARCHDIR)\" -DColorDepth=$(Depth)
OPTFLAGS=-O2
@@ -60,8 +70,8 @@ WARNFLAGS=-Wall -Wcast-qual -Wcast-align
#-lefence
CFLAGS=-pipe $(INCLUDE) $(OPTFLAGS) $(DEBUGFLAGS) $(WARNFLAGS) $(CDEFS)
#-Wshadow
-X11INCLUDE=-I/usr/openwin/share/include/
-STDINCLUDE=-I/usr/local/lib/g++-include/ -I/usr/include/g++/
+X11INCLUDE=-I${X11BASE}/include
+STDINCLUDE=
INCLUDE=-I./include -I. $(X11INCLUDE) $(STDINCLUDE)
@@ -108,7 +118,7 @@ ObjsClientND=$(addprefix $(OBJDIR),$(Obj
SrcsClient=$(SrcsClientND) $(SrcsClientDD)
ObjsClient=$(ObjsClientND) $(ObjsClientDD)
-LibsClient=-L/usr/X11R6/lib/ -L/usr/local/lib/ -lX11 -lXext $(EXTRALIBS) $(EXTRAGGILIBS)
+LibsClient=${LDFLAGS} -L${X11BASE}/lib -lX11 -lXext $(EXTRALIBS) $(EXTRAGGILIBS)
SrcsServer=$(foreach dir,$(DirsServer),$(wildcard $(dir)/*.cc))
SrcsServerNotDir=$(notdir $(SrcsServer))
@@ -120,7 +130,7 @@ SrcsRunner=$(foreach dir,$(DirsRunner),$
SrcsRunnerNotDir=$(notdir $(SrcsRunner))
ObjsRunnerNotDir=$(SrcsRunnerNotDir:.cc=.o)
ObjsRunner=$(addprefix $(OBJDIR),$(ObjsRunnerNotDir))
-LibsRunner=-L/usr/X11R6/lib/ -L/usr/local/lib/ -lX11
+LibsRunner=${LDFLAGS} -L${LOCALBASE}/lib -L${PREFIX}/lib/ -lX11
AllDSrcs=$(foreach dir,$(DepthDepenceDirs),$(wildcard $(dir)/*.cc))
AllNSrcs=$(foreach dir,$(NotDepthDepenceDirs),$(wildcard $(dir)/*.cc))
@@ -130,10 +140,10 @@ vpath %.o $(OBJDIR)
$(OBJDIR)%$(Depth).o: %.cc
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CXX) $(CFLAGS) -c $< -o $@
$(OBJDIR)%.o: %.cc
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CXX) $(CFLAGS) -c $< -o $@
DEPEND=$(OBJDIR).depend
@@ -147,9 +157,9 @@ depend: Create-PathConfig
Depth=xxx $(MAKE) real-depend
real-depend:
- $(CC) $(CFLAGS) -MM $(AllNSrcs) | \
+ $(CXX) $(CFLAGS) -MM $(AllNSrcs) | \
awk '/^[^ ]/ { print "$(OBJDIR)" $$0 } /^ / { print $$0 }' > $(DEPEND)
- $(CC) $(CFLAGS) -MM $(AllDSrcs) | \
+ $(CXX) $(CFLAGS) -MM $(AllDSrcs) | \
awk '/^[^ ]/ { print "$(OBJDIR)" $$0 } /^ / { print $$0 }' > .deptmp
for i in $(AllDepths); do \
sed s/\\\.o/$$i\\\.o/g < .deptmp >> $(DEPEND) ; done
@@ -160,13 +170,13 @@ clean:
rm -f `find . -name \*~`
$(TargetClient): $(ObjsClient)
- $(CC) $(CFLAGS) -o $(TargetClient) $(LibsClient) $(ObjsClient)
+ $(CXX) $(CFLAGS) -o $(TargetClient) $(LibsClient) $(ObjsClient)
$(TargetRunner): $(ObjsRunner)
- $(CC) $(CFLAGS) -o $(TargetRunner) $(LibsRunner) $(ObjsRunner)
+ $(CXX) $(CFLAGS) -o $(TargetRunner) $(LibsRunner) $(ObjsRunner)
$(TargetServer): $(ObjsServer)
- $(CC) $(CFLAGS) -o $(TargetServer) $(LibsServer) $(ObjsServer)
+ $(CXX) $(CFLAGS) -o $(TargetServer) $(LibsServer) $(ObjsServer)
Client-target: $(TargetClient)
@@ -178,22 +188,22 @@ PathConfig=include/PathConfig.hh
Create-PathConfig:
echo '#ifndef _PathConfig_hh_' > $(PathConfig)
echo '#define _PathConfig_hh_' >> $(PathConfig)
- echo '#define ClientBinInstallPath "$(LibInstallPath)$(TargetNameClient)"' >> $(PathConfig)
+ echo '#define ClientBinInstallPath "$(BinInstallPath)$(TargetNameClient)"' >> $(PathConfig)
echo '#define ServerBinInstallPath "$(BinInstallPath)$(TargetNameServer)"' >> $(PathConfig)
echo '#define LibInstallPath "$(LibInstallPath)"' >> $(PathConfig)
echo '#define '$(DEF_USE_GGI) >> $(PathConfig)
echo '#endif' >> $(PathConfig)
install-client2:
- $(INSTALLBIN) $(TargetClient) $(LibInstallPath)$(TargetNameClient)
+ $(INSTALLBIN) $(TargetClient) $(DESTDIR)$(BinInstallPath)$(TargetNameClient)
install: all
- $(INSTALLDIR) $(BinInstallPath)
- $(INSTALLDIR) $(LibInstallPath)
- $(INSTALLBIN) $(TargetRunner) $(BinInstallPath)$(TargetNameRunner)
- $(INSTALLBIN) $(TargetServer) $(BinInstallPath)$(TargetNameServer)
+ $(INSTALLDIR) $(DESTDIR)$(BinInstallPath)
+ $(INSTALLDIR) $(DESTDIR)$(LibInstallPath)
+ $(INSTALLBIN) $(TargetRunner) $(DESTDIR)$(BinInstallPath)$(TargetNameRunner)
+ $(INSTALLBIN) $(TargetServer) $(DESTDIR)$(BinInstallPath)$(TargetNameServer)
for i in $(AllDepths); do Depth=$$i $(MAKE) install-client2 ; done
- $(INSTALL) images/* $(LibInstallPath)
+ $(INSTALL) images/* $(DESTDIR)$(LibInstallPath)
include $(DEPEND)
games/wormz/patches/patch-ab
+42
View File
@@ -0,0 +1,42 @@
$NetBSD: patch-ab,v 1.3 2006/04/21 09:00:23 joerg Exp $
--- ./include/Compat.hh.orig Tue Jul 7 23:02:01 1998
+++ ./include/Compat.hh Sat Feb 5 18:55:12 2000
@@ -14,7 +14,8 @@
#ifndef Linux
-#include <bool.h>
+#define TRUE 1
+#define FALSE 0
#include <string.h>
inline void bzero(void * data, int size)
@@ -22,7 +23,9 @@
memset(data, 0, size);
}
+#if !defined(__NetBSD__) && !defined(__DragonFly__)
const double PI=3.1415926535797;
+#endif
inline int byteswap(int old)
{
@@ -34,12 +37,15 @@
inline int byteswapshort(unsigned short old)
{
- return ((old & 0xff) << 8)
- + ((old & 0xff00) >> 8);
+/* return ((old & 0xff) << 8)
+ + ((old & 0xff00) >> 8);*/
+ return(old);
}
+#if !defined(__NetBSD__) && !defined(__DragonFly__)
extern "C" {
int usleep(unsigned int);
}
+#endif
#endif
#ifdef Linux
games/wormz/patches/patch-ac
+16
View File
@@ -0,0 +1,16 @@
$NetBSD: patch-ac,v 1.1.1.1 1998/11/05 08:24:12 garbled Exp $
--- PaintInterface/T1FontCreator.cc.orig Thu Nov 5 01:09:50 1998
+++ PaintInterface/T1FontCreator.cc Thu Nov 5 01:10:08 1998
@@ -1,3 +1,4 @@
+#ifdef USE_GGI
#include "T1FontCreator.hh"
#include "Utils.hh"
#include "PathConfig.hh"
@@ -6,7 +7,6 @@
#include <t1lib.h>
#include <unistd.h>
-#ifdef USE_GGI
T1FontCreator::T1FontCreator()
{
games/wormz/patches/patch-ad
+13
View File
@@ -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();
games/wormz/patches/patch-ae
+43
View File
@@ -0,0 +1,43 @@
$NetBSD: patch-ae,v 1.3 2004/02/18 23:09:03 kristerw Exp $
--- Network/UDPConnection.cc.orig Tue Jul 7 23:02:47 1998
+++ Network/UDPConnection.cc Wed Feb 18 23:05:15 2004
@@ -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");
@@ -148,7 +148,7 @@
return TRUE;
}
-int UDPConnection::Receive(char * buffer, int maxsize, bool Wait=TRUE)
+int UDPConnection::Receive(char * buffer, int maxsize, bool Wait)
{
fd_set set;
timeval timeout;
@@ -166,9 +166,9 @@
return 0;
// some data!
- int addr_len = sizeof(addr);
+ socklen_t addr_len = sizeof(addr);
sockaddr_in in_addr;
- bzero(&in_addr, addr_len);
+ bzero(&in_addr, (int)addr_len);
int ret = recvfrom (socket_fd, buffer, maxsize, 0, (sockaddr *) &in_addr, &addr_len);
if (ret <= 0) {
StdError("can't receive message");
games/wormz/patches/patch-af
+13
View File
@@ -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:
games/wormz/patches/patch-ag
+13
View File
@@ -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:
games/wormz/patches/patch-ah
+24
View File
@@ -0,0 +1,24 @@
$NetBSD: patch-ah,v 1.2 2011/12/05 22:47:14 joerg Exp $
--- XVision/View.hh.orig 1997-11-01 11:50:51.000000000 +0000
+++ XVision/View.hh
@@ -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;
@@ -50,8 +50,8 @@ class View {
virtual void Hide();
virtual void SetColor(const Pixel_t color, const ColorIndex index);
Pixel_t GetColor(const ColorIndex index);
- inline const int GetX() const;
- inline const int GetY() const;
+ const int GetX() const;
+ const int GetY() const;
inline const int GetW() const { return Area.Size.X; };
inline const int GetH() const { return Area.Size.Y; };
virtual bool HandleEvent(Event& event);
games/wormz/patches/patch-ai
+15
View File
@@ -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];
games/wormz/patches/patch-aj
+13
View File
@@ -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:
games/wormz/patches/patch-ak
+13
View File
@@ -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:
games/wormz/patches/patch-al
+61
View File
@@ -0,0 +1,61 @@
$NetBSD: patch-al,v 1.2 2004/02/18 23:09:03 kristerw Exp $
--- Client/WormApp.cc.orig Tue Apr 7 14:34:35 1998
+++ Client/WormApp.cc Wed Feb 18 23:48:19 2004
@@ -1,3 +1,4 @@
+#include "stdlib.h"
#include "WormApp.hh"
#include "XVision/Menu.hh"
#include "PaintInterface/TargaPicture.hh"
@@ -36,7 +37,7 @@
void Show();
};
-WormMenu::WormMenu(StaticText * _title, const char * _text, const Align _align=VAVertical)
+WormMenu::WormMenu(StaticText * _title, const char * _text, const Align _align)
: Menu(_align), title(_title), text(_text)
{
}
@@ -228,7 +229,7 @@
Application::Initialize();
}
-void WormApp::SwitchMenu(bool Flip=TRUE, bool DoShow=TRUE)
+void WormApp::SwitchMenu(bool Flip, bool DoShow)
{
if (!Flip && ((Visible && DoShow) || (!Visible && !DoShow)))
return;
@@ -374,7 +375,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 +402,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()
@@ -455,7 +456,7 @@
RecvChatLine(network->status);
}
-void WormApp::CreateServer(bool OnlySetHostname=FALSE)
+void WormApp::CreateServer(bool OnlySetHostname)
{
char s[max_hostname_len];
strcpy(s, default_server_hostname);
games/wormz/patches/patch-am
+23
View File
@@ -0,0 +1,23 @@
$NetBSD: patch-am,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- include/Utils.hh.orig Wed Feb 18 22:59:25 2004
+++ include/Utils.hh Wed Feb 18 23:01:36 2004
@@ -32,15 +32,15 @@
class Point {
public:
int X, Y;
- Point(const int _X=0, const int _Y=0) : X(_X), Y(_Y) { };
+ Point(const int tmp_X=0, const int tmp_Y=0) : X(tmp_X), Y(tmp_Y) { };
bool operator==(const Point& p) { return (p.X == X) && (p.Y == Y); };
};
class Rectangle {
public:
Point Origin, Size;
- Rectangle(const int _X=0, const int _Y=0, const int _W=0, const int _H=0)
- : Origin(_X, _Y), Size(_W, _H) { };
+ Rectangle(const int tmp_X=0, const int tmp_Y=0, const int _W=0, const int _H=0)
+ : Origin(tmp_X, tmp_Y), Size(_W, _H) { };
bool Inside(const Point& p) const;
bool Intersect(const Rectangle& second) const;
const int Right() const { return Origin.X+Size.X; };
games/wormz/patches/patch-an
+20
View File
@@ -0,0 +1,20 @@
$NetBSD: patch-an,v 1.2 2013/01/11 13:26:20 joerg Exp $
--- Runner/Runner.cc.orig 1997-09-11 16:19:12.000000000 +0000
+++ Runner/Runner.cc
@@ -2,13 +2,14 @@
#include <X11/Xutil.h>
#include <stdio.h> // can't use Utils.hh
#include <unistd.h>
+#include <stdlib.h>
#include "PathConfig.hh"
#define client_path ClientBinInstallPath
#define XMVI(bpp, colormodel) XMatchVisualInfo(dp, screen, bpp, colormodel, &vinfo_return)
-int main(char **argv, int argc)
+int main(int argc, char **argv)
{
printf("Wormz\n");
Display * dp;
games/wormz/patches/patch-ao
+22
View File
@@ -0,0 +1,22 @@
$NetBSD: patch-ao,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- XVision/Application.cc.orig Wed Feb 18 23:14:06 2004
+++ XVision/Application.cc Wed Feb 18 23:14:24 2004
@@ -5,7 +5,7 @@
Application * app_global = 0;
Application::Application(FrontBuffer * _front, FrameBuffer * _fb,
- EventManager * _evman, const Align _align=VAVertical)
+ EventManager * _evman, const Align _align)
: Group(_align), evman(_evman), front(_front), fb_save(_fb),
fbstop_count(0), rearrange_count(0), fb(_fb)
{
@@ -52,7 +52,7 @@
}
-void Application::ReArrange(bool CallParent=TRUE, View * except=0)
+void Application::ReArrange(bool CallParent, View * except)
{
StopRedraw();
Group::ReArrange(CallParent, except);
games/wormz/patches/patch-ap
+31
View File
@@ -0,0 +1,31 @@
$NetBSD: patch-ap,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- XVision/Group.cc.orig Wed Feb 18 23:15:27 2004
+++ XVision/Group.cc Wed Feb 18 23:17:37 2004
@@ -5,7 +5,7 @@
#define GroupBackground RGB(0, 0x22, 0x95)
//#define GroupBackground RGB(0x20, 0x20, 0x20)
-Group::Group(const Align _align=VAVertical)
+Group::Group(const Align _align)
: first(0), last(0), current(0), ChildAlign(_align)
{
SetColor(GroupBackground, ciBackground);
@@ -109,7 +109,7 @@
}
}
-void Group::ReArrange(bool CallParent=TRUE, View * except=0)
+void Group::ReArrange(bool CallParent, View * except)
{
if (!app_global->CanReArrange)
return;
@@ -282,7 +282,7 @@
View::PutEvent(event);
}
-void Group::SetHidden(bool _hidden, bool rearrange=TRUE)
+void Group::SetHidden(bool _hidden, bool rearrange)
{
if ((!_hidden) && (rearrange))
app_global->StopRedraw();
games/wormz/patches/patch-aq
+32
View File
@@ -0,0 +1,32 @@
$NetBSD: patch-aq,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- XVision/Menu.cc.orig Wed Feb 18 23:18:47 2004
+++ XVision/Menu.cc Wed Feb 18 23:20:32 2004
@@ -1,7 +1,7 @@
#include "Menu.hh"
-Submenu::Submenu(const char * _text, Group * _submenu=0,
- TextDirection _direction=tdNorth, FontShape _fontshape=fsOblique)
+Submenu::Submenu(const char * _text, Group * _submenu,
+ TextDirection _direction, FontShape _fontshape)
: Label(_text, cmInvalid, TRUE, _direction, _fontshape), submenu(_submenu)
{
if (submenu)
@@ -23,7 +23,7 @@
}
}
-Menu::Menu(const Align _align=VAVertical)
+Menu::Menu(const Align _align)
: Group(_align), upmenu(0)
{
AutoCenter = TRUE;
@@ -76,7 +76,7 @@
}
MenuItem::MenuItem(const char * _text, const CommandType _cc2 /* = cmInvalid */,
- FontShape _fontshape = fsOblique)
+ FontShape _fontshape)
: Label(_text, _cc2, TRUE, tdNorth, _fontshape)
{
}
games/wormz/patches/patch-ar
+122
View File
@@ -0,0 +1,122 @@
$NetBSD: patch-ar,v 1.2 2005/06/14 16:33:13 jmmv Exp $
--- XVision/SimpleViews.cc.orig 1998-04-07 14:27:23.000000000 +0200
+++ XVision/SimpleViews.cc
@@ -5,9 +5,10 @@
#include "Application.hh"
#include "XVisionGlobal.hh"
#include <stdio.h>
+#include <string.h>
-StaticText::StaticText(const char * _text, TextDirection _direction=tdNorth,
- FontShape _fontshape=fsRegular)
+StaticText::StaticText(const char * _text, TextDirection _direction,
+ FontShape _fontshape)
: text(0), buffer1(0), buffer2(0), buffer3(0),
direction(_direction), fontshape(_fontshape)
{
@@ -67,7 +68,7 @@ void StaticText::SetText(const char * _t
if (Visible && (!Hidden)) {
// Hide();
// Show();
- (parent ? parent : this)->Redraw();
+ if (parent) parent->Redraw(); else this->Redraw();
}
}
@@ -105,8 +106,8 @@ void StaticText::Draw()
}
Label::Label(const char * _text, const CommandType _cc,
- const bool _AutoResize=TRUE, TextDirection _direction=tdNorth,
- FontShape _fontshape=fsRegular)
+ const bool _AutoResize, TextDirection _direction,
+ FontShape _fontshape)
: StaticText(_text, _direction, _fontshape)
{
AutoResize = _AutoResize;
@@ -114,7 +115,7 @@ Label::Label(const char * _text, const C
Selectable = TRUE;
}
-Padding::Padding(const Align direction=VAVertical, const int Size=20)
+Padding::Padding(const Align direction, const int Size)
{
if (direction == VAVertical)
SetSize(Point(1, Size));
@@ -123,14 +124,14 @@ Padding::Padding(const Align direction=V
MinSize = Area.Size;
}
-Title::Title(const char * _text, TextDirection _direction=tdNorth,
- FontShape _fontshape=fsRegular)
+Title::Title(const char * _text, TextDirection _direction,
+ FontShape _fontshape)
: StaticText(_text, _direction, _fontshape)
{
SetColor(Pixel_t_Yellow, ciForeground);
}
-PictureView::PictureView(Picture * _picture=0, bool _DeleteP = TRUE, const CommandType _cc/* = cmInvalid */)
+PictureView::PictureView(Picture * _picture, bool _DeleteP, const CommandType _cc/* = cmInvalid */)
: picture(_picture), DeleteP(_DeleteP)
{
if (_cc != cmInvalid) {
@@ -197,8 +198,8 @@ void CheckBoxImg::Choose()
parent->SendDataChanged();
}
-CheckBox::CheckBox(const char * _text, bool _Checked=FALSE,
- bool * _Valuep=0, FontShape _fontshape=fsRegular)
+CheckBox::CheckBox(const char * _text, bool _Checked,
+ bool * _Valuep, FontShape _fontshape)
: Group(VAHorizontal), Checked(_Checked), Valuep(_Valuep)
{
AutoResize = TRUE;
@@ -217,9 +218,9 @@ void CheckBox::SetChecked(bool _Checked)
Status_v->Choose();
}
-Selector::Selector(const char ** _Items, const int _NumItems, const int _SelectedItem=0,
- const bool _AutoResize = TRUE, TextDirection _direction=tdNorth,
- FontShape _fontshape=fsRegular)
+Selector::Selector(const char ** _Items, const int _NumItems, const int _SelectedItem,
+ const bool _AutoResize , TextDirection _direction,
+ FontShape _fontshape)
: Label(_Items[_SelectedItem], cmInvalid, _AutoResize, _direction, _fontshape),
Items(_Items), NumItems(_NumItems), SelectedItem(_SelectedItem)
{
@@ -234,8 +235,8 @@ void Selector::Choose()
}
InputLine::InputLine(const char * _text, const int _MAXTextLen, const CommandType _cc /* = cmInvalid */,
- const bool _AutoResize = TRUE, TextDirection _direction=tdNorth,
- FontShape _fontshape=fsRegular)
+ const bool _AutoResize, TextDirection _direction,
+ FontShape _fontshape)
: Label(_text, _cc, _AutoResize, _direction, _fontshape),
MAXTextLen(_MAXTextLen)
{
@@ -300,10 +301,10 @@ void PictureSelector::SetItem(int _ItemN
static const int invalid_number = -4888839; // can't initialize on this number
InputNumber::InputNumber(const int _Number, const int _MinNumber, const int _MaxNumber,
- int * const _Valuep=0,
+ int * const _Valuep,
const CommandType _cc /* = cmInvalid */,
- const bool _AutoResize = TRUE, TextDirection _direction=tdNorth,
- FontShape _fontshape=fsRegular)
+ const bool _AutoResize, TextDirection _direction,
+ FontShape _fontshape)
: Label(" ", _cc, _AutoResize, _direction, _fontshape),
Number(invalid_number), Valuep(_Valuep), MinNumber(_MinNumber), MaxNumber(_MaxNumber)
{
@@ -335,7 +336,7 @@ void InputNumber::Deselect()
Label::Deselect();
}
-void InputNumber::SetNumber(const int _Number, bool DoCheck=TRUE)
+void InputNumber::SetNumber(const int _Number, bool DoCheck)
{
if (DoCheck && (_Number > MaxNumber))
return;
games/wormz/patches/patch-as
+49
View File
@@ -0,0 +1,49 @@
$NetBSD: patch-as,v 1.2 2011/12/05 22:47:14 joerg Exp $
--- XVision/View.cc.orig 1997-11-01 11:50:51.000000000 +0000
+++ XVision/View.cc
@@ -56,7 +56,7 @@ void View::Deselect()
Redraw();
}
-void View::SetEnabled(bool _Enabled=TRUE)
+void View::SetEnabled(bool _Enabled)
{
if (Enabled == _Enabled)
return;
@@ -214,7 +214,7 @@ void View::SetOrigin(const Point& newori
Area.Origin = neworigin;
}
-void View::SetSize(const Point& newsize, bool redraw=TRUE)
+void View::SetSize(const Point& newsize, bool redraw)
{
if (Area.Size == newsize)
return;
@@ -234,7 +234,7 @@ void View::SetSize(const Point& newsize,
Area.Size = newsize;
}
-void View::SetHidden(bool _hidden, bool rearrange=TRUE)
+void View::SetHidden(bool _hidden, bool rearrange)
{
if (_hidden == Hidden)
return;
@@ -317,7 +317,7 @@ bool SelectableView::HandleEvent(Event&
return TRUE;
}
-inline const int View::GetX() const
+const int View::GetX() const
{
int X = Area.Origin.X;
if (parent)
@@ -325,7 +325,7 @@ inline const int View::GetX() const
return X;
}
-inline const int View::GetY() const
+const int View::GetY() const
{
int Y = Area.Origin.Y;
if (parent)
games/wormz/patches/patch-at
+38
View File
@@ -0,0 +1,38 @@
$NetBSD: patch-at,v 1.2 2006/04/21 09:00:23 joerg Exp $
--- Game/Players.cc.orig 1998-07-07 21:02:38.000000000 +0000
+++ Game/Players.cc
@@ -24,7 +24,7 @@ const int invalid_playernum = -1;
Players::Players(FrameBuffer * _arena, FrameBuffer * _scorepanel,
Picture * _background, Picture * _wallborder, NetConnector * _network)
- : worms(new (Worm *)[MAXPlayers]), arena(_arena), scorepanel(_scorepanel),
+ : worms(new Worm *[MAXPlayers]), arena(_arena), scorepanel(_scorepanel),
background(_background), wallborder(_wallborder),
currentMaxPlayerNum(0), network(_network),
score(0), IsSurround(TRUE), winner_num(invalid_playernum)
@@ -42,7 +42,7 @@ Players::~Players()
delete crashBuffer;
}
-int Players::AddPlayer(Worm * player, int number=-1)
+int Players::AddPlayer(Worm * player, int number)
{
bool IsSame = FALSE;
if (between(number, 0, MAXPlayers-1)) {
@@ -243,12 +243,12 @@ void Players::UpdateRemote()
if (r && (r->GetType() == ptNetwork)) { // can't use IsRemote, it may not be Remote
bool Left, Press;
switch (si->Dir) {
- case si->DirLeft:
+ case nmStepItem::DirLeft:
Left = TRUE; Press = TRUE; break;
- case si->DirRight:
+ case nmStepItem::DirRight:
Left = FALSE; Press = TRUE; break;
default:
- case si->DirUnpress:
+ case nmStepItem::DirUnpress:
Left = TRUE; Press = FALSE;
}
r->Tune(Left, Press);
games/wormz/patches/patch-au
+12
View File
@@ -0,0 +1,12 @@
$NetBSD: patch-au,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- Game/Record.cc.orig Wed Feb 18 23:38:26 2004
+++ Game/Record.cc Wed Feb 18 23:38:57 2004
@@ -1,6 +1,6 @@
#include "Record.hh"
-void Record::NewRound(int sX=-1, int sY=-1, int sA=-1)
+void Record::NewRound(int sX, int sY, int sA)
{
Worm::NewRound(sX, sY, sA);
lCount = 0;
games/wormz/patches/patch-av
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-av,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- Game/Worm.cc.orig Wed Feb 18 23:39:21 2004
+++ Game/Worm.cc Wed Feb 18 23:39:43 2004
@@ -33,7 +33,7 @@
static const int MinBorderGap = 50;
-void Worm::NewRound(int sX=-1, int sY=-1, int sA=-1)
+void Worm::NewRound(int sX, int sY, int sA)
{
if (!between(sA, 0, MAXAngle-1)) {
int sa2 = Rand(MAXAngle);
games/wormz/patches/patch-aw
+40
View File
@@ -0,0 +1,40 @@
$NetBSD: patch-aw,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- Client/Fillers.cc.orig Wed Feb 18 23:42:54 2004
+++ Client/Fillers.cc Wed Feb 18 23:43:51 2004
@@ -23,7 +23,7 @@
return RGB(r, g, b);
}
-FlatFiller::FlatFiller(int _color=0)
+FlatFiller::FlatFiller(int _color)
: Filler(ftFlat), color(_color)
{
CreateImage();
@@ -40,7 +40,7 @@
TileBuffer(im, ImageSize, ImageSize);
}
-CircleFiller::CircleFiller(int _circle_color=0, int _bg_color=0)
+CircleFiller::CircleFiller(int _circle_color, int _bg_color)
: TwoOptFiller(ftCircle, _circle_color, _bg_color)
{
CreateImage();
@@ -67,7 +67,7 @@
TileBuffer(im, R, R);
}
-CheckerFiller::CheckerFiller(int _white=0, int _black=0)
+CheckerFiller::CheckerFiller(int _white, int _black)
: TwoOptFiller(ftChecker, _white, _black)
{
CreateImage();
@@ -90,7 +90,7 @@
TileBuffer(im, R, R);
}
-PictureFiller::PictureFiller(int _NumPictures, Picture ** _pictures, int _ActualPicture=0)
+PictureFiller::PictureFiller(int _NumPictures, Picture ** _pictures, int _ActualPicture)
: Filler(ftPicture), pictures(_pictures), NumPictures(_NumPictures), ActualPicture(_ActualPicture)
{
CreateImage();
games/wormz/patches/patch-ax
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-ax,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- Client/PlayerControlView.cc.orig Wed Feb 18 23:44:27 2004
+++ Client/PlayerControlView.cc Wed Feb 18 23:45:03 2004
@@ -1,7 +1,7 @@
#include "PlayerControlView.hh"
#include <string.h>
-PlayerControlView::PlayerControlView(TextDirection _direction=tdNorth, FontShape _fontshape=fsRegular)
+PlayerControlView::PlayerControlView(TextDirection _direction, FontShape _fontshape)
: Label("<none>", cmInvalid, TRUE, _direction, _fontshape),
savel(ktInvalid), saver(ktInvalid),
WaitForLKey(FALSE), WaitForRKey(FALSE),
games/wormz/patches/patch-ay
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-ay,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- Client/PlayerSelector.cc.orig Wed Feb 18 23:45:34 2004
+++ Client/PlayerSelector.cc Wed Feb 18 23:45:59 2004
@@ -199,7 +199,7 @@
return TRUE;
}
-void PlayerSelector::SetHidden(bool _hidden, bool rearrange=TRUE)
+void PlayerSelector::SetHidden(bool _hidden, bool rearrange)
{
Group::SetHidden(_hidden, rearrange);
if (!_hidden)
games/wormz/patches/patch-az
+9
View File
@@ -0,0 +1,9 @@
$NetBSD: patch-az,v 1.1 2004/02/18 23:09:03 kristerw Exp $
--- PaintInterface/Picture.cc.orig Wed Feb 18 23:51:42 2004
+++ PaintInterface/Picture.cc Wed Feb 18 23:51:58 2004
@@ -1,3 +1,4 @@
+#include <string.h>
#include "Picture.hh"
Picture * Picture::CreateCopy()
games/wormz/patches/patch-ba
+12
View File
@@ -0,0 +1,12 @@
$NetBSD: patch-ba,v 1.1 2005/06/14 16:33:13 jmmv Exp $
--- Xlib/XlibImage.cc.orig 2005-06-14 17:01:14.191898576 +0200
+++ Xlib/XlibImage.cc 2005-06-14 17:01:32.255152544 +0200
@@ -2,6 +2,7 @@
#include <X11/Xutil.h>
#include <sys/ipc.h>
#include <sys/shm.h>
+#include <string.h>
#include "Utils.hh"
static bool DontUseShm = FALSE;
games/wormz/patches/patch-bb
+12
View File
@@ -0,0 +1,12 @@
$NetBSD: patch-bb,v 1.1 2008/07/10 13:09:58 joerg Exp $
--- include/FrameBuffer.hh.orig 2008-07-10 13:03:29.000000000 +0000
+++ include/FrameBuffer.hh
@@ -1,6 +1,7 @@
#ifndef _FrameBuffer_hh_
#define _FrameBuffer_hh_
+#include "FrontBuffer.hh"
#include "Compat.hh"
#include "GraphConfig.hh"
#include "Transparency.hh"
games/wormz/patches/patch-include_Debug.hh
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-include_Debug.hh,v 1.1 2011/12/05 22:47:14 joerg Exp $
--- include/Debug.hh.orig 1997-11-01 11:49:56.000000000 +0000
+++ include/Debug.hh
@@ -12,7 +12,8 @@
#undef DEBUGPaint
#endif
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#ifdef DEBUG
#include <time.h>
#endif