summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2010-04-06 17:28:22 +0000
committerTristan Heaven <nyhm@gentoo.org>2010-04-06 17:28:22 +0000
commit1277d190965cc0232f2eac296838c7b735e76450 (patch)
treedc2164ce69131f52f154777822e60b2cc0448b76 /games-action/armagetronad
parentFix homepage. (diff)
downloadgentoo-2-1277d190965cc0232f2eac296838c7b735e76450.tar.gz
gentoo-2-1277d190965cc0232f2eac296838c7b735e76450.tar.bz2
gentoo-2-1277d190965cc0232f2eac296838c7b735e76450.zip
rm
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'games-action/armagetronad')
-rw-r--r--games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild86
-rw-r--r--games-action/armagetronad/files/armagetronad36
-rw-r--r--games-action/armagetronad/files/armagetronad-0.2.7.1-build.patch34
-rw-r--r--games-action/armagetronad/files/armagetronad-0.2.7.1-gcc4.patch60
-rw-r--r--games-action/armagetronad/files/armagetronad-0.2.7.1-gcc43.patch415
-rw-r--r--games-action/armagetronad/files/armagetronad-0.2.7.1-security-1.patch20
-rw-r--r--games-action/armagetronad/files/armagetronad-ded32
7 files changed, 0 insertions, 683 deletions
diff --git a/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild
deleted file mode 100644
index 71b629234395..000000000000
--- a/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild,v 1.9 2009/06/08 17:07:30 mr_bones_ Exp $
-
-inherit eutils games
-
-DESCRIPTION="3d tron lightcycles, just like the movie"
-HOMEPAGE="http://armagetronad.sourceforge.net/"
-SRC_URI="mirror://sourceforge/armagetronad/${P}.tar.bz2
- !dedicated? (
- http://armagetron.sourceforge.net/addons/moviesounds_fq.zip
- http://armagetron.sourceforge.net/addons/moviepack.zip
- )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dedicated"
-
-RDEPEND="
- !dedicated? (
- sys-libs/zlib
- virtual/opengl
- virtual/glu
- media-libs/libsdl
- media-libs/sdl-image
- media-libs/jpeg
- media-libs/libpng
- )"
-DEPEND="${RDEPEND}
- !dedicated? ( app-arch/unzip )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-gcc4.patch
- epatch "${FILESDIR}"/${P}-gcc43.patch #218542
- epatch "${FILESDIR}"/${P}-security-1.patch
- epatch "${FILESDIR}"/${P}-build.patch
- cp "${FILESDIR}"/${PN}-ded "${FILESDIR}"/${PN} . || die
- sed -i \
- -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
- -e "s:@GAMES_LIBDIR@:$(games_get_libdir):" \
- -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
- ${PN}-ded ${PN}
-}
-
-src_compile() {
- local myconf=""
- use dedicated && myconf="--disable-glout"
- egamesconf ${myconf} || die "egamesconf failed"
- emake || die "emake failed"
- make documentation || die "make doc failed"
-}
-
-src_install() {
- dohtml doc/*.html
- docinto html/net
- dohtml doc/net/*.html
- newicon tron.ico ${PN}.ico
- exeinto "$(games_get_libdir)/${PN}"
- if use dedicated ; then
- doexe src/tron/${PN}-dedicated || die "copying files"
- else
- doexe src/tron/${PN} || die "copying files"
- fi
- doexe src/network/armagetronad-* || die "copying files"
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r log language || die "copying files"
- if ! use dedicated ; then
- doins -r arenas models sound textures music || die "copying files"
- fi
- insinto "${GAMES_SYSCONFDIR}/${PN}"
- doins -r config/* || die "copying files"
- cd "${S}"
- if ! use dedicated ; then
- insinto "${GAMES_DATADIR}/${PN}"
- dogamesbin ${PN} || die
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r ../moviepack ../moviesounds || die "copying movies"
- make_desktop_entry armagetronad "Armagetron Advanced" ${PN}.ico
- else
- dogamesbin ${PN}-ded || die
- fi
- prepgamesdirs
-}
diff --git a/games-action/armagetronad/files/armagetronad b/games-action/armagetronad/files/armagetronad
deleted file mode 100644
index bf362ebbad75..000000000000
--- a/games-action/armagetronad/files/armagetronad
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# starts Armagetron Advanced from the installation directory
-
-GAMES_LIBDIR="@GAMES_LIBDIR@/armagetronad"
-GAMES_DATADIR="@GAMES_DATADIR@"
-GAMES_SYSCONFDIR="@GAMES_SYSCONFDIR@"
-PN=armagetronad
-
-if test ! -r "${HOME}"/.armagetronad ; then
- mkdir "${HOME}"/.armagetronad
-
- if test -r "${HOME}"/.ArmageTronrc ; then
- # migrage very old configuration
- echo "Porting very old configuration..."
- mkdir "${HOME}"/.armagetronad/var
- mv "${HOME}"/.ArmageTronrc "${HOME}"/.armagetronad/var/user.cfg
- fi
-fi
-
-if test ! -r "${HOME}"/.armagetronad/var ; then
- #migrate old configuration
- files=$( find "${HOME}"/.armagetronad -type f -maxdepth 1 )
-
- mkdir "${HOME}"/.armagetronad/var
- if test "$files" != "" ; then
- echo "Porting old configuration..."
- mv $files "${HOME}"/.armagetronad/var
- fi
-fi
-
-exec \
-"${GAMES_LIBDIR}"/${PN} \
- --datadir "${GAMES_DATADIR}"/${PN} \
- --configdir "${GAMES_SYSCONFDIR}"/${PN} \
- --userdatadir "${HOME}"/.armagetronad "$@"
diff --git a/games-action/armagetronad/files/armagetronad-0.2.7.1-build.patch b/games-action/armagetronad/files/armagetronad-0.2.7.1-build.patch
deleted file mode 100644
index 244a575a5441..000000000000
--- a/games-action/armagetronad/files/armagetronad-0.2.7.1-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -69,7 +69,7 @@
- $(MAKE) all
-
- src/doc/commands.txt: @progname@ Makefile
-- ./@progname@ --doc > src/doc/commands.txt
-+ src/tron/@progname@ --doc > src/doc/commands.txt
-
- # build documentation from M4 sources or just copy it
- documentation: src/doc/commands.txt src/doc/* src/doc/net/*
---- src/network/net_udp.cpp
-+++ src/network/net_udp.cpp
-@@ -178,7 +178,7 @@
- struct hostent *local;
- char buff[MAXHOSTNAMELEN]="\0";
- struct sockaddr addr;
-- char *colon;
-+ const char *colon;
-
- #ifdef WIN32
- WSADATA winsockdata;
-@@ -232,9 +232,9 @@
-
- ANET_GetSocketAddr (net_controlsocket, &addr);
- my_tcpip_address=ANET_AddrToString (&addr);
-- colon = strrchr (my_tcpip_address, ':');
-+ colon = (strrchr (my_tcpip_address, ':'));
- if (colon)
-- *colon = 0;
-+ *const_cast<char*>(colon) = 0;
-
- // Con_Printf("UDP Initialized\n");
- tcpipAvailable = true;
diff --git a/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc4.patch b/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc4.patch
deleted file mode 100644
index fd12a5c971ce..000000000000
--- a/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc4.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur armagetronad-0.2.7.1-orig/src/engine/eGrid.h armagetronad-0.2.7.1/src/engine/eGrid.h
---- armagetronad-0.2.7.1-orig/src/engine/eGrid.h 2005-02-03 17:26:03.000000000 +0100
-+++ armagetronad-0.2.7.1/src/engine/eGrid.h 2006-06-04 20:06:17.000000000 +0200
-@@ -39,6 +39,7 @@
- class ePoint;
- class eFace;
- class eHalfEdge;
-+class eGameObject;
- class eWall;
- class eGrid;
- class eWallView;
-diff -ur armagetronad-0.2.7.1-orig/src/engine/eVoter.cpp armagetronad-0.2.7.1/src/engine/eVoter.cpp
---- armagetronad-0.2.7.1-orig/src/engine/eVoter.cpp 2005-03-02 23:25:18.000000000 +0100
-+++ armagetronad-0.2.7.1/src/engine/eVoter.cpp 2006-06-04 20:13:54.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 -ur armagetronad-0.2.7.1-orig/src/engine/eWall.h armagetronad-0.2.7.1/src/engine/eWall.h
---- armagetronad-0.2.7.1-orig/src/engine/eWall.h 2005-02-01 17:54:13.000000000 +0100
-+++ armagetronad-0.2.7.1/src/engine/eWall.h 2006-06-04 19:49:36.000000000 +0200
-@@ -53,6 +53,8 @@
-
-
- class eWall;
-+class eWallView;
-+class eWallHolder;
- class eGameObject;
-
- class eWallView:public tHeapElement{
-diff -ur armagetronad-0.2.7.1-orig/src/network/nPriorizing.h armagetronad-0.2.7.1/src/network/nPriorizing.h
---- armagetronad-0.2.7.1-orig/src/network/nPriorizing.h 2004-11-29 11:26:42.000000000 +0100
-+++ armagetronad-0.2.7.1/src/network/nPriorizing.h 2006-06-04 20:16:45.000000000 +0200
-@@ -36,6 +36,7 @@
- class nSendBuffer;
- class nBandwidthControl;
- class nBandwidthTask;
-+class nBandwidthTaskPriorizer;
-
- tDECLARE_REFOBJ( nBandwidthTask );
- tDECLARE_REFOBJ( nBandwidthArbitrator );
-diff -ur armagetronad-0.2.7.1-orig/src/tron/gCycle.h armagetronad-0.2.7.1/src/tron/gCycle.h
---- armagetronad-0.2.7.1-orig/src/tron/gCycle.h 2005-03-06 08:26:03.000000000 +0100
-+++ armagetronad-0.2.7.1/src/tron/gCycle.h 2006-06-04 19:59:52.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;
diff --git a/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc43.patch b/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc43.patch
deleted file mode 100644
index c7a6b78144a7..000000000000
--- a/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc43.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-http://bugs.gentoo.org/218542
-
---- src/engine/eAdvWall.h
-+++ src/engine/eAdvWall.h
-@@ -5,7 +5,7 @@
- ArmageTron -- Just another Tron Lightcycle Game in 3D.
- Copyright (C) 2000 Manuel Moos (manuel@moosnet.de)
- #include <stdio>
--#include <stdlib.h>
-+#include <cstdlib>
- **************************************************************************
-
- This program is free software; you can redistribute it and/or
---- src/engine/eFloor.cpp
-+++ src/engine/eFloor.cpp
-@@ -28,7 +28,7 @@
- #include "eFloor.h"
- #include "rScreen.h"
- #include "rTexture.h"
--#include <stdlib.h>
-+#include <cstdlib>
-
- eFloor::eFloor(){Floor = this;}
-
---- src/engine/eSound.cpp
-+++ src/engine/eSound.cpp
-@@ -36,7 +36,7 @@
- #include "eCamera.h"
- //#include "tList.h"
- #include <iostream>
--#include <stdlib.h>
-+#include <cstdlib>
- #include "eGrid.h"
-
- //eGrid* eSoundPlayer::S_Grid = NULL;
---- src/network/md5.cpp
-+++ src/network/md5.cpp
-@@ -77,6 +77,7 @@
- #include "md5.h"
-
- #include <string>
-+#include <cstring>
- #include <memory>
-
- #ifdef TEST
---- src/network/nAuthentification.cpp
-+++ src/network/nAuthentification.cpp
-@@ -35,6 +35,7 @@
-
- #include <memory>
- #include <string>
-+#include <cstring>
-
- static nAuthentification::UserPasswordCallback* S_UserPasswordCallback = NULL;
- static nAuthentification::LoginResultCallback* S_LoginResultCallback = NULL;
---- src/network/nConfig.cpp
-+++ src/network/nConfig.cpp
-@@ -27,6 +27,7 @@
-
- #include "nConfig.h"
- #include "tConsole.h"
-+#include <cstring>
-
- nConfItemBase::nConfItemBase()
- :tConfItemBase(""){};
---- src/network/nKrawall.cpp
-+++ src/network/nKrawall.cpp
-@@ -41,7 +41,8 @@
- #include "tSysTime.h"
- #include "tMemManager.h"
-
--#include <stdlib.h>
-+#include <cstdlib>
-+#include <cstring>
- #include <string>
-
- bool nKrawall::MayRequirePassword(tString& adress, unsigned int port)
---- src/network/nNet.h
-+++ src/network/nNet.h
-@@ -25,7 +25,7 @@
- #ifndef NET_ANET_H
- #define NET_ANET_H
-
--#include <stdlib.h>
-+#include <cstdlib>
- #include <sys/types.h>
-
- #ifndef WIN32
---- src/network/nNetwork.cpp
-+++ src/network/nNetwork.cpp
-@@ -34,7 +34,7 @@
- #include "tDirectories.h"
- #include "nNet.h"
- #include "tSysTime.h"
--#include <stdlib.h>
-+#include <cstdlib>
- #include <fstream>
- #include <tMath.h>
-
---- src/network/nServerInfo.cpp
-+++ src/network/nServerInfo.cpp
-@@ -42,6 +42,7 @@
- #include "nNet.h"
-
- #include <fstream>
-+#include <cstring>
-
- static nServerInfo* sn_FirstServer = NULL;
- static sn_ServerInfoCreator* sn_Creator = NULL;
---- src/network/net_udp.cpp
-+++ src/network/net_udp.cpp
-@@ -24,7 +24,8 @@
- #include "nNet.h"
-
- #include <string>
--#include <stdio.h>
-+#include <cstring>
-+#include <cstdio>
-
- #include <sys/types.h>
-
-@@ -60,7 +61,7 @@
-
-
- #include <errno.h>
--#include <stdlib.h>
-+#include <cstdlib>
-
-
- #ifdef __sun__
---- src/network/net_wins.cpp
-+++ src/network/net_wins.cpp
-@@ -30,8 +30,8 @@
- #include <winsock.h>
- #include <sys/timeb.h>
- #endif
--#include <stdlib.h>
--#include <stdio.h>
-+#include <cstdlib>
-+#include <cstdio>
-
- #include "tString.h"
- #include "nNet.h"
---- src/render/rConsoleCout.cpp
-+++ src/render/rConsoleCout.cpp
-@@ -29,7 +29,7 @@
- #include "rFont.h"
- #include "tConfiguration.h"
-
--#include <stdio.h>
-+#include <cstdio>
- #include <fcntl.h>
- #include <sstream>
-
---- src/render/rFont.cpp
-+++ src/render/rFont.cpp
-@@ -28,7 +28,8 @@
- #include "rFont.h"
- #include "rScreen.h"
- #include "tConfiguration.h"
--#include <ctype.h>
-+#include <cctype>
-+#include <cstring>
-
- #ifndef DEDICATED
- #include "rRender.h"
---- src/render/rModel.cpp
-+++ src/render/rModel.cpp
-@@ -26,8 +26,9 @@
- */
-
- #include <string>
-+#include <cstring>
- #include <fstream>
--#include <stdlib.h>
-+#include <cstdlib>
- #include "rScreen.h"
- #include "rModel.h"
- #include "tString.h"
---- src/render/testgl.cpp
-+++ src/render/testgl.cpp
-@@ -1,5 +1,5 @@
--#include <stdlib.h>
--#include <stdio.h>
-+#include <cstdlib>
-+#include <cstdio>
- #include <string>
-
- #include "rSDL.h"
---- src/tools/tArray.cpp
-+++ src/tools/tArray.cpp
-@@ -29,8 +29,9 @@
-
- #include "tMemManager.h"
- #include <iostream>
--#include <stdlib.h>
-+#include <cstdlib>
- #include <string>
-+#include <cstring>
- #include "tArray.h"
-
- void GrowingArrayBase::ComplainIfFull(){
---- src/tools/tConfiguration.cpp
-+++ src/tools/tConfiguration.cpp
-@@ -29,8 +29,9 @@
- #include <iomanip>
- #include <iostream>
- #include "tConfiguration.h"
--#include <stdlib.h>
--#include <ctype.h>
-+#include <cstdlib>
-+#include <cctype>
-+#include <cstring>
- #include <string>
- #include "tString.h"
- #include "tToDo.h"
---- src/tools/tConfiguration.h
-+++ src/tools/tConfiguration.h
-@@ -35,7 +35,7 @@
- #include "tConsole.h"
- #include "tLocale.h"
- #include <iostream>
--#include <ctype.h>
-+#include <cctype>
-
-
- class tConfItemBase:public tListItem<tConfItemBase>{
---- src/tools/tCrypt.cpp
-+++ src/tools/tCrypt.cpp
-@@ -29,6 +29,7 @@
- #include "tMemManager.h"
-
- #include <string>
-+#include <cstring>
-
- class tCryptDummy: public tCrypt
- {
---- src/tools/tDirectories.cpp
-+++ src/tools/tDirectories.cpp
-@@ -36,6 +36,7 @@
- #include <windows.h>
- #endif
-
-+#include <cstring>
- #include <dirent.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---- src/tools/tError.cpp
-+++ src/tools/tError.cpp
-@@ -25,6 +25,7 @@
-
- */
-
-+#include <cstdlib>
- #include <iostream>
- #ifndef WIN32
- #include <unistd.h>
---- src/tools/tLinkedList.h
-+++ src/tools/tLinkedList.h
-@@ -28,7 +28,7 @@
- #ifndef ArmageTron_tLinkedList_H
- #define ArmageTron_tLinkedList_H
-
--#include <stdlib.h>
-+#include <cstdlib>
-
- class tListItemBase{
- protected:
---- src/tools/tList.h
-+++ src/tools/tList.h
-@@ -31,7 +31,7 @@
- #include "tArray.h"
- #include "tSafePTR.h"
- #include <new>
--#include <stdlib.h>
-+#include <cstdlib>
-
- namespace referencing
- {
---- src/tools/tLocale.cpp
-+++ src/tools/tLocale.cpp
-@@ -32,6 +32,7 @@
-
- #include <fstream>
- #include <string>
-+#include <cstring>
-
- class tLocaleSubItem; // identifies a single string in a single language
-
---- src/tools/tMemManager.cpp
-+++ src/tools/tMemManager.cpp
-@@ -29,7 +29,7 @@
-
- #include <iostream>
- #include <sstream>
--#include <stdio.h> // need basic C IO since STL IO does memory management
-+#include <cstdio> // need basic C IO since STL IO does memory management
- #include "tMemManager.h"
- #include "tError.h"
-
---- src/tools/tMemManager.h
-+++ src/tools/tMemManager.h
-@@ -37,7 +37,7 @@
- //#endif
- #endif
-
--#include <stdlib.h>
-+#include <cstdlib>
-
- class tMemMan{
- public:
---- src/tools/tMemStack.cpp
-+++ src/tools/tMemStack.cpp
-@@ -27,7 +27,7 @@
-
- #include "tMemStack.h"
- #include "tArray.h"
--#include <stdlib.h>
-+#include <cstdlib>
-
- static int& ST_Size()
-
---- src/tools/tString.cpp
-+++ src/tools/tString.cpp
-@@ -28,7 +28,8 @@
- #include "tMemManager.h"
- #include "tString.h"
- #include "tLocale.h"
--#include <ctype.h>
-+#include <cctype>
-+#include <cstring>
- #include <string>
- #include <iostream>
-
---- src/tools/transfab.cpp
-+++ src/tools/transfab.cpp
-@@ -26,7 +26,7 @@
- */
-
- #include <iostream>
--#include <ctype.h>
-+#include <cctype>
- #include <string>
-
- int main(){
---- src/tron/gAIBase.cpp
-+++ src/tron/gAIBase.cpp
-@@ -40,7 +40,7 @@
- #include "eDebugLine.h"
- #include "gAICharacter.h"
- #include "tReferenceHolder.h"
--#include <stdlib.h>
-+#include <cstdlib>
-
- #define AI_REACTION 0
- #define AI_EMERGENCY 1
---- src/tron/gArmagetron.cpp
-+++ src/tron/gArmagetron.cpp
-@@ -48,8 +48,8 @@
- #include "gAICharacter.h"
- #include "gCycle.h"
- //#include <unistd>
--#include <stdio.h>
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
- #include <fstream>
-
- #include "nServerInfo.h"
---- src/tron/gCycle.cpp
-+++ src/tron/gCycle.cpp
-@@ -46,7 +46,7 @@
- #include "gAIBase.h"
-
- #include "tMath.h"
--#include <stdlib.h>
-+#include <cstdlib>
-
- #ifndef DEDICATED
- #include "rRender.h"
---- src/tron/gGame.cpp
-+++ src/tron/gGame.cpp
-@@ -66,10 +66,10 @@
- #include "eVoter.h"
-
- #include <math.h>
--#include <stdlib.h>
-+#include <cstdlib>
- #include <string>
- #include <fstream>
--#include <ctype.h>
-+#include <cctype>
- #include <time.h>
-
- #ifdef DEDICATED
-@@ -3586,7 +3586,7 @@
- }
-
- #include <fcntl.h>
--#include <stdio.h>
-+#include <cstdio>
- #include <errno.h>
-
- bool GameLoop(bool input=true){
---- src/tron/gWall.h
-+++ src/tron/gWall.h
-@@ -5,7 +5,7 @@
- ArmageTron -- Just another Tron Lightcycle Game in 3D.
- Copyright (C) 2000 Manuel Moos (manuel@moosnet.de)
- #include <stdio>
--#include <stdlib.h>
-+#include <cstdlib>
- **************************************************************************
-
- This program is free software; you can redistribute it and/or
diff --git a/games-action/armagetronad/files/armagetronad-0.2.7.1-security-1.patch b/games-action/armagetronad/files/armagetronad-0.2.7.1-security-1.patch
deleted file mode 100644
index 3b7a7759b44c..000000000000
--- a/games-action/armagetronad/files/armagetronad-0.2.7.1-security-1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/network/nNetObject.cpp
-===================================================================
---- src/network/nNetObject.cpp (revision 5965)
-+++ src/network/nNetObject.cpp (working copy)
-@@ -661,6 +661,15 @@
- #endif
- m.Read( owner );
-
-+ // clients are only allowed to create self-owned objects
-+ if ( sn_GetNetState() == nSERVER )
-+ {
-+ if ( owner != m.SenderID() )
-+ {
-+ throw nKillHim();
-+ }
-+ }
-+
- registrar.object = this;
- registrar.sender = m.SenderID();
-
diff --git a/games-action/armagetronad/files/armagetronad-ded b/games-action/armagetronad/files/armagetronad-ded
deleted file mode 100644
index a28dc3bf3b2b..000000000000
--- a/games-action/armagetronad/files/armagetronad-ded
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# starts Armagetron Advanced Dedicated Server from the installation directory
-
-GAME_CONFDIR="@GAMES_SYSCONFDIR@/armagetronad"
-GAME_LIBDIR="@GAMES_LIBDIR@/armagetronad"
-GAME_DATADIR="@GAMES_DATADIR@/armagetronad"
-
-echo "Checking Configuration"
-if test ! -r "${HOME}"/.armagetronad-ded ; then
- mkdir -p "${HOME}"/.armagetronad-ded
-
- if test -r "${HOME}"/.ArmageTronrc ; then
- echo "Migrating very old configuration"
- cp "${HOME}"/.ArmageTronrc "${HOME}"/.armagetronad-ded/user.cfg
- fi
-fi
-
-if test ! -r "${HOME}"/.armagetronad-ded/var ; then
- files=$(ls "${HOME}"/.armagetronad-ded)
- mkdir "${HOME}"/.armagetronad-ded/var
- echo "Testing configuration"
- test "$files" != "" && mv $files "${HOME}"/.armagetronad-ded/var
-fi
-
-echo "Done"
-
-exec \
-"${GAME_LIBDIR}"/armagetronad-dedicated \
- --datadir "${GAME_DATADIR}" \
- --configdir "${GAME_CONFDIR}" \
- --userdatadir "${HOME}"/.armagetronad-ded