New patch and working mirrors

4 files changed, 40 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ee277e41930..9fb5f01480a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sat Feb  3 01:55:40 UTC 2018
 pkgbase = quake2
 	pkgdesc = Quake 2 engine. You need the retail .pak files to play.
 	pkgver = r0.16.2
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.icculus.org/quake2/
 	install = quake2.install
 	arch = i686
@@ -13,9 +15,9 @@ pkgbase = quake2
 	depends = libxxf86vm
 	depends = libxxf86dga
 	source = http://www.icculus.org/quake2/files/quake2-r0.16.2.tar.gz
-	source = ftp://ftp.idsoftware.com/idstuff/quake2/source/xatrixsrc320.shar.Z
-	source = ftp://ftp.idsoftware.com/idstuff/quake2/source/roguesrc320.shar.Z
-	source = ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full-ctf.exe
+	source = http://www.gamers.org/pub/idgames/idstuff/quake2/source/xatrixsrc320.shar.Z
+	source = http://www.gamers.org/pub/idgames/idstuff/quake2/source/roguesrc320.shar.Z
+	source = http://www.gamers.org/pub/idgames/idstuff/quake2/q2-3.20-x86-full-ctf.exe
 	source = http://www.icculus.org/quake2/files/maxpak.pak
 	source = http://www.icculus.org/quake2/files/pak10.pak
 	source = http://www.icculus.org/quake2/files/pak11.pak
@@ -32,6 +34,7 @@ pkgbase = quake2
 	source = ctf.sh
 	source = snd_alsa.c
 	source = gnusource.patch
+	source = map_command_fix.patch
 	sha256sums = 98cea3cbd70bd1f195e5190d0ae047c636e00e21dbc6cc5bdee4acd52876d3e9
 	sha256sums = 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589
 	sha256sums = ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919
@@ -52,6 +55,7 @@ pkgbase = quake2
 	sha256sums = ea50ae5cca9d633fe2ad30c59beb2ad350130bdd2a78f773639794f2c12d1ed1
 	sha256sums = fd434189a6242ad288e5827c8285e0dca3f26fe447be50204d4b6817cb1ae624
 	sha256sums = 9ac34f2bebbb6d4a19c590e00db8e5b0034b3ffe2a245a595e28ab43d65d7617
+	sha256sums = 7ce69543faf226e871dbe78c058a3499f5c283860ae2d9e39e397178123264ec
 
 pkgname = quake2
 
diff --git a/.gitignore b/.gitignore
index 4b01d83ad580..91daad5779be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ q2-3.20-x86-full-ctf.exe
 quake2-r0.16.2.tar.gz
 roguesrc320.shar.Z
 xatrixsrc320.shar.Z
+src
+pkg
diff --git a/PKGBUILD b/PKGBUILD
index f9d169c0d41d..56bd62054ae3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=quake2
 pkgver=r0.16.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Quake 2 engine. You need the retail .pak files to play."
 url="http://www.icculus.org/quake2/"
 arch=('i686' 'x86_64')
@@ -12,9 +12,9 @@ license=('GPL')
 depends=('bash' 'libjpeg' 'sdl' 'libxxf86vm' 'libxxf86dga')
 install="quake2.install"
 source=("http://www.icculus.org/quake2/files/quake2-${pkgver}.tar.gz"
-    'ftp://ftp.idsoftware.com/idstuff/quake2/source/xatrixsrc320.shar.Z'
-    'ftp://ftp.idsoftware.com/idstuff/quake2/source/roguesrc320.shar.Z'
-    'ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full-ctf.exe'
+    'http://www.gamers.org/pub/idgames/idstuff/quake2/source/xatrixsrc320.shar.Z'
+    'http://www.gamers.org/pub/idgames/idstuff/quake2/source/roguesrc320.shar.Z'
+    'http://www.gamers.org/pub/idgames/idstuff/quake2/q2-3.20-x86-full-ctf.exe'
     'http://www.icculus.org/quake2/files/maxpak.pak'
     'http://www.icculus.org/quake2/files/pak10.pak'
     'http://www.icculus.org/quake2/files/pak11.pak'
@@ -25,7 +25,7 @@ source=("http://www.icculus.org/quake2/files/quake2-${pkgver}.tar.gz"
     'http://www.icculus.org/quake2/files/pak17.pak'
     'http://www.icculus.org/quake2/files/pak19.pak'
     'quake2.sh' 'q2ded.sh' 'xatrix.sh' 'rogue.sh' 'ctf.sh' 'snd_alsa.c'
-    'gnusource.patch')
+    'gnusource.patch' 'map_command_fix.patch')
 sha256sums=('98cea3cbd70bd1f195e5190d0ae047c636e00e21dbc6cc5bdee4acd52876d3e9'
             '94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589'
             'ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919'
@@ -45,7 +45,8 @@ sha256sums=('98cea3cbd70bd1f195e5190d0ae047c636e00e21dbc6cc5bdee4acd52876d3e9'
             '8655b4216ea95d2408dcc28de53e53df587aa6959a95c62cc6d7f3eb63492202'
             'ea50ae5cca9d633fe2ad30c59beb2ad350130bdd2a78f773639794f2c12d1ed1'
             'fd434189a6242ad288e5827c8285e0dca3f26fe447be50204d4b6817cb1ae624'
-            '9ac34f2bebbb6d4a19c590e00db8e5b0034b3ffe2a245a595e28ab43d65d7617')
+            '9ac34f2bebbb6d4a19c590e00db8e5b0034b3ffe2a245a595e28ab43d65d7617'
+            '7ce69543faf226e871dbe78c058a3499f5c283860ae2d9e39e397178123264ec')
 PKGEXT='.pkg.tar'
 
 # Computer Architecture Variable used by Quake2
@@ -104,6 +105,9 @@ prepare() {
     /bin/sed -i -e 's:jpeg_mem_src:_&:' \
         "${srcdir}/${pkgname}-${pkgver}/src/ref_candygl/gl_image.c"
 
+    # Map command fix by h3xx
+    /usr/bin/patch -p1 < "${srcdir}/map_command_fix.patch"
+
     msg "Quake 2 patching complete"
 }
 
diff --git a/map_command_fix.patch b/map_command_fix.patch
new file mode 100644
index 000000000000..f1b912214450
--- /dev/null
+++ b/map_command_fix.patch
@@ -0,0 +1,20 @@
+diff -ura quake2-r0.16.2/src/server/sv_ccmds.c quake2-r0.16.2-fix/src/server/sv_ccmds.c
+--- quake2-r0.16.2/src/server/sv_ccmds.c	2002-01-03 00:10:14.000000000 -0500
++++ quake2-r0.16.2-fix/src/server/sv_ccmds.c	2018-02-02 20:51:04.800131348 -0500
+@@ -508,6 +508,7 @@
+ 	{
+ 		// wipe all the *.sav files
+ 		SV_WipeSavegame ("current");
++        ++map;
+ 	}
+ 	else
+ 	{	// save the map just exited
+@@ -533,7 +534,7 @@
+ 	}
+ 
+ 	// start up the next map
+-	SV_Map (false, Cmd_Argv(1), false );
++	SV_Map (false, map, false );
+ 
+ 	// archive server state
+ 	strncpy (svs.mapcmd, Cmd_Argv(1), sizeof(svs.mapcmd)-1);