[ioquake3] 03/03: 1.36+u20170908+dfsg1-2

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 28e4b0525f6a7e9549a8f6ef344921e241daa897
Author: Simon McVittie 
Date:   Fri Sep 8 14:28:53 2017 +0100

1.36+u20170908+dfsg1-2
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d1a9c1..c14f5bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-ioquake3 (1.36+u20170908+dfsg1-2) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20170908+dfsg1-2) unstable; urgency=medium
 
   * Don't set DEFAULT_BASEDIR. This makes ioquake3 set it at runtime
 from argv[0], making it relocatable, which is useful when building
 it into a Flatpak app.
   * Skip dh_apparmor when built with profile pkg.flatpak.app
 
- -- Simon McVittie   Fri, 08 Sep 2017 14:27:35 +0100
+ -- Simon McVittie   Fri, 08 Sep 2017 14:28:34 +0100
 
 ioquake3 (1.36+u20170908+dfsg1-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ioquake3.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] annotated tag debian/1.36+u20170908+dfsg1-2 created (now 2dcc72e)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to annotated tag debian/1.36+u20170908+dfsg1-2
in repository ioquake3.

at  2dcc72e   (tag)
   tagging  28e4b0525f6a7e9549a8f6ef344921e241daa897 (commit)
  replaces  debian/1.36+u20170908+dfsg1-1
 tagged by  Simon McVittie
on  Fri Sep 8 15:38:56 2017 +0100

- Log -
ioquake3 Debian release 1.36+u20170908+dfsg1-2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAlmyq4AACgkQ4FrhR4+B
TE+FyQ/7B81XJ4/YIdssYXj1icEKj+Ii7DK9PigSsQjDCLm8hmLvdx/hqJuAS82D
9rgLE6FbAiW9RelQiascecgoMUrj0jxR60KVPFDiFYuW3uD92Mw+6R8YNtUZQ0au
FzuBGsyZi2zNFkky5vp4eTxjdUA8otVHEcubiiuQZM4Gn0zzO9DM4YhOKXVQTpZ5
8WUvQkS2G+LCiT8gFR/n0QTVIQQ+twFA1tFbOLpp7+sJV4XhwKsIYp8IA7DFnX2d
6usXZ8REerlgwL6JgRGK2xtcrX95fBpSx/C1C2Tv2ZsRXKDcRI0+wzXSy5LzXd1t
Q8myLgez++oYf9lJ7FzFDlLa+NhvMqX03xZdFuLVw9tgNmpjTTZ1k5iokQPcnYqg
NsHlccNSZucdac9h+e5KSWs7n9GZFwZKB7GBW1b3nO3wvhICr1T0I3+UMYcubIzs
3OAwTqCbQezKgC7r5Ssw9LUUZX4CEURbD1NktY7UdLqZThpgKAQ6l92W9ndb9bVb
+OCoTudbpeTyF+uqYRprebgzbh8FeokSBYoDZZ7fuU2JV0lvhKl30QFrkvU/87D/
DgB2Dpl2y0NJT2RqIyv26i/1OxDRVuD2P16fG/ejgJLpqAZuLj3tTgkKeHiEcnW4
PdX2yHQuaJraq6xwEKIWuKlxIKOPwZ0MARg7w1JdAnJ7ZUVpZpY=
=+BE6
-END PGP SIGNATURE-

Simon McVittie (3):
  Don't set DEFAULT_BASEDIR
  Skip dh_apparmor when built with profile pkg.flatpak.app
  1.36+u20170908+dfsg1-2

---

This annotated tag includes the following new commits:

   new  487b1ea   Don't set DEFAULT_BASEDIR
   new  1bbf33d   Skip dh_apparmor when built with profile pkg.flatpak.app
   new  28e4b05   1.36+u20170908+dfsg1-2

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ioquake3.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 01/03: Don't set DEFAULT_BASEDIR

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 487b1eacebf948914941bde834b2fbadc9dbd5ee
Author: Simon McVittie 
Date:   Thu Jul 27 08:23:50 2017 +0100

Don't set DEFAULT_BASEDIR

This makes ioquake3 set it at runtime from argv[0], making it relocatable,
which is useful when building it into a Flatpak app.
---
 debian/changelog | 8 
 debian/rules | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ebcc135..44fd4bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ioquake3 (1.36+u20170908+dfsg1-2) UNRELEASED; urgency=medium
+
+  * Don't set DEFAULT_BASEDIR. This makes ioquake3 set it at runtime
+from argv[0], making it relocatable, which is useful when building
+it into a Flatpak app.
+
+ -- Simon McVittie   Fri, 08 Sep 2017 14:27:35 +0100
+
 ioquake3 (1.36+u20170908+dfsg1-1) unstable; urgency=medium
 
   * New upstream snapshot
diff --git a/debian/rules b/debian/rules
index 4af8cdd..b29ee9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,6 @@ OPTIONS := \
USE_VOIP=1 \
$(shell $(CURDIR)/debian/q3arch make ${DEB_HOST_GNU_CPU} 
${DEB_HOST_GNU_SYSTEM}) \
BUILD_CLIENT_SMP=1 \
-   DEFAULT_BASEDIR=/usr/lib/ioquake3 \
BUILD_GAME_SO=1 \
BUILD_GAME_QVM=0 \
VERSION=$(DEB_VERSION)/$(DEB_VENDOR) \

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ioquake3.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] branch debian/master updated (fc5edf6 -> 28e4b05)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch debian/master
in repository ioquake3.

  from  fc5edf6   1.36+u20170908+dfsg1-1
   new  487b1ea   Don't set DEFAULT_BASEDIR
   new  1bbf33d   Skip dh_apparmor when built with profile pkg.flatpak.app
   new  28e4b05   1.36+u20170908+dfsg1-2

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 9 +
 debian/control   | 2 +-
 debian/rules | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ioquake3.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[ioquake3] 02/03: Skip dh_apparmor when built with profile pkg.flatpak.app

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 1bbf33d8c92ab5f3b68791710c963f271483b968
Author: Simon McVittie 
Date:   Thu Jul 27 18:44:42 2017 +0100

Skip dh_apparmor when built with profile pkg.flatpak.app
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 44fd4bc..4d1a9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ioquake3 (1.36+u20170908+dfsg1-2) UNRELEASED; urgency=medium
   * Don't set DEFAULT_BASEDIR. This makes ioquake3 set it at runtime
 from argv[0], making it relocatable, which is useful when building
 it into a Flatpak app.
+  * Skip dh_apparmor when built with profile pkg.flatpak.app
 
  -- Simon McVittie   Fri, 08 Sep 2017 14:27:35 +0100
 
diff --git a/debian/control b/debian/control
index 2a84b82..a34a897 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  Simon McVittie ,
 Build-Depends:
  debhelper (>= 10),
- dh-apparmor [linux-any],
+ dh-apparmor [linux-any] ,
  dpkg-dev (>= 1.16.1),
  libcurl4-gnutls-dev,
  libjpeg-dev,
diff --git a/debian/rules b/debian/rules
index b29ee9b..9da3fc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,12 +74,14 @@ override_dh_auto_install:
cd $(DESTDIR)/usr/lib/quake3/ta/baseq3 && ln -s 
../../../ioquake3/baseq3/*.so .
cd $(DESTDIR)/usr/lib/quake3/ta/missionpack && ln -s 
../../../ioquake3/missionpack/*.so .
 
+ifeq ($(filter pkg.flatpak.app,$(DEB_BUILD_PROFILES)),)
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 override_dh_install-arch:
dh_install -a
dh_apparmor -pioquake3 --profile-name=usr.lib.ioquake3.ioquake3
dh_apparmor -pioquake3-server --profile-name=usr.lib.ioquake3.ioq3ded
 endif
+endif
 
 override_dh_strip:
dh_strip --ddeb-migration='ioquake3-dbg (<< 1.36+u20160914+dfsg1-1~)'

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ioquake3.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 73/89: All: Don't try to remove non-existant command 'shaderstate'

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 68e3688405f0d01e33aae8aa88c787b1a2de4a78
Author: MAN-AT-ARMS 
Date:   Fri Jul 28 17:57:31 2017 -0400

All: Don't try to remove non-existant command 'shaderstate'
---
 MP/code/rend2/tr_init.c| 11 +--
 MP/code/renderer/tr_init.c | 11 +--
 SP/code/rend2/tr_init.c| 11 +--
 SP/code/renderer/tr_init.c | 11 +--
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
index b152bab..7d0f0c4 100644
--- a/MP/code/rend2/tr_init.c
+++ b/MP/code/rend2/tr_init.c
@@ -1675,16 +1675,15 @@ void RE_Shutdown( qboolean destroyWindow ) {
 
ri.Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
 
-   ri.Cmd_RemoveCommand( "modellist" );
-   ri.Cmd_RemoveCommand( "screenshotJPEG" );
-   ri.Cmd_RemoveCommand( "screenshot" );
ri.Cmd_RemoveCommand( "imagelist" );
ri.Cmd_RemoveCommand( "shaderlist" );
ri.Cmd_RemoveCommand( "skinlist" );
-   ri.Cmd_RemoveCommand( "gfxinfo" );
-   ri.Cmd_RemoveCommand("minimize");
+   ri.Cmd_RemoveCommand( "modellist" );
ri.Cmd_RemoveCommand( "modelist" );
-   ri.Cmd_RemoveCommand( "shaderstate" );
+   ri.Cmd_RemoveCommand( "screenshot" );
+   ri.Cmd_RemoveCommand( "screenshotJPEG" );
+   ri.Cmd_RemoveCommand( "gfxinfo" );
+   ri.Cmd_RemoveCommand( "minimize" );
ri.Cmd_RemoveCommand( "gfxmeminfo" );
ri.Cmd_RemoveCommand( "exportCubemaps" );
ri.Cmd_RemoveCommand( "taginfo" );
diff --git a/MP/code/renderer/tr_init.c b/MP/code/renderer/tr_init.c
index ce3da3c..63100f5 100644
--- a/MP/code/renderer/tr_init.c
+++ b/MP/code/renderer/tr_init.c
@@ -1485,16 +1485,15 @@ void RE_Shutdown( qboolean destroyWindow ) {
 
ri.Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
 
-   ri.Cmd_RemoveCommand( "modellist" );
-   ri.Cmd_RemoveCommand( "screenshotJPEG" );
-   ri.Cmd_RemoveCommand( "screenshot" );
ri.Cmd_RemoveCommand( "imagelist" );
ri.Cmd_RemoveCommand( "shaderlist" );
ri.Cmd_RemoveCommand( "skinlist" );
-   ri.Cmd_RemoveCommand( "gfxinfo" );
-   ri.Cmd_RemoveCommand("minimize");
+   ri.Cmd_RemoveCommand( "modellist" );
ri.Cmd_RemoveCommand( "modelist" );
-   ri.Cmd_RemoveCommand( "shaderstate" );
+   ri.Cmd_RemoveCommand( "screenshot" );
+   ri.Cmd_RemoveCommand( "screenshotJPEG" );
+   ri.Cmd_RemoveCommand( "gfxinfo" );
+   ri.Cmd_RemoveCommand( "minimize" );
ri.Cmd_RemoveCommand( "taginfo" );
 
// Ridah
diff --git a/SP/code/rend2/tr_init.c b/SP/code/rend2/tr_init.c
index d8f07ec..c64637d 100644
--- a/SP/code/rend2/tr_init.c
+++ b/SP/code/rend2/tr_init.c
@@ -1699,16 +1699,15 @@ void RE_Shutdown( qboolean destroyWindow ) {
 
ri.Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
 
-   ri.Cmd_RemoveCommand( "modellist" );
-   ri.Cmd_RemoveCommand( "screenshotJPEG" );
-   ri.Cmd_RemoveCommand( "screenshot" );
ri.Cmd_RemoveCommand( "imagelist" );
ri.Cmd_RemoveCommand( "shaderlist" );
ri.Cmd_RemoveCommand( "skinlist" );
-   ri.Cmd_RemoveCommand( "gfxinfo" );
-   ri.Cmd_RemoveCommand("minimize");
+   ri.Cmd_RemoveCommand( "modellist" );
ri.Cmd_RemoveCommand( "modelist" );
-   ri.Cmd_RemoveCommand( "shaderstate" );
+   ri.Cmd_RemoveCommand( "screenshot" );
+   ri.Cmd_RemoveCommand( "screenshotJPEG" );
+   ri.Cmd_RemoveCommand( "gfxinfo" );
+   ri.Cmd_RemoveCommand( "minimize" );
ri.Cmd_RemoveCommand( "gfxmeminfo" );
ri.Cmd_RemoveCommand( "exportCubemaps" );
ri.Cmd_RemoveCommand( "taginfo" );
diff --git a/SP/code/renderer/tr_init.c b/SP/code/renderer/tr_init.c
index 3e01811..b2604c1 100644
--- a/SP/code/renderer/tr_init.c
+++ b/SP/code/renderer/tr_init.c
@@ -1508,16 +1508,15 @@ void RE_Shutdown( qboolean destroyWindow ) {
 
ri.Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
 
-   ri.Cmd_RemoveCommand( "modellist" );
-   ri.Cmd_RemoveCommand( "screenshotJPEG" );
-   ri.Cmd_RemoveCommand( "screenshot" );
ri.Cmd_RemoveCommand( "imagelist" );
ri.Cmd_RemoveCommand( "shaderlist" );
ri.Cmd_RemoveCommand( "skinlist" );
-   ri.Cmd_RemoveCommand( "gfxinfo" );
-   ri.Cmd_RemoveCommand("minimize");
+   ri.Cmd_RemoveCommand( "modellist" );
ri.Cmd_RemoveCommand( "modelist" );
-   ri.Cmd_RemoveCommand( "shaderstate" );
+   ri.Cmd_RemoveCommand( "screenshot" );
+   ri.Cmd_RemoveCommand( "screenshotJPEG" );
+   ri.Cmd_RemoveCommand( "gfxinfo" );
+   ri.Cmd_RemoveCommand( "minimize" );
ri.Cmd_RemoveCommand( "taginfo" );
 
// Ridah

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

[iortcw] 89/89: All: 1.51b release

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 08408c50b112f6b14ae2749a812add22a1ee505f
Author: MAN-AT-ARMS 
Date:   Wed Aug 16 11:38:24 2017 -0400

All: 1.51b release
---
 MP/Makefile | 19 +--
 MP/code/qcommon/files.c |  2 +-
 SP/Makefile | 17 -
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 146eb3a..c99d247 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -266,7 +266,7 @@ DEBUG_CFLAGS=-g -O0
 endif
 
 ifndef USE_ANTIWALLHACK
-USE_ANTIWALLHACK=0
+USE_ANTIWALLHACK=1
 endif
 
 ifndef USE_BLOOM
@@ -350,16 +350,6 @@ ifneq ($(BUILD_CLIENT),0)
   endif
 endif
 
-# Add git version info
-USE_GIT=
-ifeq ($(wildcard ../.git),../.git)
-  GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
-  ifneq ($(GIT_REV),)
-VERSION:=$(VERSION)_GIT_$(GIT_REV)
-USE_GIT=1
-  endif
-endif
-
 
 #
 # SETUP AND BUILD -- LINUX
@@ -2703,13 +2693,6 @@ $(B)/ded/%.o: $(SYSDIR)/%.rc
 $(B)/ded/%.o: $(NDIR)/%.c
$(DO_DED_CC)
 
-# Extra dependencies to ensure the git version is incorporated
-ifeq ($(USE_GIT),1)
-  $(B)/client/cl_console.o : ../.git
-  $(B)/client/common.o : ../.git
-  $(B)/ded/common.o : ../.git
-endif
-
 
 #
 ## GAME MODULE RULES
diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index 6bb2260..1ac7ede 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -206,7 +206,7 @@ static const unsigned int mppak_checksums[] = {
 
 static const unsigned int binpak_checksums[] = {
4022537001u,// mp_bin.pk3 (1.4/1.41)
-   686580754u, // mp_bin0.pk3 (1.51)
+   1484914046u,// mp_bin0.pk3 (1.51b)
3375536862u,// Degeneration (1.11)
2977960779u,// Omni-Bot (0.81/0.82)
618492725u, // Omnit-Bot (0.85)
diff --git a/SP/Makefile b/SP/Makefile
index 2fc5e6f..fce0188 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -339,16 +339,6 @@ ifneq ($(BUILD_CLIENT),0)
   endif
 endif
 
-# Add git version info
-USE_GIT=
-ifeq ($(wildcard ../.git),../.git)
-  GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
-  ifneq ($(GIT_REV),)
-VERSION:=$(VERSION)_GIT_$(GIT_REV)
-USE_GIT=1
-  endif
-endif
-
 
 #
 # SETUP AND BUILD -- LINUX
@@ -2669,13 +2659,6 @@ $(B)/ded/%.o: $(SYSDIR)/%.rc
 $(B)/ded/%.o: $(NDIR)/%.c
$(DO_DED_CC)
 
-# Extra dependencies to ensure the git version is incorporated
-ifeq ($(USE_GIT),1)
-  $(B)/client/cl_console.o : ../.git
-  $(B)/client/common.o : ../.git
-  $(B)/ded/common.o : ../.git
-endif
-
 
 #
 ## GAME MODULE RULES

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 88/89: All: Only allow safe protocols for cURL downloads

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 0bb5a2883701d102f4b73cbfb4b47e5dd932613b
Author: MAN-AT-ARMS 
Date:   Wed Aug 16 08:01:35 2017 -0400

All: Only allow safe protocols for cURL downloads
---
 MP/code/client/cl_curl.c | 2 ++
 SP/code/client/cl_curl.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/MP/code/client/cl_curl.c b/MP/code/client/cl_curl.c
index 3ff5a3d..5384390 100644
--- a/MP/code/client/cl_curl.c
+++ b/MP/code/client/cl_curl.c
@@ -299,6 +299,8 @@ void CL_cURL_BeginDownload( const char *localName, const 
char *remoteURL )
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FAILONERROR, 1);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FOLLOWLOCATION, 1);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_MAXREDIRS, 5);
+   qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROTOCOLS,
+   CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP | 
CURLPROTO_FTPS);
clc.downloadCURLM = qcurl_multi_init(); 
if(!clc.downloadCURLM) {
qcurl_easy_cleanup(clc.downloadCURL);
diff --git a/SP/code/client/cl_curl.c b/SP/code/client/cl_curl.c
index 3ff5a3d..5384390 100644
--- a/SP/code/client/cl_curl.c
+++ b/SP/code/client/cl_curl.c
@@ -299,6 +299,8 @@ void CL_cURL_BeginDownload( const char *localName, const 
char *remoteURL )
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FAILONERROR, 1);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FOLLOWLOCATION, 1);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_MAXREDIRS, 5);
+   qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROTOCOLS,
+   CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP | 
CURLPROTO_FTPS);
clc.downloadCURLM = qcurl_multi_init(); 
if(!clc.downloadCURLM) {
qcurl_easy_cleanup(clc.downloadCURL);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 75/89: SP: Don't allow ingame menu during savegame loading

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 16d4690ab720f5d7db968b927f17ff968d4845bc
Author: MAN-AT-ARMS 
Date:   Fri Jul 28 22:29:25 2017 -0400

SP: Don't allow ingame menu during savegame loading

Fixed by uzyfeo
---
 SP/code/ui/ui_main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SP/code/ui/ui_main.c b/SP/code/ui/ui_main.c
index 07f0f0b..3b93036 100644
--- a/SP/code/ui/ui_main.c
+++ b/SP/code/ui/ui_main.c
@@ -7076,6 +7076,9 @@ void _UI_SetActiveMenu( uiMenuCommand_t menu ) {
return;
 
case UIMENU_INGAME:
+   if ( trap_Cvar_VariableValue( "savegame_loading" ) ) {
+   return;
+   }
trap_Cvar_Set( "cl_paused", "1" );
trap_Key_SetCatcher( KEYCATCH_UI );
UI_BuildPlayerList();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 71/89: All: Revert to OpenAL Soft 1.17.2

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 35a8e238882897d11a7c4a9854753175be5b5df4
Author: MAN-AT-ARMS 
Date:   Fri Jul 28 10:58:54 2017 -0400

All: Revert to OpenAL Soft 1.17.2
---
 MP/code/AL/alext.h  |  28 
 MP/code/libs/macosx/libopenal.dylib | Bin 2056112 -> 1625328 bytes
 MP/code/libs/win32/OpenAL32.dll | Bin 1316366 -> 845045 bytes
 MP/code/libs/win64/OpenAL64.dll | Bin 1515026 -> 980543 bytes
 SP/code/AL/alext.h  |  28 
 SP/code/libs/macosx/libopenal.dylib | Bin 2056112 -> 1625328 bytes
 SP/code/libs/win32/OpenAL32.dll | Bin 1316366 -> 845045 bytes
 SP/code/libs/win64/OpenAL64.dll | Bin 1515026 -> 980543 bytes
 8 files changed, 56 deletions(-)

diff --git a/MP/code/AL/alext.h b/MP/code/AL/alext.h
index 4b9a155..6af581a 100644
--- a/MP/code/AL/alext.h
+++ b/MP/code/AL/alext.h
@@ -431,34 +431,6 @@ ALC_API ALCboolean ALC_APIENTRY 
alcResetDeviceSOFT(ALCdevice *device, const ALCi
 #endif
 #endif
 
-#ifndef AL_SOFT_gain_clamp_ex
-#define AL_SOFT_gain_clamp_ex 1
-#define AL_GAIN_LIMIT_SOFT   0x200E
-#endif
-
-#ifndef AL_SOFT_source_resampler
-#define AL_SOFT_source_resampler
-#define AL_NUM_RESAMPLERS_SOFT   0x1210
-#define AL_DEFAULT_RESAMPLER_SOFT0x1211
-#define AL_SOURCE_RESAMPLER_SOFT 0x1212
-#define AL_RESAMPLER_NAME_SOFT   0x1213
-typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei 
index);
-#ifdef AL_ALEXT_PROTOTYPES
-AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
-#endif
-#endif
-
-#ifndef AL_SOFT_source_spatialize
-#define AL_SOFT_source_spatialize
-#define AL_SOURCE_SPATIALIZE_SOFT0x1214
-#define AL_AUTO_SOFT 0x0002
-#endif
-
-#ifndef ALC_SOFT_output_limiter
-#define ALC_SOFT_output_limiter
-#define ALC_OUTPUT_LIMITER_SOFT  0x199A
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/MP/code/libs/macosx/libopenal.dylib 
b/MP/code/libs/macosx/libopenal.dylib
index e147227..c1bb349 100755
Binary files a/MP/code/libs/macosx/libopenal.dylib and 
b/MP/code/libs/macosx/libopenal.dylib differ
diff --git a/MP/code/libs/win32/OpenAL32.dll b/MP/code/libs/win32/OpenAL32.dll
index da406b9..1e3bddd 100755
Binary files a/MP/code/libs/win32/OpenAL32.dll and 
b/MP/code/libs/win32/OpenAL32.dll differ
diff --git a/MP/code/libs/win64/OpenAL64.dll b/MP/code/libs/win64/OpenAL64.dll
index 2886b09..e24538a 100755
Binary files a/MP/code/libs/win64/OpenAL64.dll and 
b/MP/code/libs/win64/OpenAL64.dll differ
diff --git a/SP/code/AL/alext.h b/SP/code/AL/alext.h
index 4b9a155..6af581a 100644
--- a/SP/code/AL/alext.h
+++ b/SP/code/AL/alext.h
@@ -431,34 +431,6 @@ ALC_API ALCboolean ALC_APIENTRY 
alcResetDeviceSOFT(ALCdevice *device, const ALCi
 #endif
 #endif
 
-#ifndef AL_SOFT_gain_clamp_ex
-#define AL_SOFT_gain_clamp_ex 1
-#define AL_GAIN_LIMIT_SOFT   0x200E
-#endif
-
-#ifndef AL_SOFT_source_resampler
-#define AL_SOFT_source_resampler
-#define AL_NUM_RESAMPLERS_SOFT   0x1210
-#define AL_DEFAULT_RESAMPLER_SOFT0x1211
-#define AL_SOURCE_RESAMPLER_SOFT 0x1212
-#define AL_RESAMPLER_NAME_SOFT   0x1213
-typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei 
index);
-#ifdef AL_ALEXT_PROTOTYPES
-AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
-#endif
-#endif
-
-#ifndef AL_SOFT_source_spatialize
-#define AL_SOFT_source_spatialize
-#define AL_SOURCE_SPATIALIZE_SOFT0x1214
-#define AL_AUTO_SOFT 0x0002
-#endif
-
-#ifndef ALC_SOFT_output_limiter
-#define ALC_SOFT_output_limiter
-#define ALC_OUTPUT_LIMITER_SOFT  0x199A
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/SP/code/libs/macosx/libopenal.dylib 
b/SP/code/libs/macosx/libopenal.dylib
index e147227..c1bb349 100755
Binary files a/SP/code/libs/macosx/libopenal.dylib and 
b/SP/code/libs/macosx/libopenal.dylib differ
diff --git a/SP/code/libs/win32/OpenAL32.dll b/SP/code/libs/win32/OpenAL32.dll
index da406b9..1e3bddd 100755
Binary files a/SP/code/libs/win32/OpenAL32.dll and 
b/SP/code/libs/win32/OpenAL32.dll differ
diff --git a/SP/code/libs/win64/OpenAL64.dll b/SP/code/libs/win64/OpenAL64.dll
index 2886b09..e24538a 100755
Binary files a/SP/code/libs/win64/OpenAL64.dll and 
b/SP/code/libs/win64/OpenAL64.dll differ

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 76/89: All: Remove unused imgFlag_t value IMGFLAG_SRGB

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 0717985253b91a128fa9098df2ccda4fea8578cb
Author: MAN-AT-ARMS 
Date:   Wed Aug 2 23:15:17 2017 -0400

All: Remove unused imgFlag_t value IMGFLAG_SRGB
---
 MP/code/rend2/tr_local.h| 3 +--
 MP/code/rend2/tr_shader.c   | 4 ++--
 MP/code/renderer/tr_local.h | 3 +--
 SP/code/rend2/tr_local.h| 3 +--
 SP/code/rend2/tr_shader.c   | 4 ++--
 SP/code/renderer/tr_local.h | 3 +--
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index cebc52c..6c7e30f 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -99,8 +99,7 @@ typedef enum
IMGFLAG_NO_COMPRESSION = 0x0010,
IMGFLAG_NOLIGHTSCALE   = 0x0020,
IMGFLAG_CLAMPTOEDGE= 0x0040,
-   IMGFLAG_SRGB   = 0x0080,
-   IMGFLAG_GENNORMALMAP   = 0x0100,
+   IMGFLAG_GENNORMALMAP   = 0x0080,
 } imgFlags_t;
 
 typedef struct image_s {
diff --git a/MP/code/rend2/tr_shader.c b/MP/code/rend2/tr_shader.c
index cfa8c14..766eb19 100644
--- a/MP/code/rend2/tr_shader.c
+++ b/MP/code/rend2/tr_shader.c
@@ -2317,7 +2317,7 @@ static void CollapseStagesToLightall(shaderStage_t 
*diffuse,
{
char normalName[MAX_QPATH];
image_t *normalImg;
-   imgFlags_t normalFlags = (diffuseImg->flags & 
~(IMGFLAG_GENNORMALMAP | IMGFLAG_SRGB)) | IMGFLAG_NOLIGHTSCALE;
+   imgFlags_t normalFlags = (diffuseImg->flags & 
~IMGFLAG_GENNORMALMAP) | IMGFLAG_NOLIGHTSCALE;
 
// try a normalheight image first
COM_StripExtension(diffuseImg->imgName, normalName, 
MAX_QPATH);
@@ -2363,7 +2363,7 @@ static void CollapseStagesToLightall(shaderStage_t 
*diffuse,
{
char specularName[MAX_QPATH];
image_t *specularImg;
-   imgFlags_t specularFlags = (diffuseImg->flags & 
~(IMGFLAG_GENNORMALMAP | IMGFLAG_SRGB)) | IMGFLAG_NOLIGHTSCALE;
+   imgFlags_t specularFlags = (diffuseImg->flags & 
~IMGFLAG_GENNORMALMAP) | IMGFLAG_NOLIGHTSCALE;
 
COM_StripExtension(diffuseImg->imgName, specularName, 
MAX_QPATH);
Q_strcat(specularName, MAX_QPATH, "_s");
diff --git a/MP/code/renderer/tr_local.h b/MP/code/renderer/tr_local.h
index 1508fdd..b03b80a 100644
--- a/MP/code/renderer/tr_local.h
+++ b/MP/code/renderer/tr_local.h
@@ -98,8 +98,7 @@ typedef enum
IMGFLAG_NO_COMPRESSION = 0x0010,
IMGFLAG_NOLIGHTSCALE   = 0x0020,
IMGFLAG_CLAMPTOEDGE= 0x0040,
-   IMGFLAG_SRGB   = 0x0080,
-   IMGFLAG_GENNORMALMAP   = 0x0100,
+   IMGFLAG_GENNORMALMAP   = 0x0080,
 } imgFlags_t;
 
 typedef struct image_s {
diff --git a/SP/code/rend2/tr_local.h b/SP/code/rend2/tr_local.h
index 739cb60..48f9ae1 100644
--- a/SP/code/rend2/tr_local.h
+++ b/SP/code/rend2/tr_local.h
@@ -99,8 +99,7 @@ typedef enum
IMGFLAG_NO_COMPRESSION = 0x0010,
IMGFLAG_NOLIGHTSCALE   = 0x0020,
IMGFLAG_CLAMPTOEDGE= 0x0040,
-   IMGFLAG_SRGB   = 0x0080,
-   IMGFLAG_GENNORMALMAP   = 0x0100,
+   IMGFLAG_GENNORMALMAP   = 0x0080,
 } imgFlags_t;
 
 typedef struct image_s {
diff --git a/SP/code/rend2/tr_shader.c b/SP/code/rend2/tr_shader.c
index 8029ccc..bec5b02 100644
--- a/SP/code/rend2/tr_shader.c
+++ b/SP/code/rend2/tr_shader.c
@@ -2345,7 +2345,7 @@ static void CollapseStagesToLightall(shaderStage_t 
*diffuse,
{
char normalName[MAX_QPATH];
image_t *normalImg;
-   imgFlags_t normalFlags = (diffuseImg->flags & 
~(IMGFLAG_GENNORMALMAP | IMGFLAG_SRGB)) | IMGFLAG_NOLIGHTSCALE;
+   imgFlags_t normalFlags = (diffuseImg->flags & 
~IMGFLAG_GENNORMALMAP) | IMGFLAG_NOLIGHTSCALE;
 
// try a normalheight image first
COM_StripExtension(diffuseImg->imgName, normalName, 
MAX_QPATH);
@@ -2391,7 +2391,7 @@ static void CollapseStagesToLightall(shaderStage_t 
*diffuse,
{
char specularName[MAX_QPATH];
image_t *specularImg;
-   imgFlags_t specularFlags = (diffuseImg->flags & 
~(IMGFLAG_GENNORMALMAP | IMGFLAG_SRGB)) | IMGFLAG_NOLIGHTSCALE;
+   imgFlags_t specularFlags = (diffuseImg->flags & 
~IMGFLAG_GENNORMALMAP) | IMGFLAG_NOLIGHTSCALE;
 
COM_StripExtension(diffuseImg->imgName, specularName, 
MAX_QPATH);
Q_strcat(specularName, MAX_QPATH, "_s");
diff --git a/SP/code/renderer/tr_local.h b/SP/code/renderer/tr_local.h
index b978e3a..7f83c54 100644
--- a/SP/code/renderer/tr_local.h
+++ b/SP/code/renderer/tr_local.h
@@ -98,8 +98,7 @@ typedef enum

[iortcw] 78/89: All: Fix/improve buffer overflow in MSG_ReadBits/MSG_WriteBits

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 260c39a29af517a08b3ee1a0e78ad654bdd70934
Author: MAN-AT-ARMS 
Date:   Thu Aug 3 00:06:37 2017 -0400

All: Fix/improve buffer overflow in MSG_ReadBits/MSG_WriteBits
---
 MP/code/qcommon/huffman.c | 49 ---
 MP/code/qcommon/msg.c | 45 +---
 MP/code/qcommon/qcommon.h |  6 ++---
 SP/code/qcommon/huffman.c | 49 ---
 SP/code/qcommon/msg.c | 65 ++-
 SP/code/qcommon/qcommon.h |  6 ++---
 6 files changed, 145 insertions(+), 75 deletions(-)

diff --git a/MP/code/qcommon/huffman.c b/MP/code/qcommon/huffman.c
index 00b007e..88b972c 100644
--- a/MP/code/qcommon/huffman.c
+++ b/MP/code/qcommon/huffman.c
@@ -36,7 +36,7 @@ If you have questions concerning this license or the 
applicable additional terms
 
 static int bloc = 0;
 
-voidHuff_putBit( int bit, byte *fout, int *offset ) {
+void Huff_putBit( int bit, byte *fout, int *offset ) {
bloc = *offset;
if ( ( bloc & 7 ) == 0 ) {
fout[( bloc >> 3 )] = 0;
@@ -46,17 +46,15 @@ voidHuff_putBit( int bit, byte *fout, int *offset ) {
*offset = bloc;
 }
 
-intHuff_getBloc(void)
-{
+int Huff_getBloc( void ) {
return bloc;
 }
 
-void   Huff_setBloc(int _bloc)
-{
+void Huff_setBloc( int _bloc ) {
bloc = _bloc;
 }
 
-int Huff_getBit( byte *fin, int *offset ) {
+int Huff_getBit( byte *fin, int *offset ) {
int t;
bloc = *offset;
t = ( fin[( bloc >> 3 )] >> ( bloc & 7 ) ) & 0x1;
@@ -286,9 +284,14 @@ int Huff_Receive( node_t *node, int *ch, byte *fin ) {
 }
 
 /* Get a symbol */
-void Huff_offsetReceive( node_t *node, int *ch, byte *fin, int *offset ) {
+void Huff_offsetReceive( node_t *node, int *ch, byte *fin, int *offset, int 
maxoffset ) {
bloc = *offset;
while ( node && node->symbol == INTERNAL_NODE ) {
+   if ( bloc >= maxoffset ) {
+   *ch = 0;
+   *offset = maxoffset + 1;
+   return;
+   }
if ( get_bit( fin ) ) {
node = node->right;
} else {
@@ -305,11 +308,15 @@ void Huff_offsetReceive( node_t *node, int *ch, byte 
*fin, int *offset ) {
 }
 
 /* Send the prefix code for this node */
-static void send( node_t *node, node_t *child, byte *fout ) {
+static void send( node_t *node, node_t *child, byte *fout, int maxoffset ) {
if ( node->parent ) {
-   send( node->parent, node, fout );
+   send( node->parent, node, fout, maxoffset );
}
if ( child ) {
+   if ( bloc >= maxoffset ) {
+   bloc = maxoffset + 1;
+   return;
+   }
if ( node->right == child ) {
add_bit( 1, fout );
} else {
@@ -319,22 +326,22 @@ static void send( node_t *node, node_t *child, byte *fout 
) {
 }
 
 /* Send a symbol */
-void Huff_transmit( huff_t *huff, int ch, byte *fout ) {
+void Huff_transmit( huff_t *huff, int ch, byte *fout, int maxoffset ) {
int i;
if ( huff->loc[ch] == NULL ) {
/* node_t hasn't been transmitted, send a NYT, then the symbol 
*/
-   Huff_transmit( huff, NYT, fout );
+   Huff_transmit( huff, NYT, fout, maxoffset );
for ( i = 7; i >= 0; i-- ) {
add_bit( (char)( ( ch >> i ) & 0x1 ), fout );
}
} else {
-   send( huff->loc[ch], NULL, fout );
+   send( huff->loc[ch], NULL, fout, maxoffset );
}
 }
 
-void Huff_offsetTransmit( huff_t *huff, int ch, byte *fout, int *offset ) {
+void Huff_offsetTransmit( huff_t *huff, int ch, byte *fout, int *offset, int 
maxoffset ) {
bloc = *offset;
-   send( huff->loc[ch], NULL, fout );
+   send( huff->loc[ch], NULL, fout, maxoffset );
*offset = bloc;
 }
 
@@ -374,17 +381,17 @@ void Huff_Decompress( msg_t *mbuf, int offset ) {
seq[j] = 0;
break;
}
-   Huff_Receive( huff.tree, , buffer );   /* Get a 
character */
-   if ( ch == NYT ) {  /* We got a 
NYT, get the symbol associated with it */
+   Huff_Receive( huff.tree, , buffer ); 
/* Get a character */
+   if ( ch == NYT ) {  
/* We got a NYT, get the symbol associated with it */
ch = 0;
for ( i = 0; i < 8; i++ ) {
ch = ( ch << 1 ) + get_bit( buffer );
}
}
 
-   seq[j] = ch; 

[iortcw] 79/89: All: Fix friction in AAS_PredictClientMovement

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 33d62b42a153414f39895cfec77b086948d4ee17
Author: MAN-AT-ARMS 
Date:   Thu Aug 3 00:11:22 2017 -0400

All: Fix friction in AAS_PredictClientMovement
---
 MP/code/botlib/be_aas_move.c | 2 +-
 SP/code/botlib/be_aas_move.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/botlib/be_aas_move.c b/MP/code/botlib/be_aas_move.c
index 7e23be3..6556d65 100644
--- a/MP/code/botlib/be_aas_move.c
+++ b/MP/code/botlib/be_aas_move.c
@@ -480,7 +480,7 @@ int AAS_PredictClientMovement( struct aas_clientmove_s 
*move,
frame_test_vel[2] = frame_test_vel[2] - ( gravity * 0.1 * 
frametime );
//if on the ground or swimming
if ( onground || swimming ) {
-   friction = swimming ? sv_friction : sv_waterfriction;
+   friction = swimming ? sv_waterfriction : sv_friction;
//apply friction
VectorScale( frame_test_vel, 1 / frametime, 
frame_test_vel );
AAS_ApplyFriction( frame_test_vel, friction, 
sv_stopspeed, frametime );
diff --git a/SP/code/botlib/be_aas_move.c b/SP/code/botlib/be_aas_move.c
index e9c5cf8..14a2e55 100644
--- a/SP/code/botlib/be_aas_move.c
+++ b/SP/code/botlib/be_aas_move.c
@@ -480,7 +480,7 @@ int AAS_PredictClientMovement( struct aas_clientmove_s 
*move,
frame_test_vel[2] = frame_test_vel[2] - ( gravity * 0.1 * 
frametime );
//if on the ground or swimming
if ( onground || swimming ) {
-   friction = swimming ? sv_friction : sv_waterfriction;
+   friction = swimming ? sv_waterfriction : sv_friction;
//apply friction
VectorScale( frame_test_vel, 1 / frametime, 
frame_test_vel );
AAS_ApplyFriction( frame_test_vel, friction, 
sv_stopspeed, frametime );

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 80/89: All: Remove references to non-existent function CheckTournament

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit b1f528cad1c287edc6996c1c73d6eccc47b114eb
Author: MAN-AT-ARMS 
Date:   Thu Aug 3 04:06:48 2017 -0400

All: Remove references to non-existent function CheckTournament
---
 MP/code/game/g_main.c | 3 ---
 SP/code/game/g_main.c | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/MP/code/game/g_main.c b/MP/code/game/g_main.c
index f3a8166..fc73310 100644
--- a/MP/code/game/g_main.c
+++ b/MP/code/game/g_main.c
@@ -2762,9 +2762,6 @@ void G_RunFrame( int levelTime ) {
}
}
 
-   // see if it is time to do a tournement restart
-// CheckTournament();
-
// NERVE - SMF
CheckWolfMP();
 
diff --git a/SP/code/game/g_main.c b/SP/code/game/g_main.c
index 675357f..e1ae155 100644
--- a/SP/code/game/g_main.c
+++ b/SP/code/game/g_main.c
@@ -2581,9 +2581,6 @@ void G_RunFrame( int levelTime ) {
}
}
 
-   // see if it is time to do a tournement restart
-// CheckTournament();
-
// see if it is time to end the level
CheckExitRules();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 67/89: All: Rend2: Remove redundant GL_State in RB_IterateStagesGeneric

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 21799a0ad816293afbf7a22af64641596953f1bf
Author: MAN-AT-ARMS 
Date:   Fri Jul 21 09:19:05 2017 -0400

All: Rend2: Remove redundant GL_State in RB_IterateStagesGeneric
---
 MP/code/rend2/tr_shade.c | 1 -
 SP/code/rend2/tr_shade.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/MP/code/rend2/tr_shade.c b/MP/code/rend2/tr_shade.c
index 0c66ed3..424297e 100644
--- a/MP/code/rend2/tr_shade.c
+++ b/MP/code/rend2/tr_shade.c
@@ -1293,7 +1293,6 @@ static void RB_IterateStagesGeneric( shaderCommands_t 
*input )
GLSL_SetUniformFloat(sp, UNIFORM_FOGEYET, eyeT);
}
 
-   GL_State( pStage->stateBits );
if ((pStage->stateBits & GLS_ATEST_BITS) == GLS_ATEST_GT_0)
{
GLSL_SetUniformInt(sp, UNIFORM_ALPHATEST, 1);
diff --git a/SP/code/rend2/tr_shade.c b/SP/code/rend2/tr_shade.c
index 12167d6..de5ff28 100644
--- a/SP/code/rend2/tr_shade.c
+++ b/SP/code/rend2/tr_shade.c
@@ -1287,7 +1287,6 @@ static void RB_IterateStagesGeneric( shaderCommands_t 
*input )
GLSL_SetUniformFloat(sp, UNIFORM_FOGEYET, eyeT);
}
 
-   GL_State( pStage->stateBits );
if ((pStage->stateBits & GLS_ATEST_BITS) == GLS_ATEST_GT_0)
{
GLSL_SetUniformInt(sp, UNIFORM_ALPHATEST, 1);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 68/89: All: Rend2: Fix crash when using cg_shadows 4

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit ee78db29ceb311bd84f85ba13fe00ea33eafeffc
Author: MAN-AT-ARMS 
Date:   Fri Jul 21 16:01:37 2017 -0400

All: Rend2: Fix crash when using cg_shadows 4
---
 MP/code/rend2/tr_main.c | 2 +-
 SP/code/rend2/tr_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_main.c b/MP/code/rend2/tr_main.c
index 43e3c1f..cbd3523 100644
--- a/MP/code/rend2/tr_main.c
+++ b/MP/code/rend2/tr_main.c
@@ -2089,7 +2089,7 @@ void R_RenderPshadowMaps(const refdef_t *fd)
break;
case MOD_MDS:
{
-   mdsHeader_t *header = model->modelData;
+   mdsHeader_t *header = model->mds;
int frameSize = (size_t)( &((mdsFrame_t 
*)0)->bones[ header->numBones ] );
mdsFrame_t *frame = ( mdsFrame_t * ) ( 
( byte * ) header + header->ofsFrames + frameSize * ent->e.frame);
 
diff --git a/SP/code/rend2/tr_main.c b/SP/code/rend2/tr_main.c
index d607d38..a84c61b 100644
--- a/SP/code/rend2/tr_main.c
+++ b/SP/code/rend2/tr_main.c
@@ -2131,7 +2131,7 @@ void R_RenderPshadowMaps(const refdef_t *fd)
break;
case MOD_MDS:
{
-   mdsHeader_t *header = model->modelData;
+   mdsHeader_t *header = model->mds;
int frameSize = (size_t)( &((mdsFrame_t 
*)0)->bones[ header->numBones ] );
mdsFrame_t *frame = ( mdsFrame_t * ) ( 
( byte * ) header + header->ofsFrames + frameSize * ent->e.frame);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 81/89: SP: Fix license header for huffman.c

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 2fa995dfdca32b32fd918f0af7edc67915cc1ad8
Author: MAN-AT-ARMS 
Date:   Thu Aug 3 10:05:12 2017 -0400

SP: Fix license header for huffman.c
---
 SP/code/qcommon/huffman.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SP/code/qcommon/huffman.c b/SP/code/qcommon/huffman.c
index 88b972c..2d6ce37 100644
--- a/SP/code/qcommon/huffman.c
+++ b/SP/code/qcommon/huffman.c
@@ -1,25 +1,25 @@
 /*
 ===
 
-Return to Castle Wolfenstein multiplayer GPL Source Code
+Return to Castle Wolfenstein single player GPL Source Code
 Copyright (C) 1999-2010 id Software LLC, a ZeniMax Media company. 
 
-This file is part of the Return to Castle Wolfenstein multiplayer GPL Source 
Code (“RTCW MP Source Code”).  
+This file is part of the Return to Castle Wolfenstein single player GPL Source 
Code (“RTCW SP Source Code”).  
 
-RTCW MP Source Code is free software: you can redistribute it and/or modify
+RTCW SP Source Code is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-RTCW MP Source Code is distributed in the hope that it will be useful,
+RTCW SP Source Code is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with RTCW MP Source Code.  If not, see .
+along with RTCW SP Source Code.  If not, see .
 
-In addition, the RTCW MP Source Code is also subject to certain additional 
terms. You should have received a copy of these additional terms immediately 
following the terms and conditions of the GNU General Public License which 
accompanied the RTCW MP Source Code.  If not, please request a copy in writing 
from id Software at the address below.
+In addition, the RTCW SP Source Code is also subject to certain additional 
terms. You should have received a copy of these additional terms immediately 
following the terms and conditions of the GNU General Public License which 
accompanied the RTCW SP Source Code.  If not, please request a copy in writing 
from id Software at the address below.
 
 If you have questions concerning this license or the applicable additional 
terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., 
Suite 120, Rockville, Maryland 20850 USA.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 84/89: SP: Remove g_skipcutscenes

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit ec4f63da300f1c2f4cf7ec6fad1bbe66ddc94e85
Author: MAN-AT-ARMS 
Date:   Sun Aug 6 17:12:53 2017 -0400

SP: Remove g_skipcutscenes

This was basically a temporary workaround for a clang compiler bug
that read function arguments out of order and was never intended to be 
permanent.
The code that clang had trouble with has since been modified and fixed so 
this is
no longer needed as a workaround.
---
 SP/code/game/ai_cast_script_actions.c | 5 -
 SP/code/game/g_cmds.c | 3 ---
 SP/code/game/g_local.h| 2 --
 SP/code/game/g_main.c | 4 
 4 files changed, 14 deletions(-)

diff --git a/SP/code/game/ai_cast_script_actions.c 
b/SP/code/game/ai_cast_script_actions.c
index 8abdc4d..10a5f08 100644
--- a/SP/code/game/ai_cast_script_actions.c
+++ b/SP/code/game/ai_cast_script_actions.c
@@ -2652,11 +2652,6 @@ qboolean ScriptStartCam( cast_state_t *cs, char *params, 
qboolean black ) {
char *pString, *token;
gentity_t *ent;
 
-   if ( g_skipcutscenes.integer ) {
-   AICast_ScriptEvent( cs, "trigger", "cameraInterrupt" );
-   return qtrue;
-   }
-
ent = _entities[cs->entityNum];
 
pString = params;
diff --git a/SP/code/game/g_cmds.c b/SP/code/game/g_cmds.c
index fa82b43..e60ddf6 100644
--- a/SP/code/game/g_cmds.c
+++ b/SP/code/game/g_cmds.c
@@ -1318,9 +1318,6 @@ void Cmd_StartCamera_f( gentity_t *ent ) {
ent->client->ps.eFlags |= EF_VIEWING_CAMERA;
ent->s.eFlags |= EF_VIEWING_CAMERA;
 
-   if ( g_skipcutscenes.integer )
-   AICast_ScriptEvent( AICast_GetCastState( ent->s.number ), 
"trigger", "cameraInterrupt" );
-
 // (SA) trying this in client to avoid 1 frame of player drawing
 // ent->client->ps.eFlags |= EF_NODRAW;
 // ent->s.eFlags |= EF_NODRAW;
diff --git a/SP/code/game/g_local.h b/SP/code/game/g_local.h
index 8818c31..6ab283a 100644
--- a/SP/code/game/g_local.h
+++ b/SP/code/game/g_local.h
@@ -1067,8 +1067,6 @@ extern gentity_t   *g_camEnt;
 
 extern vmCvar_t g_gametype;
 
-extern vmCvar_t g_skipcutscenes;
-
 // Rafael gameskill
 extern vmCvar_t g_gameskill;
 // done
diff --git a/SP/code/game/g_main.c b/SP/code/game/g_main.c
index e1ae155..5e57639 100644
--- a/SP/code/game/g_main.c
+++ b/SP/code/game/g_main.c
@@ -54,8 +54,6 @@ extern int bg_pmove_gameskill_integer;
 
 vmCvar_t g_gametype;
 
-vmCvar_t g_skipcutscenes;
-
 // Rafael gameskill
 vmCvar_t g_gameskill;
 // done
@@ -171,8 +169,6 @@ cvarTable_t gameCvarTable[] = {
{ _soldierChargeTime, "g_soldierChargeTime", "2", CVAR_SERVERINFO 
| CVAR_LATCH, 0, qfalse },
 // jpw
 
-   { _skipcutscenes, "g_skipcutscenes", "0", CVAR_ARCHIVE, 0, qtrue  },
-
{ _playerStart, "g_playerStart", "0", CVAR_ROM, 0, qfalse  },
 
{ _maxclients, "sv_maxclients", "8", CVAR_SERVERINFO | CVAR_LATCH | 
CVAR_ARCHIVE, 0, qfalse  },

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 70/89: All: Rend2: Don't use initialized arrays in glsl shaders

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 088b1359ec123c77fac6bf1580bdd8c539eaf934
Author: MAN-AT-ARMS 
Date:   Mon Jul 24 22:15:26 2017 -0400

All: Rend2: Don't use initialized arrays in glsl shaders
---
 MP/code/rend2/glsl/bokeh_fp.glsl | 18 --
 MP/code/rend2/glsl/depthblur_fp.glsl |  8 +++-
 MP/code/rend2/glsl/ssao_fp.glsl  | 15 +++
 SP/code/rend2/glsl/bokeh_fp.glsl | 18 --
 SP/code/rend2/glsl/depthblur_fp.glsl |  8 +++-
 SP/code/rend2/glsl/ssao_fp.glsl  | 15 +++
 6 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/MP/code/rend2/glsl/bokeh_fp.glsl b/MP/code/rend2/glsl/bokeh_fp.glsl
index d08816a..d2ec5b4 100644
--- a/MP/code/rend2/glsl/bokeh_fp.glsl
+++ b/MP/code/rend2/glsl/bokeh_fp.glsl
@@ -11,7 +11,15 @@ void main()
vec2 tc;
 
 #if 0
-   float c[7] = float[7](1.0, 0.9659258263, 0.8660254038, 0.7071067812, 
0.5, 0.2588190451, 0.0);
+   float c[7];
+
+   c[0] = 1.0;
+   c[1] = 0.9659258263;
+   c[2] = 0.8660254038;
+   c[3] = 0.7071067812;
+   c[4] = 0.5;
+   c[5] = 0.2588190451;
+   c[6] = 0.0;
 
tc = var_TexCoords + u_InvTexRes * vec2(  c[0],  c[6]);  color =  
texture2D(u_TextureMap, tc);
tc = var_TexCoords + u_InvTexRes * vec2(  c[1],  c[5]);  color += 
texture2D(u_TextureMap, tc);
@@ -44,7 +52,13 @@ void main()
gl_FragColor = color * 0.0417 * u_Color;
 #endif
 
-   float c[5] = float[5](1.0, 0.9238795325, 0.7071067812, 0.3826834324, 
0.0);
+   float c[5];
+
+   c[0] = 1.0;
+   c[1] = 0.9238795325;
+   c[2] = 0.7071067812;
+   c[3] = 0.3826834324;
+   c[4] = 0.0;
 
tc = var_TexCoords + u_InvTexRes * vec2(  c[0],  c[4]);  color =  
texture2D(u_TextureMap, tc);
tc = var_TexCoords + u_InvTexRes * vec2(  c[1],  c[3]);  color += 
texture2D(u_TextureMap, tc);
diff --git a/MP/code/rend2/glsl/depthblur_fp.glsl 
b/MP/code/rend2/glsl/depthblur_fp.glsl
index d71b348..d63df88 100644
--- a/MP/code/rend2/glsl/depthblur_fp.glsl
+++ b/MP/code/rend2/glsl/depthblur_fp.glsl
@@ -6,7 +6,7 @@ varying vec2   var_ScreenTex;
 
 //float gauss[8] = float[8](0.17, 0.17, 0.16, 0.14, 0.12, 0.1, 0.08, 0.06);
 //float gauss[5] = float[5](0.30, 0.23, 0.097, 0.024, 0.0033);
-float gauss[4] = float[4](0.40, 0.24, 0.054, 0.0044);
+//float gauss[4] = float[4](0.40, 0.24, 0.054, 0.0044);
 //float gauss[3] = float[3](0.60, 0.19, 0.0066);
 #define BLUR_SIZE 4
 
@@ -22,6 +22,12 @@ float getLinearDepth(sampler2D depthMap, const vec2 tex, 
const float zFarDivZNea
 
 vec4 depthGaussian1D(sampler2D imageMap, sampler2D depthMap, vec2 tex, float 
zFarDivZNear, float zFar, vec2 scale)
 {
+   float gauss[4];
+
+   gauss[0] = 0.40;
+   gauss[1] = 0.24;
+   gauss[2] = 0.054;
+   gauss[3] = 0.0044;
 
 #if defined(USE_DEPTH)
float depthCenter = getLinearDepth(depthMap, tex, zFarDivZNear);
diff --git a/MP/code/rend2/glsl/ssao_fp.glsl b/MP/code/rend2/glsl/ssao_fp.glsl
index 93f6185..d4c4306 100644
--- a/MP/code/rend2/glsl/ssao_fp.glsl
+++ b/MP/code/rend2/glsl/ssao_fp.glsl
@@ -4,6 +4,7 @@ uniform vec4   u_ViewInfo; // zfar / znear, zfar, 1/width, 
1/height
 
 varying vec2   var_ScreenTex;
 
+#if 0
 vec2 poissonDisc[9] = vec2[9](
 vec2(-0.7055767, 0.196515),vec2(0.3524343, -0.7791386),
 vec2(0.2391056, 0.9189604),vec2(-0.07580382, -0.09224417),
@@ -11,6 +12,8 @@ vec2(0.5784913, -0.002528916), vec2(0.192888, 0.4064181),
 vec2(-0.6335801, -0.5247476),  vec2(-0.5579782, 0.7491854),
 vec2(0.7320465, 0.6317794)
 );
+#endif
+
 #define NUM_SAMPLES 3
 
 // Input: It uses texture coords as the random number seed.
@@ -46,6 +49,18 @@ float getLinearDepth(sampler2D depthMap, const vec2 tex, 
const float zFarDivZNea
 
 float ambientOcclusion(sampler2D depthMap, const vec2 tex, const float 
zFarDivZNear, const float zFar, const vec2 scale)
 {
+   vec2 poissonDisc[9];
+
+   poissonDisc[0] = vec2(-0.7055767, 0.196515);
+   poissonDisc[1] = vec2(0.3524343, -0.7791386);
+   poissonDisc[2] = vec2(0.2391056, 0.9189604);
+   poissonDisc[3] = vec2(-0.07580382, -0.09224417);
+   poissonDisc[4] = vec2(0.5784913, -0.002528916);
+   poissonDisc[5] = vec2(0.192888, 0.4064181);
+   poissonDisc[6] = vec2(-0.6335801, -0.5247476);
+   poissonDisc[7] = vec2(-0.5579782, 0.7491854);
+   poissonDisc[8] = vec2(0.7320465, 0.6317794);
+
float result = 0;
 
float sampleZ = getLinearDepth(depthMap, tex, zFarDivZNear);
diff --git a/SP/code/rend2/glsl/bokeh_fp.glsl b/SP/code/rend2/glsl/bokeh_fp.glsl
index d08816a..d2ec5b4 100644
--- a/SP/code/rend2/glsl/bokeh_fp.glsl
+++ b/SP/code/rend2/glsl/bokeh_fp.glsl
@@ -11,7 +11,15 @@ void main()
vec2 tc;
 
 #if 0
-   float c[7] = float[7](1.0, 0.9659258263, 0.8660254038, 0.7071067812, 
0.5, 0.2588190451, 0.0);
+   float c[7];
+
+

[iortcw] 85/89: All: Rend2: Use extension functions with OpenGL versions before 3.0

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit b922900f2dc7df78a36eb177a77d1edc0d7750cb
Author: MAN-AT-ARMS 
Date:   Wed Aug 9 12:38:13 2017 -0400

All: Rend2: Use extension functions with OpenGL versions before 3.0
---
 MP/code/rend2/qgl.h   |  10 +++-
 MP/code/rend2/tr_extensions.c | 130 +-
 MP/code/renderer/qgl.h|  11 +++-
 SP/code/rend2/qgl.h   |  10 +++-
 SP/code/rend2/tr_extensions.c | 130 +-
 SP/code/renderer/qgl.h|  10 +++-
 6 files changed, 192 insertions(+), 109 deletions(-)

diff --git a/MP/code/rend2/qgl.h b/MP/code/rend2/qgl.h
index 93fb8e6..530fe12 100644
--- a/MP/code/rend2/qgl.h
+++ b/MP/code/rend2/qgl.h
@@ -562,9 +562,12 @@ extern void (APIENTRYP qglPNTrianglesfATI)(GLenum pname, 
GLfloat param);
 #define GL_HALF_FLOAT_ARB   0x140B
 #endif
 
-// OpenGL 3.0, was GL_EXT_framebuffer_object, GL_EXT_framebuffer_blit, 
GL_EXT_framebuffer_multisample, and GL_ARB_vertex_array_object
+// OpenGL 3.0 specific
 #define QGL_3_0_PROCS \
GLE(const GLubyte *, GetStringi, GLenum name, GLuint index) \
+
+// GL_ARB_framebuffer_object, built-in to OpenGL 3.0
+#define QGL_ARB_framebuffer_object_PROCS \
GLE(void, BindRenderbuffer, GLenum target, GLuint renderbuffer) \
GLE(void, DeleteRenderbuffers, GLsizei n, const GLuint *renderbuffers) \
GLE(void, GenRenderbuffers, GLsizei n, GLuint *renderbuffers) \
@@ -578,6 +581,9 @@ extern void (APIENTRYP qglPNTrianglesfATI)(GLenum pname, 
GLfloat param);
GLE(void, GenerateMipmap, GLenum target) \
GLE(void, BlitFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint 
srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, 
GLenum filter) \
GLE(void, RenderbufferStorageMultisample, GLenum target, GLsizei 
samples, GLenum internalformat, GLsizei width, GLsizei height) \
+
+// GL_ARB_vertex_array_object, built-in to OpenGL 3.0
+#define QGL_ARB_vertex_array_object_PROCS \
GLE(void, BindVertexArray, GLuint array) \
GLE(void, DeleteVertexArrays, GLsizei n, const GLuint *arrays) \
GLE(void, GenVertexArrays, GLsizei n, GLuint *arrays) \
@@ -637,6 +643,8 @@ QGL_1_3_PROCS;
 QGL_1_5_PROCS;
 QGL_2_0_PROCS;
 QGL_3_0_PROCS;
+QGL_ARB_framebuffer_object_PROCS;
+QGL_ARB_vertex_array_object_PROCS;
 QGL_EXT_direct_state_access_PROCS;
 #undef GLE
 
diff --git a/MP/code/rend2/tr_extensions.c b/MP/code/rend2/tr_extensions.c
index 7df5295..8447608 100644
--- a/MP/code/rend2/tr_extensions.c
+++ b/MP/code/rend2/tr_extensions.c
@@ -35,6 +35,8 @@ QGL_1_3_PROCS;
 QGL_1_5_PROCS;
 QGL_2_0_PROCS;
 QGL_3_0_PROCS;
+QGL_ARB_framebuffer_object_PROCS;
+QGL_ARB_vertex_array_object_PROCS;
 QGL_EXT_direct_state_access_PROCS;
 #undef GLE
 
@@ -42,6 +44,8 @@ void GLimp_InitExtraExtensions()
 {
char *extension;
const char* result[3] = { "...ignoring %s\n", "...using %s\n", "...%s 
not found\n" };
+   qboolean q_gl_version_at_least_3_0;
+   qboolean q_gl_version_at_least_3_2;
 
// Check OpenGL version
sscanf(glConfig.version_string, "%d.%d", 
, );
@@ -49,6 +53,9 @@ void GLimp_InitExtraExtensions()
ri.Error(ERR_FATAL, "OpenGL 2.0 required!");
ri.Printf(PRINT_ALL, "...using OpenGL %s\n", glConfig.version_string);
 
+   q_gl_version_at_least_3_0 = (glRefConfig.openglMajorVersion >= 3);
+   q_gl_version_at_least_3_2 = (glRefConfig.openglMajorVersion > 3 || 
(glRefConfig.openglMajorVersion == 3 && glRefConfig.openglMinorVersion > 2));
+
// Check if we need Intel graphics specific fixes.
glRefConfig.intelGraphics = qfalse;
if (strstr((char *)qglGetString(GL_RENDERER), "Intel"))
@@ -72,31 +79,92 @@ void GLimp_InitExtraExtensions()
// OpenGL 2.0, was GL_ARB_shading_language_100, GL_ARB_vertex_program, 
GL_ARB_shader_objects, and GL_ARB_vertex_shader
QGL_2_0_PROCS;
 
-   // OpenGL 3.0, was GL_EXT_framebuffer_object, GL_EXT_framebuffer_blit, 
GL_EXT_framebuffer_multisample, and GL_ARB_vertex_array_object
+   // OpenGL 3.0 - no matching extension
// QGL_*_PROCS becomes several functions, do not remove {}
-   if (glRefConfig.openglMajorVersion >= 3)
+   if (q_gl_version_at_least_3_0)
{
QGL_3_0_PROCS;
+   }
 
+   // OpenGL 3.0 - GL_ARB_framebuffer_object
+   extension = "GL_ARB_framebuffer_object";
+   glRefConfig.framebufferObject = qfalse;
+   glRefConfig.framebufferBlit = qfalse;
+   glRefConfig.framebufferMultisample = qfalse;
+   if (q_gl_version_at_least_3_0 || SDL_GL_ExtensionSupported(extension))
+   {
glRefConfig.framebufferObject = 
!!r_ext_framebuffer_object->integer;
glRefConfig.framebufferBlit = qtrue;
glRefConfig.framebufferMultisample = 

[iortcw] 86/89: All: Rend2: Force VAO usage on OpenGL 3.0+

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 24872e3476f91751c4400ecf03cce83fee236725
Author: MAN-AT-ARMS 
Date:   Wed Aug 9 12:40:29 2017 -0400

All: Rend2: Force VAO usage on OpenGL 3.0+
---
 MP/code/rend2/tr_extensions.c | 12 ++--
 SP/code/rend2/tr_extensions.c | 12 ++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/MP/code/rend2/tr_extensions.c b/MP/code/rend2/tr_extensions.c
index 8447608..e90f518 100644
--- a/MP/code/rend2/tr_extensions.c
+++ b/MP/code/rend2/tr_extensions.c
@@ -112,9 +112,17 @@ void GLimp_InitExtraExtensions()
// OpenGL 3.0 - GL_ARB_vertex_array_object
extension = "GL_ARB_vertex_array_object";
glRefConfig.vertexArrayObject = qfalse;
-   if (SDL_GL_ExtensionSupported(extension))
+   if (q_gl_version_at_least_3_0 || SDL_GL_ExtensionSupported(extension))
{
-   glRefConfig.vertexArrayObject = 
!!r_arb_vertex_array_object->integer;
+   if (q_gl_version_at_least_3_0)
+   {
+   // force VAO, core context requires it
+   glRefConfig.vertexArrayObject = qtrue;
+   }
+   else
+   {
+   glRefConfig.vertexArrayObject = 
!!r_arb_vertex_array_object->integer;
+   }
 
QGL_ARB_vertex_array_object_PROCS;
 
diff --git a/SP/code/rend2/tr_extensions.c b/SP/code/rend2/tr_extensions.c
index 8447608..e90f518 100644
--- a/SP/code/rend2/tr_extensions.c
+++ b/SP/code/rend2/tr_extensions.c
@@ -112,9 +112,17 @@ void GLimp_InitExtraExtensions()
// OpenGL 3.0 - GL_ARB_vertex_array_object
extension = "GL_ARB_vertex_array_object";
glRefConfig.vertexArrayObject = qfalse;
-   if (SDL_GL_ExtensionSupported(extension))
+   if (q_gl_version_at_least_3_0 || SDL_GL_ExtensionSupported(extension))
{
-   glRefConfig.vertexArrayObject = 
!!r_arb_vertex_array_object->integer;
+   if (q_gl_version_at_least_3_0)
+   {
+   // force VAO, core context requires it
+   glRefConfig.vertexArrayObject = qtrue;
+   }
+   else
+   {
+   glRefConfig.vertexArrayObject = 
!!r_arb_vertex_array_object->integer;
+   }
 
QGL_ARB_vertex_array_object_PROCS;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 74/89: All: Don't require to be a local client to use g_localTeamPref

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 82cf63874f26c4a0caab8fedf056fdbee97e9d7a
Author: MAN-AT-ARMS 
Date:   Fri Jul 28 20:34:27 2017 -0400

All: Don't require to be a local client to use g_localTeamPref

Fix g_teamAutoJoin
Sync g_teamForceBalance code from MP into SP
---
 MP/code/game/g_cmds.c|  5 +
 MP/code/game/g_main.c|  1 +
 MP/code/game/g_session.c |  2 +-
 SP/code/game/g_client.c  | 27 +++
 SP/code/game/g_cmds.c| 28 
 SP/code/game/g_local.h   |  1 +
 SP/code/game/g_main.c|  3 +++
 SP/code/game/g_session.c |  2 +-
 8 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/MP/code/game/g_cmds.c b/MP/code/game/g_cmds.c
index 80d02de..c856676 100644
--- a/MP/code/game/g_cmds.c
+++ b/MP/code/game/g_cmds.c
@@ -694,6 +694,11 @@ void SetTeam( gentity_t *ent, const char *s ) {
// get and distribute relevent paramters
ClientUserinfoChanged( clientNum );
 
+   // client hasn't spawned yet, they sent an early team command, teampref 
userinfo, or g_teamAutoJoin is enabled
+   if ( client->pers.connected != CON_CONNECTED ) {
+   return;
+   }
+
ClientBegin( clientNum );
 }
 
diff --git a/MP/code/game/g_main.c b/MP/code/game/g_main.c
index 01662ef..f3a8166 100644
--- a/MP/code/game/g_main.c
+++ b/MP/code/game/g_main.c
@@ -205,6 +205,7 @@ cvarTable_t gameCvarTable[] = {
 
{ _friendlyFire, "g_friendlyFire", "1", CVAR_SERVERINFO | 
CVAR_ARCHIVE, 0, qtrue  },
 
+   { _teamAutoJoin, "g_teamAutoJoin", "0", CVAR_ARCHIVE  },
{ _teamForceBalance, "g_teamForceBalance", "0", CVAR_ARCHIVE  },  
  // NERVE - SMF - merge from team arena
 
{ _warmup, "g_warmup", "20", CVAR_ARCHIVE, 0, qtrue  },
diff --git a/MP/code/game/g_session.c b/MP/code/game/g_session.c
index af9e3c2..cfda965 100644
--- a/MP/code/game/g_session.c
+++ b/MP/code/game/g_session.c
@@ -150,7 +150,7 @@ void G_InitSessionData( gclient_t *client, char *userinfo ) 
{
value = Info_ValueForKey( userinfo, "teampref" );
 
// check for human's team preference set by start server menu
-   if ( !value[0] && g_localTeamPref.string[0] && client->pers.localClient 
) {
+   if ( !value[0] && g_localTeamPref.string[0] /*&& 
client->pers.localClient*/ ) {
value = g_localTeamPref.string;
 
// clear team so it's only used once
diff --git a/SP/code/game/g_client.c b/SP/code/game/g_client.c
index 7c1e4ac..692da79 100644
--- a/SP/code/game/g_client.c
+++ b/SP/code/game/g_client.c
@@ -684,6 +684,33 @@ void ClientRespawn( gentity_t *ent ) {
ClientSpawn( ent );
 }
 
+// NERVE - SMF - merge from team arena
+/*
+
+TeamCount
+
+Returns number of players on a team
+
+*/
+int TeamCount( int ignoreClientNum, team_t team ) {
+   int i;
+   int count = 0;
+
+   for ( i = 0 ; i < level.maxclients ; i++ ) {
+   if ( i == ignoreClientNum ) {
+   continue;
+   }
+   if ( level.clients[i].pers.connected == CON_DISCONNECTED ) {
+   continue;
+   }
+   if ( level.clients[i].sess.sessionTeam == team ) {
+   count++;
+   }
+   }
+
+   return count;
+}
+// -NERVE - SMF
 
 /*
 
diff --git a/SP/code/game/g_cmds.c b/SP/code/game/g_cmds.c
index d59afbf..fa82b43 100644
--- a/SP/code/game/g_cmds.c
+++ b/SP/code/game/g_cmds.c
@@ -603,6 +603,29 @@ void SetTeam( gentity_t *ent, const char *s ) {
// pick the team with the least number of players
team = PickTeam( clientNum );
}
+
+   // NERVE - SMF - merge from team arena
+   if ( g_teamForceBalance.integer && !client->pers.localClient && 
!( ent->r.svFlags & SVF_BOT ) ) {
+   int counts[TEAM_NUM_TEAMS];
+
+   counts[TEAM_BLUE] = TeamCount( clientNum, TEAM_BLUE );
+   counts[TEAM_RED] = TeamCount( clientNum, TEAM_RED );
+
+   // We allow a spread of one
+   if ( team == TEAM_RED && counts[TEAM_RED] - 
counts[TEAM_BLUE] >= 1 ) {
+   trap_SendServerCommand( clientNum,
+   
"cp \"The Axis has too many players.\n\"" );
+   return; // ignore the request
+   }
+   if ( team == TEAM_BLUE && counts[TEAM_BLUE] - 
counts[TEAM_RED] >= 1 ) {
+   trap_SendServerCommand( clientNum,
+   
"cp \"The Allies have too many players.\n\"" );
+ 

[iortcw] 87/89: All: Remove newlines from chat messages in Game VM

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 7456532e8b20f215e49c23a48e7c34eb3a4bab1b
Author: MAN-AT-ARMS 
Date:   Sat Aug 12 16:25:34 2017 -0400

All: Remove newlines from chat messages in Game VM
---
 MP/code/game/g_cmds.c | 17 +
 SP/code/game/g_cmds.c | 13 +
 2 files changed, 30 insertions(+)

diff --git a/MP/code/game/g_cmds.c b/MP/code/game/g_cmds.c
index c856676..5609f31 100644
--- a/MP/code/game/g_cmds.c
+++ b/MP/code/game/g_cmds.c
@@ -1066,6 +1066,15 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode, 
const char *chatText )
}
 }
 
+static void SanitizeChatText( char *text ) {
+   int i;
+
+   for ( i = 0; text[i]; i++ ) {
+   if ( text[i] == '\n' || text[i] == '\r' ) {
+   text[i] = ' ';
+   }
+   }
+}
 
 /*
 ==
@@ -1086,6 +1095,8 @@ static void Cmd_Say_f( gentity_t *ent, int mode, qboolean 
arg0 ) {
p = ConcatArgs( 1 );
}
 
+   SanitizeChatText( p );
+
G_Say( ent, NULL, mode, p );
 }
 
@@ -1118,6 +1129,8 @@ static void Cmd_Tell_f( gentity_t *ent ) {
 
p = ConcatArgs( 2 );
 
+   SanitizeChatText( p );
+
G_LogPrintf( "tell: %s to %s: %s\n", ent->client->pers.netname, 
target->client->pers.netname, p );
G_Say( ent, target, SAY_TELL, p );
// don't tell to the player self if it was already directed to this 
player
@@ -1228,6 +1241,8 @@ static void Cmd_Voice_f( gentity_t *ent, int mode, 
qboolean arg0, qboolean voice
p = ConcatArgs( 1 );
}
 
+   SanitizeChatText( p );
+
G_Voice( ent, NULL, mode, p, voiceonly );
 }
 
@@ -1261,6 +1276,8 @@ static void Cmd_VoiceTell_f( gentity_t *ent, qboolean 
voiceonly ) {
 
id = ConcatArgs( 2 );
 
+   SanitizeChatText( p );
+
G_LogPrintf( "vtell: %s to %s: %s\n", ent->client->pers.netname, 
target->client->pers.netname, id );
G_Voice( ent, target, SAY_TELL, id, voiceonly );
// don't tell to the player self if it was already directed to this 
player
diff --git a/SP/code/game/g_cmds.c b/SP/code/game/g_cmds.c
index e60ddf6..a289790 100644
--- a/SP/code/game/g_cmds.c
+++ b/SP/code/game/g_cmds.c
@@ -1023,6 +1023,15 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode, 
const char *chatText )
}
 }
 
+static void SanitizeChatText( char *text ) {
+   int i;
+
+   for ( i = 0; text[i]; i++ ) {
+   if ( text[i] == '\n' || text[i] == '\r' ) {
+   text[i] = ' ';
+   }
+   }
+}
 
 /*
 ==
@@ -1043,6 +1052,8 @@ static void Cmd_Say_f( gentity_t *ent, int mode, qboolean 
arg0 ) {
p = ConcatArgs( 1 );
}
 
+   SanitizeChatText( p );
+
G_Say( ent, NULL, mode, p );
 }
 
@@ -1075,6 +1086,8 @@ static void Cmd_Tell_f( gentity_t *ent ) {
 
p = ConcatArgs( 2 );
 
+   SanitizeChatText( p );
+
G_LogPrintf( "tell: %s to %s: %s\n", ent->client->pers.netname, 
target->client->pers.netname, p );
G_Say( ent, target, SAY_TELL, p );
G_Say( ent, ent, SAY_TELL, p );

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 77/89: All: Fix compiler warning about set but not read variable in g_util.c

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 73f8ca847e027d70920d94684a32c3a6e5b92193
Author: MAN-AT-ARMS 
Date:   Wed Aug 2 23:17:55 2017 -0400

All: Fix compiler warning about set but not read variable in g_util.c
---
 MP/code/game/g_utils.c | 1 -
 SP/code/game/g_utils.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/MP/code/game/g_utils.c b/MP/code/game/g_utils.c
index 8b38f1b..b854dd7 100644
--- a/MP/code/game/g_utils.c
+++ b/MP/code/game/g_utils.c
@@ -419,7 +419,6 @@ gentity_t *G_Spawn( void ) {
gentity_t   *e;
 
e = NULL;   // shut up warning
-   i = 0;  // shut up warning
for ( force = 0 ; force < 2 ; force++ ) {
// if we go through all entities and can't find one to free,
// override the normal minimum times before use
diff --git a/SP/code/game/g_utils.c b/SP/code/game/g_utils.c
index abc2149..ff4c615 100644
--- a/SP/code/game/g_utils.c
+++ b/SP/code/game/g_utils.c
@@ -422,7 +422,6 @@ gentity_t *G_Spawn( void ) {
gentity_t   *e;
 
e = NULL;   // shut up warning
-   i = 0;  // shut up warning
for ( force = 0 ; force < 2 ; force++ ) {
// if we go through all entities and can't find one to free,
// override the normal minimum times before use

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 82/89: All: Fix floating point precision loss in renderer

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit aecd5bcc8e30e8ea8df4f5c5b31c94c3fd3bdfb1
Author: MAN-AT-ARMS 
Date:   Sat Aug 5 08:05:53 2017 -0400

All: Fix floating point precision loss in renderer
---
 MP/code/rend2/tr_backend.c   |  8 --
 MP/code/rend2/tr_local.h | 59 +---
 MP/code/rend2/tr_noise.c |  2 +-
 MP/code/rend2/tr_scene.c |  2 +-
 MP/code/rend2/tr_shade.c |  4 +--
 MP/code/rend2/tr_shade_calc.c| 18 ++--
 MP/code/renderer/tr_backend.c|  8 --
 MP/code/renderer/tr_local.h  | 10 +++
 MP/code/renderer/tr_noise.c  |  2 +-
 MP/code/renderer/tr_scene.c  |  2 +-
 MP/code/renderer/tr_shade.c  |  4 +--
 MP/code/renderer/tr_shade_calc.c | 24 
 SP/code/rend2/tr_backend.c   |  8 --
 SP/code/rend2/tr_local.h | 59 +---
 SP/code/rend2/tr_noise.c |  2 +-
 SP/code/rend2/tr_scene.c |  2 +-
 SP/code/rend2/tr_shade.c |  4 +--
 SP/code/rend2/tr_shade_calc.c| 18 ++--
 SP/code/renderer/tr_backend.c|  8 --
 SP/code/renderer/tr_local.h  | 10 +++
 SP/code/renderer/tr_noise.c  |  2 +-
 SP/code/renderer/tr_scene.c  |  2 +-
 SP/code/renderer/tr_shade.c  |  4 +--
 SP/code/renderer/tr_shade_calc.c | 24 
 24 files changed, 150 insertions(+), 136 deletions(-)

diff --git a/MP/code/rend2/tr_backend.c b/MP/code/rend2/tr_backend.c
index 5e9b271..4bd525c 100644
--- a/MP/code/rend2/tr_backend.c
+++ b/MP/code/rend2/tr_backend.c
@@ -503,7 +503,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
int i;
drawSurf_t  *drawSurf;
int oldSort;
-   float originalTime;
+   double originalTime;
FBO_t*  fbo = NULL;
qbooleaninQuery = qfalse;
 
@@ -568,7 +568,9 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
 
if ( entityNum != REFENTITYNUM_WORLD ) {
backEnd.currentEntity = 
[entityNum];
-   backEnd.refdef.floatTime = originalTime; // - 
backEnd.currentEntity->e.shaderTime; // JPW NERVE pulled this to match q3ta
+
+   // FIXME: e.shaderTime must be passed as int to 
avoid fp-precision loss issues
+   backEnd.refdef.floatTime = originalTime; // - 
(double)backEnd.currentEntity->e.shaderTime; // JPW NERVE pulled this to match 
q3ta
 
// we have to reset the shaderTime as well 
otherwise image animations start
// from the wrong frame
@@ -734,7 +736,7 @@ voidRB_SetGL2D( void ) {
 
// set time for 2D shaders
backEnd.refdef.time = ri.Milliseconds();
-   backEnd.refdef.floatTime = backEnd.refdef.time * 0.001f;
+   backEnd.refdef.floatTime = backEnd.refdef.time * 0.001;
 }
 
 
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index 6c7e30f..2e9d099 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -518,37 +518,14 @@ typedef struct shader_s {
 
void ( *optimalStageIteratorFunc )( void );
 
-   float clampTime;// time this shader 
is clamped to
-   float timeOffset;   // current time 
offset for this shader
+   double clampTime;// time this 
shader is clamped to
+   double timeOffset;   // current time 
offset for this shader
 
struct shader_s *remappedShader;// current shader 
this one is remapped too
 
struct shader_s *next;
 } shader_t;
 
-static ID_INLINE qboolean ShaderRequiresCPUDeforms(const shader_t * shader)
-{
-   if(shader->numDeforms)
-   {
-   const deformStage_t *ds = >deforms[0];
-
-   if (shader->numDeforms > 1)
-   return qtrue;
-
-   switch (ds->deformation)
-   {
-   case DEFORM_WAVE:
-   case DEFORM_BULGE:
-   return qfalse;
-
-   default:
-   return qtrue;
-   }
-   }
-
-   return qfalse;
-}
-
 typedef struct cubemap_s {
char name[MAX_QPATH];
vec3_t origin;
@@ -823,7 +800,7 @@ typedef struct {
byte areamask[MAX_MAP_AREA_BYTES];
qboolean areamaskModified;  // qtrue if areamask changed since last 
scene
 
-   float floatTime;// tr.refdef.time / 1000.0
+   double floatTime;// tr.refdef.time / 1000.0
 
float   blurFactor;
 
@@ -1997,9 +1974,35 @@ extern cvar_t   *r_wolffog;
 extern 

[iortcw] 83/89: All: Rend2: Reject OpenGL contexts w/ software renderer when core context requested

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit efb55f8aaf80185b3973d3a31224d486b386f797
Author: MAN-AT-ARMS 
Date:   Sat Aug 5 08:09:02 2017 -0400

All: Rend2: Reject OpenGL contexts w/ software renderer when core context 
requested
---
 MP/code/sdl/sdl_glimp.c | 17 -
 SP/code/sdl/sdl_glimp.c | 17 -
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/MP/code/sdl/sdl_glimp.c b/MP/code/sdl/sdl_glimp.c
index c3d91ef..c8a5ebe 100644
--- a/MP/code/sdl/sdl_glimp.c
+++ b/MP/code/sdl/sdl_glimp.c
@@ -550,7 +550,22 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, 
qboolean noborder, qbool
}
else
{
-   ri.Printf(PRINT_ALL, "SDL_GL_CreateContext 
succeeded, but: %s\n", SDL_GetError());
+   const char *renderer;
+
+   ri.Printf(PRINT_ALL, "SDL_GL_CreateContext 
succeeded.\n");
+
+   renderer = (const char 
*)qglGetString(GL_RENDERER);
+   if (renderer && (strstr(renderer, "Software 
Renderer") || strstr(renderer, "Software Rasterizer")))
+   {
+   ri.Printf(PRINT_ALL, "GL_RENDERER is 
%s, rejecting context\n", renderer);
+
+   SDL_GL_DeleteContext(SDL_glContext);
+   SDL_glContext = NULL;
+
+   
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profileMask);
+   
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorVersion);
+   
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorVersion);
+   }
}
}
else
diff --git a/SP/code/sdl/sdl_glimp.c b/SP/code/sdl/sdl_glimp.c
index c3d91ef..c8a5ebe 100644
--- a/SP/code/sdl/sdl_glimp.c
+++ b/SP/code/sdl/sdl_glimp.c
@@ -550,7 +550,22 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, 
qboolean noborder, qbool
}
else
{
-   ri.Printf(PRINT_ALL, "SDL_GL_CreateContext 
succeeded, but: %s\n", SDL_GetError());
+   const char *renderer;
+
+   ri.Printf(PRINT_ALL, "SDL_GL_CreateContext 
succeeded.\n");
+
+   renderer = (const char 
*)qglGetString(GL_RENDERER);
+   if (renderer && (strstr(renderer, "Software 
Renderer") || strstr(renderer, "Software Rasterizer")))
+   {
+   ri.Printf(PRINT_ALL, "GL_RENDERER is 
%s, rejecting context\n", renderer);
+
+   SDL_GL_DeleteContext(SDL_glContext);
+   SDL_glContext = NULL;
+
+   
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profileMask);
+   
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorVersion);
+   
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorVersion);
+   }
}
}
else

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 72/89: All: Echo server say/tell messages to console

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit bd1915a37c4ef156f1d12a4902c08c0a92ed34d2
Author: MAN-AT-ARMS 
Date:   Fri Jul 28 17:41:39 2017 -0400

All: Echo server say/tell messages to console
---
 MP/code/server/sv_ccmds.c | 2 ++
 SP/code/server/sv_ccmds.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/MP/code/server/sv_ccmds.c b/MP/code/server/sv_ccmds.c
index 3099385..1e0b131 100644
--- a/MP/code/server/sv_ccmds.c
+++ b/MP/code/server/sv_ccmds.c
@@ -1447,6 +1447,7 @@ static void SV_ConSay_f( void ) {
 
strcat( text, p );
 
+   Com_Printf("%s\n", text);
SV_SendServerCommand( NULL, "chat \"%s\"", text );
 }
 
@@ -1486,6 +1487,7 @@ static void SV_ConTell_f(void) {
 
strcat(text, p);
 
+   Com_Printf("%s\n", text);
SV_SendServerCommand(cl, "chat \"%s\"", text);
 }
 
diff --git a/SP/code/server/sv_ccmds.c b/SP/code/server/sv_ccmds.c
index 60c2174..8f4c4d5 100644
--- a/SP/code/server/sv_ccmds.c
+++ b/SP/code/server/sv_ccmds.c
@@ -1464,6 +1464,7 @@ static void SV_ConSay_f( void ) {
 
strcat( text, p );
 
+   Com_Printf("%s\n", text);
SV_SendServerCommand( NULL, "chat \"%s\"", text );
 }
 
@@ -1503,6 +1504,7 @@ static void SV_ConTell_f(void) {
 
strcat(text, p);
 
+   Com_Printf("%s\n", text);
SV_SendServerCommand(cl, "chat \"%s\"", text);
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 58/89: All: Fix set-but-not-used variable warnings in vm_armv7l.c

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit f7c20822d45080036b88bda9b1f5d7a36e1d2705
Author: MAN-AT-ARMS 
Date:   Thu Jul 20 11:24:59 2017 -0400

All: Fix set-but-not-used variable warnings in vm_armv7l.c
---
 MP/code/qcommon/vm_armv7l.c | 28 
 SP/code/qcommon/vm_armv7l.c | 28 
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/MP/code/qcommon/vm_armv7l.c b/MP/code/qcommon/vm_armv7l.c
index dd63f5c..8f2bd8c 100644
--- a/MP/code/qcommon/vm_armv7l.c
+++ b/MP/code/qcommon/vm_armv7l.c
@@ -599,11 +599,11 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
unsigned char *code;
int i_count, pc = 0;
int pass;
-   int codeoffsets[1024];
+   int codeoffsets[2]; // was 1024 but it's only used for OFF_CODE and 
OFF_IMMEDIATES
 
 #define j_rel(x) (pass?_j_rel(x, pc):0xBAD)
 #define OFFSET(i) (pass?(j_rel(codeoffsets[i]-vm->codeLength)):(0xF00F))
-#define new_offset() (offsidx++)
+//#define new_offset() (offsidx++)
 #define get_offset(i) (codeoffsets[i])
 #define save_offset(i) (codeoffsets[i] = vm->codeLength)
 #define OFF_CODE 0
@@ -616,10 +616,12 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
 
for (pass = 0; pass < 2; ++pass) {
 
-   int offsidx = 0;
+// int offsidx = 0;
 
+#ifdef CONST_OPTIMIZE
// const optimization
unsigned got_const = 0, const_value = 0;
+#endif
 
if(pass)
{
@@ -656,7 +658,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
emit(BKPT(0));
 
save_offset(OFF_CODE);
-   offsidx = OFF_IMMEDIATES+1;
+// offsidx = OFF_IMMEDIATES+1;
 
code = (unsigned char *) header + header->codeOffset;
pc = 0;
@@ -744,9 +746,14 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
emit_MOVR0i(i_count);
emit(STRa(R0, rDATABASE, rPSTACK));  // 
dataBase[pstack] = r0
 #endif
-   if (got_const) {
+#ifdef CONST_OPTIMIZE
+   if (got_const)
+   {
NOTIMPL(op);
-   } else {
+   }
+   else
+#endif
+   {
static int bytes_to_skip = -1;
static unsigned start_block = -1;
MAYBE_EMIT_CONST();
@@ -803,9 +810,14 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
break;
 
case OP_JUMP:
-   if(got_const) {
+#ifdef CONST_OPTIMIZE
+   if (got_const)
+   {
NOTIMPL(op);
-   } else {
+   }
+   else
+#endif
+   {
emit(LDRTxi(R0, rOPSTACK, 4));  // r0 = 
*opstack; rOPSTACK -= 4
CHECK_JUMP;
emit_MOVRxi(R1, 
(unsigned)vm->instructionPointers);
diff --git a/SP/code/qcommon/vm_armv7l.c b/SP/code/qcommon/vm_armv7l.c
index dd63f5c..8f2bd8c 100644
--- a/SP/code/qcommon/vm_armv7l.c
+++ b/SP/code/qcommon/vm_armv7l.c
@@ -599,11 +599,11 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
unsigned char *code;
int i_count, pc = 0;
int pass;
-   int codeoffsets[1024];
+   int codeoffsets[2]; // was 1024 but it's only used for OFF_CODE and 
OFF_IMMEDIATES
 
 #define j_rel(x) (pass?_j_rel(x, pc):0xBAD)
 #define OFFSET(i) (pass?(j_rel(codeoffsets[i]-vm->codeLength)):(0xF00F))
-#define new_offset() (offsidx++)
+//#define new_offset() (offsidx++)
 #define get_offset(i) (codeoffsets[i])
 #define save_offset(i) (codeoffsets[i] = vm->codeLength)
 #define OFF_CODE 0
@@ -616,10 +616,12 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
 
for (pass = 0; pass < 2; ++pass) {
 
-   int offsidx = 0;
+// int offsidx = 0;
 
+#ifdef CONST_OPTIMIZE
// const optimization
unsigned got_const = 0, const_value = 0;
+#endif
 
if(pass)
{
@@ -656,7 +658,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
emit(BKPT(0));
 
save_offset(OFF_CODE);
-   offsidx = OFF_IMMEDIATES+1;
+// offsidx = OFF_IMMEDIATES+1;
 
code = (unsigned char *) header + header->codeOffset;
pc = 0;
@@ -744,9 +746,14 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
emit_MOVR0i(i_count);
emit(STRa(R0, rDATABASE, rPSTACK));  // 
dataBase[pstack] = r0
 #endif
-   if (got_const) {
+#ifdef 

[iortcw] 64/89: All: Fix score bonus for defending the flag carrier in CTF

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 80c558c591f91d8f57683f86eb345f2eea6f0521
Author: MAN-AT-ARMS 
Date:   Fri Jul 21 06:56:54 2017 -0400

All: Fix score bonus for defending the flag carrier in CTF

Unused: Merge from 
https://github.com/ioquake/ioq3/commit/c8db6c55e5f2dbf9ee908e6d09bb706281bf5c57
---
 MP/code/game/g_team.c | 2 +-
 SP/code/game/g_team.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/game/g_team.c b/MP/code/game/g_team.c
index 8ffbafc..ee29f08 100644
--- a/MP/code/game/g_team.c
+++ b/MP/code/game/g_team.c
@@ -275,7 +275,7 @@ void Team_FragBonuses( gentity_t *targ, gentity_t 
*inflictor, gentity_t *attacke
if ( g_gametype.integer < GT_WOLF ) { // JPW NERVE no attacker 
protect in wolf MP
if ( carrier && carrier != attacker ) {
VectorSubtract( targ->s.origin, 
carrier->s.origin, v1 );
-   VectorSubtract( attacker->s.origin, 
carrier->s.origin, v1 );
+   VectorSubtract( attacker->s.origin, 
carrier->s.origin, v2 );
 
if ( VectorLength( v1 ) < 
CTF_ATTACKER_PROTECT_RADIUS ||
 VectorLength( v2 ) < 
CTF_ATTACKER_PROTECT_RADIUS ||
diff --git a/SP/code/game/g_team.c b/SP/code/game/g_team.c
index 064fd26..6724f7b 100644
--- a/SP/code/game/g_team.c
+++ b/SP/code/game/g_team.c
@@ -247,7 +247,7 @@ void Team_FragBonuses( gentity_t *targ, gentity_t 
*inflictor, gentity_t *attacke
 
if ( carrier && carrier != attacker ) {
VectorSubtract( targ->s.origin, carrier->s.origin, v1 );
-   VectorSubtract( attacker->s.origin, carrier->s.origin, v1 );
+   VectorSubtract( attacker->s.origin, carrier->s.origin, v2 );
 
if ( VectorLength( v1 ) < CTF_ATTACKER_PROTECT_RADIUS ||
 VectorLength( v2 ) < CTF_ATTACKER_PROTECT_RADIUS ||

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 69/89: All: Update OpenAL Soft to 1.18.0

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 99c49224877e3a4ad69b7f4a5e8d4eb2914d3532
Author: MAN-AT-ARMS 
Date:   Sat Jul 22 11:15:37 2017 -0400

All: Update OpenAL Soft to 1.18.0
---
 MP/code/AL/alext.h  |  28 
 MP/code/libs/macosx/libopenal.dylib | Bin 1625328 -> 2056112 bytes
 MP/code/libs/win32/OpenAL32.dll | Bin 845045 -> 1316366 bytes
 MP/code/libs/win64/OpenAL64.dll | Bin 980543 -> 1515026 bytes
 SP/code/AL/alext.h  |  28 
 SP/code/libs/macosx/libopenal.dylib | Bin 1625328 -> 2056112 bytes
 SP/code/libs/win32/OpenAL32.dll | Bin 845045 -> 1316366 bytes
 SP/code/libs/win64/OpenAL64.dll | Bin 980543 -> 1515026 bytes
 8 files changed, 56 insertions(+)

diff --git a/MP/code/AL/alext.h b/MP/code/AL/alext.h
index 6af581a..4b9a155 100644
--- a/MP/code/AL/alext.h
+++ b/MP/code/AL/alext.h
@@ -431,6 +431,34 @@ ALC_API ALCboolean ALC_APIENTRY 
alcResetDeviceSOFT(ALCdevice *device, const ALCi
 #endif
 #endif
 
+#ifndef AL_SOFT_gain_clamp_ex
+#define AL_SOFT_gain_clamp_ex 1
+#define AL_GAIN_LIMIT_SOFT   0x200E
+#endif
+
+#ifndef AL_SOFT_source_resampler
+#define AL_SOFT_source_resampler
+#define AL_NUM_RESAMPLERS_SOFT   0x1210
+#define AL_DEFAULT_RESAMPLER_SOFT0x1211
+#define AL_SOURCE_RESAMPLER_SOFT 0x1212
+#define AL_RESAMPLER_NAME_SOFT   0x1213
+typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei 
index);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
+#endif
+#endif
+
+#ifndef AL_SOFT_source_spatialize
+#define AL_SOFT_source_spatialize
+#define AL_SOURCE_SPATIALIZE_SOFT0x1214
+#define AL_AUTO_SOFT 0x0002
+#endif
+
+#ifndef ALC_SOFT_output_limiter
+#define ALC_SOFT_output_limiter
+#define ALC_OUTPUT_LIMITER_SOFT  0x199A
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/MP/code/libs/macosx/libopenal.dylib 
b/MP/code/libs/macosx/libopenal.dylib
index c1bb349..e147227 100755
Binary files a/MP/code/libs/macosx/libopenal.dylib and 
b/MP/code/libs/macosx/libopenal.dylib differ
diff --git a/MP/code/libs/win32/OpenAL32.dll b/MP/code/libs/win32/OpenAL32.dll
index 1e3bddd..da406b9 100755
Binary files a/MP/code/libs/win32/OpenAL32.dll and 
b/MP/code/libs/win32/OpenAL32.dll differ
diff --git a/MP/code/libs/win64/OpenAL64.dll b/MP/code/libs/win64/OpenAL64.dll
index e24538a..2886b09 100755
Binary files a/MP/code/libs/win64/OpenAL64.dll and 
b/MP/code/libs/win64/OpenAL64.dll differ
diff --git a/SP/code/AL/alext.h b/SP/code/AL/alext.h
index 6af581a..4b9a155 100644
--- a/SP/code/AL/alext.h
+++ b/SP/code/AL/alext.h
@@ -431,6 +431,34 @@ ALC_API ALCboolean ALC_APIENTRY 
alcResetDeviceSOFT(ALCdevice *device, const ALCi
 #endif
 #endif
 
+#ifndef AL_SOFT_gain_clamp_ex
+#define AL_SOFT_gain_clamp_ex 1
+#define AL_GAIN_LIMIT_SOFT   0x200E
+#endif
+
+#ifndef AL_SOFT_source_resampler
+#define AL_SOFT_source_resampler
+#define AL_NUM_RESAMPLERS_SOFT   0x1210
+#define AL_DEFAULT_RESAMPLER_SOFT0x1211
+#define AL_SOURCE_RESAMPLER_SOFT 0x1212
+#define AL_RESAMPLER_NAME_SOFT   0x1213
+typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei 
index);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
+#endif
+#endif
+
+#ifndef AL_SOFT_source_spatialize
+#define AL_SOFT_source_spatialize
+#define AL_SOURCE_SPATIALIZE_SOFT0x1214
+#define AL_AUTO_SOFT 0x0002
+#endif
+
+#ifndef ALC_SOFT_output_limiter
+#define ALC_SOFT_output_limiter
+#define ALC_OUTPUT_LIMITER_SOFT  0x199A
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/SP/code/libs/macosx/libopenal.dylib 
b/SP/code/libs/macosx/libopenal.dylib
index c1bb349..e147227 100755
Binary files a/SP/code/libs/macosx/libopenal.dylib and 
b/SP/code/libs/macosx/libopenal.dylib differ
diff --git a/SP/code/libs/win32/OpenAL32.dll b/SP/code/libs/win32/OpenAL32.dll
index 1e3bddd..da406b9 100755
Binary files a/SP/code/libs/win32/OpenAL32.dll and 
b/SP/code/libs/win32/OpenAL32.dll differ
diff --git a/SP/code/libs/win64/OpenAL64.dll b/SP/code/libs/win64/OpenAL64.dll
index e24538a..2886b09 100755
Binary files a/SP/code/libs/win64/OpenAL64.dll and 
b/SP/code/libs/win64/OpenAL64.dll differ

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 65/89: All: Move CON_Init ahead of Com_Init to avoid Windows dedicated server crash

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit eb2c0050e7331ba0d447c8a4b081bffc1bd11207
Author: MAN-AT-ARMS 
Date:   Fri Jul 21 07:15:33 2017 -0400

All: Move CON_Init ahead of Com_Init to avoid Windows dedicated server crash
---
 MP/code/sys/sys_main.c | 3 +--
 SP/code/sys/sys_main.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/MP/code/sys/sys_main.c b/MP/code/sys/sys_main.c
index 054aaa0..efbe2d7 100644
--- a/MP/code/sys/sys_main.c
+++ b/MP/code/sys/sys_main.c
@@ -741,11 +741,10 @@ int main( int argc, char **argv )
Q_strcat( commandLine, sizeof( commandLine ), " " );
}
 
+   CON_Init( );
Com_Init( commandLine );
NET_Init( );
 
-   CON_Init( );
-
signal( SIGILL, Sys_SigHandler );
signal( SIGFPE, Sys_SigHandler );
signal( SIGSEGV, Sys_SigHandler );
diff --git a/SP/code/sys/sys_main.c b/SP/code/sys/sys_main.c
index 93bf1ad..0044e8c 100644
--- a/SP/code/sys/sys_main.c
+++ b/SP/code/sys/sys_main.c
@@ -741,11 +741,10 @@ int main( int argc, char **argv )
Q_strcat( commandLine, sizeof( commandLine ), " " );
}
 
+   CON_Init( );
Com_Init( commandLine );
NET_Init( );
 
-   CON_Init( );
-
signal( SIGILL, Sys_SigHandler );
signal( SIGFPE, Sys_SigHandler );
signal( SIGSEGV, Sys_SigHandler );

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 66/89: All: Make 'globalservers 0' fetch all masters

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit a8e41b471f65c0e930a1fabbdbd6be426140d78b
Author: MAN-AT-ARMS 
Date:   Fri Jul 21 07:45:15 2017 -0400

All: Make 'globalservers 0' fetch all masters
---
 MP/code/client/cl_main.c | 36 +++-
 MP/code/ui/ui_main.c | 38 --
 SP/code/client/cl_main.c | 36 +++-
 SP/code/ui/ui_main.c | 38 +-
 4 files changed, 103 insertions(+), 45 deletions(-)

diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
index 605c81d..ea3f6b6 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
@@ -2647,7 +2647,7 @@ void CL_ServersResponsePacket( const netadr_t* from, 
msg_t *msg, qboolean extend
byte*   buffptr;
byte*   buffend;
 
-   Com_Printf( "CL_ServersResponsePacket\n" );
+   Com_Printf( "CL_ServersResponsePacket from %s\n", NET_AdrToStringwPort( 
*from ) );
 
if ( cls.numglobalservers == -1 ) {
// state to detect lack of servers or lack of response
@@ -4767,6 +4767,9 @@ void CL_LocalServers_f( void ) {
 /*
 ==
 CL_GlobalServers_f
+
+ioquake3 2008; added support for requesting five separate master servers using 
0-4.
+ioquake3 2017; made master 0 fetch all master servers and 1-5 request a single 
master server.
 ==
 */
 void CL_GlobalServers_f( void ) {
@@ -4774,13 +4777,36 @@ void CL_GlobalServers_f( void ) {
int count, i, masterNum;
charcommand[1024], *masteraddress;
 
-   if ((count = Cmd_Argc()) < 3 || (masterNum = atoi(Cmd_Argv(1))) < 0 || 
masterNum > MAX_MASTER_SERVERS - 1)
+   if ((count = Cmd_Argc()) < 3 || (masterNum = atoi(Cmd_Argv(1))) < 0 || 
masterNum > MAX_MASTER_SERVERS)
{
-   Com_Printf("usage: globalservers   
[keywords]\n", MAX_MASTER_SERVERS - 1);
+   Com_Printf("usage: globalservers   
[keywords]\n", MAX_MASTER_SERVERS);
+   return;
+   }
+
+   // request from all master servers
+   if ( masterNum == 0 ) {
+   int numAddress = 0;
+
+   for ( i = 1; i <= MAX_MASTER_SERVERS; i++ ) {
+   sprintf(command, "sv_master%d", i);
+   masteraddress = Cvar_VariableString(command);
+
+   if(!*masteraddress)
+   continue;
+
+   numAddress++;
+
+   Com_sprintf(command, sizeof(command), "globalservers %d 
%s %s\n", i, Cmd_Argv(2), Cmd_ArgsFrom(3));
+   Cbuf_AddText(command);
+   }
+
+   if ( !numAddress ) {
+   Com_Printf( "CL_GlobalServers_f: Error: No master 
server addresses.\n");
+   }
return;
}
 
-   sprintf(command, "sv_master%d", masterNum + 1);
+   sprintf(command, "sv_master%d", masterNum);
masteraddress = Cvar_VariableString(command);

if(!*masteraddress)
@@ -4802,7 +4828,7 @@ void CL_GlobalServers_f( void ) {
else if(i == 2)
to.port = BigShort(PORT_MASTER);
 
-   Com_Printf("Requesting servers from master %s...\n", masteraddress);
+   Com_Printf("Requesting servers from %s (%s)...\n", masteraddress, 
NET_AdrToStringwPort(to));
 
cls.numglobalservers = -1;
cls.pingUpdateSource = AS_GLOBAL;
diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c
index c4dff6f..6d30ac7 100644
--- a/MP/code/ui/ui_main.c
+++ b/MP/code/ui/ui_main.c
@@ -71,21 +71,23 @@ static const char *skillLevels[] = {
 static const int numSkillLevels = ARRAY_LEN( skillLevels );
  
  
-#define UIAS_LOCAL 0
-#define UIAS_GLOBAL1   1
-#define UIAS_GLOBAL2   2
-#define UIAS_GLOBAL3   3
-#define UIAS_GLOBAL4   4
-#define UIAS_GLOBAL5   5
-#define UIAS_FAVORITES 6
+#define UIAS_LOCAL 0
+#define UIAS_GLOBAL0   1
+#define UIAS_GLOBAL1   2
+#define UIAS_GLOBAL2   3
+#define UIAS_GLOBAL3   4
+#define UIAS_GLOBAL4   5
+#define UIAS_GLOBAL5   6
+#define UIAS_FAVORITES 7
 
 static const char *netSources[] = {
"Local",
-   "Internet1",
-   "Internet2",
-   "Internet3",
-   "Internet4",
-   "Internet5",
+   "Internet",
+   "Master1",
+   "Master2",
+   "Master3",
+   "Master4",
+   "Master5",
"Favorites"
 };
 static const int numNetSources = ARRAY_LEN( netSources );
@@ -1466,6 +1468,7 @@ int UI_SourceForLAN(void) {
default:
case UIAS_LOCAL:

[iortcw] 57/89: All: Improve warning for too many skin surfaces

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit b784296dabaf06598ccc545694e8c836f6507795
Author: MAN-AT-ARMS 
Date:   Thu Jul 20 11:11:00 2017 -0400

All: Improve warning for too many skin surfaces
---
 MP/code/rend2/tr_animation.c|  1 -
 MP/code/rend2/tr_image.c| 20 
 MP/code/renderer/tr_animation.c |  1 -
 MP/code/renderer/tr_cmesh.c |  1 -
 MP/code/renderer/tr_image.c | 20 
 SP/code/rend2/tr_image.c| 20 
 SP/code/renderer/tr_image.c | 20 
 7 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/MP/code/rend2/tr_animation.c b/MP/code/rend2/tr_animation.c
index 7cfd936..170b843 100644
--- a/MP/code/rend2/tr_animation.c
+++ b/MP/code/rend2/tr_animation.c
@@ -365,7 +365,6 @@ void R_AddAnimSurfaces( trRefEntity_t *ent ) {
if ( shader == tr.defaultShader ) {// blink 
reference in skin was not found
for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
// the names have both been lowercased
-
if ( !strcmp( skin->surfaces[j].name, 
surface->name ) ) {
shader = 
skin->surfaces[j].shader;
break;
diff --git a/MP/code/rend2/tr_image.c b/MP/code/rend2/tr_image.c
index 834dc2a..272b014 100644
--- a/MP/code/rend2/tr_image.c
+++ b/MP/code/rend2/tr_image.c
@@ -3235,6 +3235,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
char*text_p;
char*token;
char surfName[MAX_QPATH];
+   int totalSurfaces;
 
if ( !name || !name[0] ) {
ri.Printf( PRINT_DEVELOPER, "Empty name passed to 
RE_RegisterSkin\n" );
@@ -3300,6 +3301,7 @@ qhandle_t RE_RegisterSkin( const char *name ) {
 
 //(SA) end
 
+   totalSurfaces = 0;
text_p = text.c;
while ( text_p && *text_p ) {
// get surface name
@@ -3351,22 +3353,24 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// parse the shader name
token = CommaParse( _p );
 
-   if ( skin->numSurfaces >= MAX_SKIN_SURFACES ) {
-   ri.Printf( PRINT_WARNING, "WARNING: Ignoring surfaces 
in '%s', the max is %d surfaces!\n", name, MAX_SKIN_SURFACES );
-   break;
+   if ( skin->numSurfaces < MAX_SKIN_SURFACES ) {
+   surf = [skin->numSurfaces];
+   Q_strncpyz( surf->name, surfName, sizeof( surf->name ) 
);
+   surf->shader = R_FindShader( token, LIGHTMAP_NONE, 
qtrue );
+   skin->numSurfaces++;
}
 
-   surf = [skin->numSurfaces];
-   Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
-   surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue );
-   skin->numSurfaces++;
+   totalSurfaces++;
}
 
ri.FS_FreeFile( text.v );
 
+   if ( totalSurfaces > MAX_SKIN_SURFACES ) {
+   ri.Printf( PRINT_WARNING, "WARNING: Ignoring excess surfaces 
(found %d, max is %d) in skin '%s'!\n",
+   totalSurfaces, MAX_SKIN_SURFACES, name 
);
+   }
 
// never let a skin have 0 shaders
-
//(SA)  allow this for the (current) special case of the 
loper's upper body
//  (it's upper body has no surfaces, only tags)
if ( skin->numSurfaces == 0 ) {
diff --git a/MP/code/renderer/tr_animation.c b/MP/code/renderer/tr_animation.c
index 2dc73b8..2aa751a 100644
--- a/MP/code/renderer/tr_animation.c
+++ b/MP/code/renderer/tr_animation.c
@@ -363,7 +363,6 @@ void R_AddAnimSurfaces( trRefEntity_t *ent ) {
if ( shader == tr.defaultShader ) {// blink 
reference in skin was not found
for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
// the names have both been lowercased
-
if ( !strcmp( skin->surfaces[j].name, 
surface->name ) ) {
shader = 
skin->surfaces[j].shader;
break;
diff --git a/MP/code/renderer/tr_cmesh.c b/MP/code/renderer/tr_cmesh.c
index 365e461..de5d24b 100644
--- a/MP/code/renderer/tr_cmesh.c
+++ b/MP/code/renderer/tr_cmesh.c
@@ -386,7 +386,6 @@ void R_AddMDCSurfaces( trRefEntity_t *ent ) {
if ( shader == tr.defaultShader ) {// blink 
reference in skin was not found
for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
// the names have both been 

[iortcw] 59/89: All: Rend2: Use an OpenGL 3.2 core context if available

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit d75aec11805b8b46006f76c05633683eda722308
Author: MAN-AT-ARMS 
Date:   Thu Jul 20 14:58:23 2017 -0400

All: Rend2: Use an OpenGL 3.2 core context if available
---
 MP/code/rend2/glsl/dlight_fp.glsl |  22 +-
 MP/code/rend2/glsl/generic_fp.glsl|  23 +-
 MP/code/rend2/glsl/lightall_fp.glsl   |  21 +-
 MP/code/rend2/glsl/shadowmask_fp.glsl |  28 
 MP/code/rend2/qgl.h   | 127 ++
 MP/code/rend2/tr_backend.c|  37 --
 MP/code/rend2/tr_dsa.c|  46 ++--
 MP/code/rend2/tr_extensions.c |  99 --
 MP/code/rend2/tr_fbo.c| 124 +++--
 MP/code/rend2/tr_glsl.c   |  13 +++-
 MP/code/rend2/tr_image.c  |  10 +--
 MP/code/rend2/tr_init.c   |  22 --
 MP/code/rend2/tr_local.h  |   4 +-
 MP/code/rend2/tr_shade.c  |  26 +++
 MP/code/rend2/tr_shader.c |   4 +-
 MP/code/rend2/tr_sky.c|   6 ++
 MP/code/rend2/tr_surface.c|   2 +
 MP/code/renderer/qgl.h| 127 ++
 MP/code/renderer/tr_init.c|   2 +-
 MP/code/renderer/tr_local.h   |   2 +-
 MP/code/sdl/sdl_glimp.c   |  51 +++---
 SP/code/rend2/glsl/dlight_fp.glsl |  22 +-
 SP/code/rend2/glsl/generic_fp.glsl|  23 +-
 SP/code/rend2/glsl/lightall_fp.glsl   |  21 +-
 SP/code/rend2/glsl/shadowmask_fp.glsl |  28 
 SP/code/rend2/qgl.h   | 127 ++
 SP/code/rend2/tr_backend.c|  37 --
 SP/code/rend2/tr_dsa.c|  46 ++--
 SP/code/rend2/tr_extensions.c |  99 --
 SP/code/rend2/tr_fbo.c| 124 +++--
 SP/code/rend2/tr_glsl.c   |  13 +++-
 SP/code/rend2/tr_image.c  |  10 +--
 SP/code/rend2/tr_init.c   |  22 --
 SP/code/rend2/tr_local.h  |   4 +-
 SP/code/rend2/tr_shade.c  |  26 +++
 SP/code/rend2/tr_shader.c |   4 +-
 SP/code/rend2/tr_sky.c|   4 ++
 SP/code/rend2/tr_surface.c|   2 +
 SP/code/renderer/qgl.h| 127 ++
 SP/code/renderer/tr_init.c|   2 +-
 SP/code/renderer/tr_local.h   |   2 +-
 SP/code/sdl/sdl_glimp.c   |  51 +++---
 42 files changed, 680 insertions(+), 910 deletions(-)

diff --git a/MP/code/rend2/glsl/dlight_fp.glsl 
b/MP/code/rend2/glsl/dlight_fp.glsl
index 8ffca5b..41be049 100644
--- a/MP/code/rend2/glsl/dlight_fp.glsl
+++ b/MP/code/rend2/glsl/dlight_fp.glsl
@@ -1,5 +1,7 @@
 uniform sampler2D u_DiffuseMap;
 
+uniform int   u_AlphaTest;
+
 varying vec2  var_Tex1;
 varying vec4  var_Color;
 
@@ -8,5 +10,23 @@ void main()
 {
vec4 color = texture2D(u_DiffuseMap, var_Tex1);
 
-   gl_FragColor = color * var_Color;
+   float alpha = color.a * var_Color.a;
+   if (u_AlphaTest == 1)
+   {
+   if (alpha == 0.0)
+   discard;
+   }
+   else if (u_AlphaTest == 2)
+   {
+   if (alpha >= 0.5)
+   discard;
+   }
+   else if (u_AlphaTest == 3)
+   {
+   if (alpha < 0.5)
+   discard;
+   }
+   
+   gl_FragColor.rgb = color.rgb * var_Color.rgb;
+   gl_FragColor.a = alpha;
 }
diff --git a/MP/code/rend2/glsl/generic_fp.glsl 
b/MP/code/rend2/glsl/generic_fp.glsl
index 50db078..c0a4940 100644
--- a/MP/code/rend2/glsl/generic_fp.glsl
+++ b/MP/code/rend2/glsl/generic_fp.glsl
@@ -1,5 +1,7 @@
 uniform sampler2D u_DiffuseMap;
 
+uniform int   u_AlphaTest;
+
 varying vec2  var_DiffuseTex;
 
 varying vec4  var_Color;
@@ -8,5 +10,24 @@ varying vec4  var_Color;
 void main()
 {
vec4 color  = texture2D(u_DiffuseMap, var_DiffuseTex);
-   gl_FragColor = color * var_Color;
+
+   float alpha = color.a * var_Color.a;
+   if (u_AlphaTest == 1)
+   {
+   if (alpha == 0.0)
+   discard;
+   }
+   else if (u_AlphaTest == 2)
+   {
+   if (alpha >= 0.5)
+   discard;
+   }
+   else if (u_AlphaTest == 3)
+   {
+   if (alpha < 0.5)
+   discard;
+   }
+   
+   gl_FragColor.rgb = color.rgb * var_Color.rgb;
+   gl_FragColor.a = alpha;
 }
diff --git a/MP/code/rend2/glsl/lightall_fp.glsl 
b/MP/code/rend2/glsl/lightall_fp.glsl
index 5cb8233..8e7c9b4 100644
--- a/MP/code/rend2/glsl/lightall_fp.glsl
+++ b/MP/code/rend2/glsl/lightall_fp.glsl
@@ -45,6 +45,8 @@ uniform vec4  u_CubeMapInfo;

[iortcw] 61/89: All: Rend2: Don't do MSAA resolve/shadow mask/SSAO on shadow views

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 0f54dc21ba77876cb122690b69da3899485439d0
Author: MAN-AT-ARMS 
Date:   Fri Jul 21 05:32:07 2017 -0400

All: Rend2: Don't do MSAA resolve/shadow mask/SSAO on shadow views
---
 MP/code/rend2/tr_backend.c | 310 -
 SP/code/rend2/tr_backend.c | 310 -
 2 files changed, 328 insertions(+), 292 deletions(-)

diff --git a/MP/code/rend2/tr_backend.c b/MP/code/rend2/tr_backend.c
index be9d348..10b2c7a 100644
--- a/MP/code/rend2/tr_backend.c
+++ b/MP/code/rend2/tr_backend.c
@@ -1148,8 +1148,9 @@ RB_DrawSurfs
 
 =
 */
-const void  *RB_DrawSurfs( const void *data ) {
-   const drawSurfsCommand_t*cmd;
+const void *RB_DrawSurfs( const void *data ) {
+   const drawSurfsCommand_t*cmd;
+   qboolean isShadowView;
 
// finish any 2D drawing if needed
if ( tess.numIndexes ) {
@@ -1161,6 +1162,8 @@ const void  *RB_DrawSurfs( const void *data ) {
backEnd.refdef = cmd->refdef;
backEnd.viewParms = cmd->viewParms;
 
+   isShadowView = !!(backEnd.viewParms.flags & VPF_DEPTHSHADOW);
+
// clear the z buffer, set the modelview, etc
RB_BeginDrawingView ();
 
@@ -1169,7 +1172,7 @@ const void  *RB_DrawSurfs( const void *data ) {
qglEnable(GL_DEPTH_CLAMP);
}
 
-   if (glRefConfig.framebufferObject && !(backEnd.refdef.rdflags & 
RDF_NOWORLDMODEL) && (r_depthPrepass->integer || (backEnd.viewParms.flags & 
VPF_DEPTHSHADOW)))
+   if (glRefConfig.framebufferObject && !(backEnd.refdef.rdflags & 
RDF_NOWORLDMODEL) && (r_depthPrepass->integer || isShadowView))
{
FBO_t *oldFbo = glState.currentFBO;
vec4_t viewInfo;
@@ -1182,206 +1185,208 @@ const void  *RB_DrawSurfs( const void *data ) {
qglColorMask(!backEnd.colorMask[0], !backEnd.colorMask[1], 
!backEnd.colorMask[2], !backEnd.colorMask[3]);
backEnd.depthFill = qfalse;
 
-   if (tr.msaaResolveFbo)
-   {
-   // If we're using multisampling, resolve the depth first
-   FBO_FastBlit(tr.renderFbo, NULL, tr.msaaResolveFbo, 
NULL, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
-   }
-   else if (tr.renderFbo == NULL && tr.renderDepthImage)
+   if (!isShadowView)
{
-   // If we're rendering directly to the screen, copy the 
depth to a texture
-   // This is incredibly slow on Intel Graphics, so just 
skip it on there
-   if (!glRefConfig.intelGraphics)
-   
qglCopyTextureSubImage2DEXT(tr.renderDepthImage->texnum, GL_TEXTURE_2D, 0, 0, 
0, 0, 0, glConfig.vidWidth, glConfig.vidHeight);
-   }
+   if (tr.msaaResolveFbo)
+   {
+   // If we're using multisampling, resolve the 
depth first
+   FBO_FastBlit(tr.renderFbo, NULL, 
tr.msaaResolveFbo, NULL, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+   }
+   else if (tr.renderFbo == NULL && tr.renderDepthImage)
+   {
+   // If we're rendering directly to the screen, 
copy the depth to a texture
+   // This is incredibly slow on Intel Graphics, 
so just skip it on there
+   if (!glRefConfig.intelGraphics)
+   
qglCopyTextureSubImage2DEXT(tr.renderDepthImage->texnum, GL_TEXTURE_2D, 0, 0, 
0, 0, 0, glConfig.vidWidth, glConfig.vidHeight);
+   }
 
-   if (tr.hdrDepthFbo)
-   {
-   // need the depth in a texture we can do GL_LINEAR 
sampling on, so copy it to an HDR image
-   vec4_t srcTexCoords;
+   if (tr.hdrDepthFbo)
+   {
+   // need the depth in a texture we can do 
GL_LINEAR sampling on, so copy it to an HDR image
+   vec4_t srcTexCoords;
 
-   VectorSet4(srcTexCoords, 0.0f, 0.0f, 1.0f, 1.0f);
+   VectorSet4(srcTexCoords, 0.0f, 0.0f, 1.0f, 
1.0f);
 
-   FBO_BlitFromTexture(tr.renderDepthImage, srcTexCoords, 
NULL, tr.hdrDepthFbo, NULL, NULL, NULL, 0);
-   }
+   FBO_BlitFromTexture(tr.renderDepthImage, 
srcTexCoords, NULL, tr.hdrDepthFbo, NULL, NULL, NULL, 0);
+   }
 
-   if (r_sunlightMode->integer && backEnd.viewParms.flags & 
VPF_USESUNLIGHT)
-   {
-   vec4_t quadVerts[4];
-   vec2_t texCoords[4];
-   

[iortcw] 62/89: All: Rend2: Revert sun (moon) size changed in last commit

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 36633d75082cc99b1d77a6aae98540ac732452cd
Author: MAN-AT-ARMS 
Date:   Fri Jul 21 05:35:15 2017 -0400

All: Rend2: Revert sun (moon) size changed in last commit
---
 MP/code/rend2/tr_backend.c | 2 +-
 SP/code/rend2/tr_backend.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_backend.c b/MP/code/rend2/tr_backend.c
index 10b2c7a..d0eb075 100644
--- a/MP/code/rend2/tr_backend.c
+++ b/MP/code/rend2/tr_backend.c
@@ -1405,7 +1405,7 @@ const void*RB_DrawSurfs( const void *data ) {
 
if (r_drawSun->integer)
{
-   RB_DrawSun(0.1, tr.sunShader);
+   RB_DrawSun(0.2, tr.sunShader);
}
 
if (glRefConfig.framebufferObject && r_drawSunRays->integer)
diff --git a/SP/code/rend2/tr_backend.c b/SP/code/rend2/tr_backend.c
index 804f0be..34be98d 100644
--- a/SP/code/rend2/tr_backend.c
+++ b/SP/code/rend2/tr_backend.c
@@ -1656,7 +1656,7 @@ const void*RB_DrawSurfs( const void *data ) {
 
if (r_drawSun->integer)
{
-   RB_DrawSun(0.1, tr.sunShader);
+   RB_DrawSun(0.2, tr.sunShader);
}
 
if (glRefConfig.framebufferObject && r_drawSunRays->integer)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 60/89: All: Rend2: Remove GLSL_ValidateProgram()

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 1ead606c1146c99ce653acee23dc51eb127a09b9
Author: MAN-AT-ARMS 
Date:   Thu Jul 20 16:31:33 2017 -0400

All: Rend2: Remove GLSL_ValidateProgram()
---
 MP/code/rend2/tr_glsl.c | 15 ---
 SP/code/rend2/tr_glsl.c | 15 ---
 2 files changed, 30 deletions(-)

diff --git a/MP/code/rend2/tr_glsl.c b/MP/code/rend2/tr_glsl.c
index 6455f77..836e3b5 100644
--- a/MP/code/rend2/tr_glsl.c
+++ b/MP/code/rend2/tr_glsl.c
@@ -493,20 +493,6 @@ static void GLSL_LinkProgram(GLuint program)
}
 }
 
-static void GLSL_ValidateProgram(GLuint program)
-{
-   GLint   validated;
-
-   qglValidateProgram(program);
-
-   qglGetProgramiv(program, GL_VALIDATE_STATUS, );
-   if(!validated)
-   {
-   GLSL_PrintLog(program, GLSL_PRINTLOG_PROGRAM_INFO, qfalse);
-   ri.Error(ERR_DROP, "shaders failed to validate");
-   }
-}
-
 static void GLSL_ShowProgramUniforms(GLuint program)
 {
int i, count, size;
@@ -701,7 +687,6 @@ void GLSL_InitUniforms(shaderProgram_t *program)
 
 void GLSL_FinishGPUShader(shaderProgram_t *program)
 {
-   GLSL_ValidateProgram(program->program);
GLSL_ShowProgramUniforms(program->program);
GL_CheckErrors();
 }
diff --git a/SP/code/rend2/tr_glsl.c b/SP/code/rend2/tr_glsl.c
index 6455f77..836e3b5 100644
--- a/SP/code/rend2/tr_glsl.c
+++ b/SP/code/rend2/tr_glsl.c
@@ -493,20 +493,6 @@ static void GLSL_LinkProgram(GLuint program)
}
 }
 
-static void GLSL_ValidateProgram(GLuint program)
-{
-   GLint   validated;
-
-   qglValidateProgram(program);
-
-   qglGetProgramiv(program, GL_VALIDATE_STATUS, );
-   if(!validated)
-   {
-   GLSL_PrintLog(program, GLSL_PRINTLOG_PROGRAM_INFO, qfalse);
-   ri.Error(ERR_DROP, "shaders failed to validate");
-   }
-}
-
 static void GLSL_ShowProgramUniforms(GLuint program)
 {
int i, count, size;
@@ -701,7 +687,6 @@ void GLSL_InitUniforms(shaderProgram_t *program)
 
 void GLSL_FinishGPUShader(shaderProgram_t *program)
 {
-   GLSL_ValidateProgram(program->program);
GLSL_ShowProgramUniforms(program->program);
GL_CheckErrors();
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 56/89: All: Allow more than 32 surfaces in skin files

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit f040cfb7f42ebb6a60f921f13f77c80c22187002
Author: MAN-AT-ARMS 
Date:   Thu Jul 20 10:53:36 2017 -0400

All: Allow more than 32 surfaces in skin files
---
 MP/code/rend2/tr_animation.c| 18 +++---
 MP/code/rend2/tr_image.c| 23 ++-
 MP/code/rend2/tr_local.h| 16 +++-
 MP/code/rend2/tr_mesh.c |  9 -
 MP/code/rend2/tr_model_iqm.c|  9 +++--
 MP/code/renderer/tr_animation.c | 18 +++---
 MP/code/renderer/tr_cmesh.c | 10 --
 MP/code/renderer/tr_image.c | 23 ++-
 MP/code/renderer/tr_local.h | 16 +++-
 MP/code/renderer/tr_mesh.c  | 12 
 MP/code/renderer/tr_model_iqm.c |  9 +++--
 SP/code/rend2/tr_animation.c| 14 +-
 SP/code/rend2/tr_image.c| 23 ++-
 SP/code/rend2/tr_local.h| 16 +++-
 SP/code/rend2/tr_mesh.c |  4 ++--
 SP/code/rend2/tr_model_iqm.c|  9 +++--
 SP/code/renderer/tr_animation.c | 14 +-
 SP/code/renderer/tr_cmesh.c | 25 +++--
 SP/code/renderer/tr_image.c | 23 ++-
 SP/code/renderer/tr_local.h | 16 +++-
 SP/code/renderer/tr_mesh.c  | 24 +++-
 SP/code/renderer/tr_model_iqm.c |  9 +++--
 22 files changed, 204 insertions(+), 136 deletions(-)

diff --git a/MP/code/rend2/tr_animation.c b/MP/code/rend2/tr_animation.c
index 80b7679..7cfd936 100644
--- a/MP/code/rend2/tr_animation.c
+++ b/MP/code/rend2/tr_animation.c
@@ -355,8 +355,8 @@ void R_AddAnimSurfaces( trRefEntity_t *ent ) {
if ( ent->e.renderfx & RF_BLINK ) {
const char *s = va( "%s_b", surface->name );   
// append '_b' for 'blink'
for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
-   if ( !strcmp( skin->surfaces[j]->name, 
s ) ) {
-   shader = 
skin->surfaces[j]->shader;
+   if ( !strcmp( skin->surfaces[j].name, s 
) ) {
+   shader = 
skin->surfaces[j].shader;
break;
}
}
@@ -366,8 +366,8 @@ void R_AddAnimSurfaces( trRefEntity_t *ent ) {
for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
// the names have both been lowercased
 
-   if ( !strcmp( skin->surfaces[j]->name, 
surface->name ) ) {
-   shader = 
skin->surfaces[j]->shader;
+   if ( !strcmp( skin->surfaces[j].name, 
surface->name ) ) {
+   shader = 
skin->surfaces[j].shader;
break;
}
}
@@ -1605,9 +1605,9 @@ void R_MDRAddAnimSurfaces( trRefEntity_t *ent ) {

for(j = 0; j < skin->numSurfaces; j++)
{
-   if (!strcmp(skin->surfaces[j]->name, 
surface->name))
+   if (!strcmp(skin->surfaces[j].name, 
surface->name))
{
-   shader = skin->surfaces[j]->shader;
+   shader = skin->surfaces[j].shader;
break;
}
}
@@ -1638,7 +1638,11 @@ void R_MDRAddAnimSurfaces( trRefEntity_t *ent ) {
R_AddDrawSurf( (void *)surface, 
tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
}
 
-   if (!personalModel)
+   // for testing polygon shadows (on /all/ models)
+   if ( r_shadows->integer == 4 )
+   R_AddDrawSurf( (void *)surface, 
tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
+
+   if ( !personalModel )
R_AddDrawSurf( (void *)surface, shader, fogNum, qfalse, 
qfalse, cubemapIndex );
 
surface = (mdrSurface_t *)( (byte *)surface + surface->ofsEnd );
diff --git a/MP/code/rend2/tr_image.c b/MP/code/rend2/tr_image.c
index dca835f..834dc2a 100644
--- a/MP/code/rend2/tr_image.c
+++ b/MP/code/rend2/tr_image.c
@@ -3223,6 +3223,7 @@ RE_RegisterSkin
 ===
 */
 qhandle_t RE_RegisterSkin( const char *name ) {
+   skinSurface_t parseSurfaces[MAX_SKIN_SURFACES];
qhandle_t hSkin;
skin_t  *skin;
skinSurface_t   *surf;
@@ -3279,8 

[iortcw] 50/89: All: Rend2: Draw sun shadows for first person IQM player models

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit b9cb236ca3416d2dba874449289af83e2a871386
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 15:07:26 2017 -0400

All: Rend2: Draw sun shadows for first person IQM player models
---
 MP/code/rend2/tr_model_iqm.c | 3 ++-
 SP/code/rend2/tr_model_iqm.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_model_iqm.c b/MP/code/rend2/tr_model_iqm.c
index 6c06b4b..5b528d0 100644
--- a/MP/code/rend2/tr_model_iqm.c
+++ b/MP/code/rend2/tr_model_iqm.c
@@ -849,7 +849,8 @@ void R_AddIQMSurfaces( trRefEntity_t *ent ) {
surface = data->surfaces;
 
// don't add third_person objects if not in a portal
-   personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && 
!tr.viewParms.isPortal;
+   personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && 
!(tr.viewParms.isPortal
+|| (tr.viewParms.flags & (VPF_SHADOWMAP | 
VPF_DEPTHSHADOW)));
 
if ( ent->e.renderfx & RF_WRAP_FRAMES ) {
ent->e.frame %= data->num_frames;
diff --git a/SP/code/rend2/tr_model_iqm.c b/SP/code/rend2/tr_model_iqm.c
index f4d0a23..deabf42 100644
--- a/SP/code/rend2/tr_model_iqm.c
+++ b/SP/code/rend2/tr_model_iqm.c
@@ -849,7 +849,8 @@ void R_AddIQMSurfaces( trRefEntity_t *ent ) {
surface = data->surfaces;
 
// don't add third_person objects if not in a portal
-   personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && 
!tr.viewParms.isPortal;
+   personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && 
!(tr.viewParms.isPortal
+|| (tr.viewParms.flags & (VPF_SHADOWMAP | 
VPF_DEPTHSHADOW)));
 
if ( ent->e.renderfx & RF_WRAP_FRAMES ) {
ent->e.frame %= data->num_frames;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 52/89: All: Rend2: Remove two unused cvars and update readme

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 909476302b478dde592a7701e4789596a8349cfb
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 16:17:57 2017 -0400

All: Rend2: Remove two unused cvars and update readme

Relocate common readme's
---
 MP/HOWTO-Build.txt => HOWTO-Build.txt   |   0
 MP/code/rend2/tr_init.c |   5 -
 MP/code/rend2/tr_local.h|   3 -
 MP/rend2-readme.md  |  21 +--
 MP/README_RASPBERRYPI => README_RASPBERRYPI |   0
 SP/HOWTO-Build.txt  | 106 ---
 SP/README_RASPBERRYPI   |  39 --
 SP/code/rend2/tr_init.c |   5 -
 SP/code/rend2/tr_local.h|   3 -
 SP/voip-readme.txt  | 202 
 SP/rend2-readme.md => rend2-readme.md   |  37 ++---
 MP/voip-readme.txt => voip-readme.txt   |   0
 12 files changed, 12 insertions(+), 409 deletions(-)

diff --git a/MP/HOWTO-Build.txt b/HOWTO-Build.txt
similarity index 100%
rename from MP/HOWTO-Build.txt
rename to HOWTO-Build.txt
diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
index 245fe70..0d7da2d 100644
--- a/MP/code/rend2/tr_init.c
+++ b/MP/code/rend2/tr_init.c
@@ -124,9 +124,6 @@ cvar_t  *r_arb_seamless_cube_map;
 cvar_t  *r_arb_vertex_array_object;
 cvar_t  *r_ext_direct_state_access;
 
-cvar_t  *r_mergeMultidraws;
-cvar_t  *r_mergeLeafSurfaces;
-
 cvar_t  *r_cameraExposure;
 
 cvar_t  *r_externalGLSL;
@@ -1445,8 +1442,6 @@ void R_Register( void ) {
r_directedScale = ri.Cvar_Get( "r_directedScale", "1", CVAR_CHEAT );
 
r_anaglyphMode = ri.Cvar_Get("r_anaglyphMode", "0", CVAR_ARCHIVE);
-   r_mergeMultidraws = ri.Cvar_Get("r_mergeMultidraws", "1", CVAR_ARCHIVE);
-   r_mergeLeafSurfaces = ri.Cvar_Get("r_mergeLeafSurfaces", "1", 
CVAR_ARCHIVE);
 
//
// temporary variables that can change at any time
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index 941849e..3895bfd 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -1905,9 +1905,6 @@ extern cvar_t  *r_skipBackEnd;
 extern cvar_t  *r_stereoEnabled;
 extern cvar_t  *r_anaglyphMode;
 
-extern  cvar_t  *r_mergeMultidraws;
-extern  cvar_t  *r_mergeLeafSurfaces;
-
 extern  cvar_t  *r_externalGLSL;
 
 extern  cvar_t  *r_hdr;
diff --git a/MP/rend2-readme.md b/MP/rend2-readme.md
index 184833c..629cc9b 100644
--- a/MP/rend2-readme.md
+++ b/MP/rend2-readme.md
@@ -136,7 +136,7 @@ Cvars for HDR and tonemapping:
r_hdr, r_postprocess, and r_toneMap.
  0 - No.
  1 - Yes. (default)
- 
+
 *  `r_forceAutoExposure`- Cheat.  Override built-in and map auto
exposure settings and use cvars
r_forceAutoExposureMin and 
@@ -252,7 +252,7 @@ Cvars for image interpolation and generation:
  FCBI without second derivatives)
  2 - Okay but slow (normal FCBI)
 
-*  `r_genNormalMaps*- Naively generate normal maps for all
+*  `r_genNormalMaps`- Naively generate normal maps for all
textures.
  0 - Don't. (default)
  1 - Do.
@@ -302,23 +302,6 @@ Cvars for the sunlight and cascaded shadow maps:
 
 Cvars that you probably don't care about or shouldn't mess with:
 
-*  `r_mergeMultidraws`  - Optimize number of calls to 
-   glMultiDrawElements().
- 0 - Don't.
- 1 - Do some. (default)
- 2 - Do more than necessary (eats CPU).
-
-*  `r_mergeLeafSurfaces`- Merge surfaces that share common 
materials
-   and a common leaf.  Speeds up rendering.
- 0 - Don't.
- 1 - Do. (default)
-
-*  `r_recalcMD3Normals` - Recalculate the normals when loading an 
MD3.
-   Fixes normal maps in some cases but looks
-   ugly in others.
- 0 - Don't. (default)
- 1 - Do.
-
 *  `r_depthPrepass` - Do a depth-only pass before rendering.
Speeds up rendering in cases where advanced
features are used.  Required for
diff --git a/MP/README_RASPBERRYPI b/README_RASPBERRYPI
similarity index 100%
rename from MP/README_RASPBERRYPI
rename to 

[iortcw] 51/89: All: Make UI continue searching for local servers until found

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 2f5013792d7658d75c17ec4aeb015e08f77e42d4
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 16:07:54 2017 -0400

All: Make UI continue searching for local servers until found
---
 MP/code/ui/ui_main.c| 6 +-
 SP/code/rend2/tr_mesh.c | 2 +-
 SP/code/ui/ui_main.c| 6 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c
index e4fa9cb..c4dff6f 100644
--- a/MP/code/ui/ui_main.c
+++ b/MP/code/ui/ui_main.c
@@ -7912,6 +7912,10 @@ static void UI_DoServerRefresh( void ) {
UI_BuildServerDisplayList( 2 );
// stop the refresh
UI_StopServerRefresh();
+   } else if ( ui_netSource.integer == UIAS_LOCAL ) {
+   // no local servers found, check again
+   trap_Cmd_ExecuteText( EXEC_NOW, "localservers\n" );
+   uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 5000;
}
//
UI_BuildServerDisplayList( qfalse );
@@ -7958,7 +7962,7 @@ static void UI_StartServerRefresh( qboolean full, 
qboolean force ) {
//
if ( ui_netSource.integer == UIAS_LOCAL ) {
trap_Cmd_ExecuteText( EXEC_NOW, "localservers\n" );
-   uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 1000;
+   uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 5000;
return;
}
 
diff --git a/SP/code/rend2/tr_mesh.c b/SP/code/rend2/tr_mesh.c
index e24543a..15902d6 100644
--- a/SP/code/rend2/tr_mesh.c
+++ b/SP/code/rend2/tr_mesh.c
@@ -458,7 +458,7 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
// don't add third_person objects if not viewing through a 
portal
if ( !personalModel ) {
 // GR - tessellate according to model capabilities
-   R_AddDrawSurf((void *)>vaoSurfaces[i], shader, 
fogNum, qfalse, qfalse, cubemapIndex, tr.currentModel->ATI_tess );
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], shader, 
fogNum, qfalse, qfalse, cubemapIndex, tr.currentModel->ATI_tess );
}
 
surface++;
diff --git a/SP/code/ui/ui_main.c b/SP/code/ui/ui_main.c
index 5f8c438..aaa4805 100644
--- a/SP/code/ui/ui_main.c
+++ b/SP/code/ui/ui_main.c
@@ -7698,6 +7698,10 @@ static void UI_DoServerRefresh( void ) {
UI_BuildServerDisplayList( 2 );
// stop the refresh
UI_StopServerRefresh();
+   } else if ( ui_netSource.integer == UIAS_LOCAL ) {
+   // no local servers found, check again
+   trap_Cmd_ExecuteText( EXEC_NOW, "localservers\n" );
+   uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 5000;
}
//
UI_BuildServerDisplayList( qfalse );
@@ -7744,7 +7748,7 @@ static void UI_StartServerRefresh( qboolean full, 
qboolean force ) {
//
if ( ui_netSource.integer == UIAS_LOCAL ) {
trap_Cmd_ExecuteText( EXEC_NOW, "localservers\n" );
-   uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 1000;
+   uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 5000;
return;
}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 55/89: All: Add warnings for animMap and videoMap shader keywords

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit d6adba9f162ccd4619ecd17bda224d15fee93ac3
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 16:49:20 2017 -0400

All: Add warnings for animMap and videoMap shader keywords
---
 MP/code/rend2/tr_shader.c| 10 ++
 MP/code/renderer/tr_shader.c | 10 ++
 SP/code/rend2/tr_shader.c| 10 ++
 SP/code/renderer/tr_shader.c | 10 ++
 4 files changed, 40 insertions(+)

diff --git a/MP/code/rend2/tr_shader.c b/MP/code/rend2/tr_shader.c
index a83f59f..dcd3f02 100644
--- a/MP/code/rend2/tr_shader.c
+++ b/MP/code/rend2/tr_shader.c
@@ -712,6 +712,8 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text ) {
// animMap    
//
else if ( !Q_stricmp( token, "animMap" ) ) {
+   int totalImages = 0;
+
token = COM_ParseExt( text, qfalse );
if ( !token[0] ) {
ri.Printf( PRINT_WARNING, "WARNING: missing 
parameter for 'animMap' keyword in shader '%s'\n", shader.name );
@@ -744,6 +746,12 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text ) {
}
stage->bundle[0].numImageAnimations++;
}
+   totalImages++;
+   }
+
+   if ( totalImages > MAX_IMAGE_ANIMATIONS ) {
+   ri.Printf( PRINT_WARNING, "WARNING: ignoring 
excess images for 'animMap' (found %d, max is %d) in shader '%s'\n",
+   totalImages, 
MAX_IMAGE_ANIMATIONS, shader.name );
}
} else if ( !Q_stricmp( token, "videoMap" ) ){
token = COM_ParseExt( text, qfalse );
@@ -755,6 +763,8 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text ) {
if ( stage->bundle[0].videoMapHandle != -1 ) {
stage->bundle[0].isVideoMap = qtrue;
stage->bundle[0].image[0] = 
tr.scratchImage[stage->bundle[0].videoMapHandle];
+   } else {
+   ri.Printf( PRINT_WARNING, "WARNING: could not 
load '%s' for 'videoMap' keyword in shader '%s'\n", token, shader.name );
}
}
//
diff --git a/MP/code/renderer/tr_shader.c b/MP/code/renderer/tr_shader.c
index c6564e3..148c87e 100644
--- a/MP/code/renderer/tr_shader.c
+++ b/MP/code/renderer/tr_shader.c
@@ -659,6 +659,8 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text ) {
// animMap    
//
else if ( !Q_stricmp( token, "animMap" ) ) {
+   int totalImages = 0;
+
token = COM_ParseExt( text, qfalse );
if ( !token[0] ) {
ri.Printf( PRINT_WARNING, "WARNING: missing 
parameter for 'animMap' keyword in shader '%s'\n", shader.name );
@@ -692,6 +694,12 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text ) {
}
stage->bundle[0].numImageAnimations++;
}
+   totalImages++;
+   }
+
+   if ( totalImages > MAX_IMAGE_ANIMATIONS ) {
+   ri.Printf( PRINT_WARNING, "WARNING: ignoring 
excess images for 'animMap' (found %d, max is %d) in shader '%s'\n",
+   totalImages, 
MAX_IMAGE_ANIMATIONS, shader.name );
}
} else if ( !Q_stricmp( token, "videoMap" ) ){
token = COM_ParseExt( text, qfalse );
@@ -703,6 +711,8 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text ) {
if ( stage->bundle[0].videoMapHandle != -1 ) {
stage->bundle[0].isVideoMap = qtrue;
stage->bundle[0].image[0] = 
tr.scratchImage[stage->bundle[0].videoMapHandle];
+   } else {
+   ri.Printf( PRINT_WARNING, "WARNING: could not 
load '%s' for 'videoMap' keyword in shader '%s'\n", token, shader.name );
}
}
//
diff --git a/SP/code/rend2/tr_shader.c b/SP/code/rend2/tr_shader.c
index b6a1ae7..7338fe0 100644
--- a/SP/code/rend2/tr_shader.c
+++ b/SP/code/rend2/tr_shader.c
@@ -723,6 +723,8 @@ static qboolean ParseStage( shaderStage_t *stage, char 
**text ) {
// animMap    
//
else if ( !Q_stricmp( token, "animMap" ) ) {
+ 

[iortcw] 54/89: Update rend2-readme

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit c6e64b4376159392f2ae0b3ad45cad2c9da21b29
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 16:26:03 2017 -0400

Update rend2-readme
---
 rend2-readme.md | 22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/rend2-readme.md b/rend2-readme.md
index 629cc9b..6eba1a0 100644
--- a/rend2-readme.md
+++ b/rend2-readme.md
@@ -39,8 +39,12 @@ For Win32:
 2. Copy the following files into RTCW's install directory: 
  
  ioWolfMP.x86.exe
- renderer_opengl1_x86.dll
- renderer_rend2_x86.dll
+ ioWolfSP.x86.exe
+ ioWolfDED.x86.exe
+ renderer_mp_opengl1_x86.dll
+ renderer_mp_rend2_x86.dll
+ renderer_sp_opengl1_x86.dll
+ renderer_sp_rend2_x86.dll
  
These can be found in build/release-mingw32-x86 after compiling, or bug
someone to release binaries.
@@ -50,7 +54,7 @@ For Win32:
   RUNNING
 ---
 
-1. Start iowolfmp. (ioWolfMP.x86.exe on Win32)
+1. Start iowolfmp/iowolfsp. (ioWolfMP.x86.exe/ioWolfSP.x86.exe on Win32)
  
 2. Open the console (the default key is tilde ~) and type 
 `/cl_renderer rend2` and press enter
@@ -259,7 +263,7 @@ Cvars for image interpolation and generation:
 
 Cvars for the sunlight and cascaded shadow maps:
 
-*  `r_forceSun` - Cheat. Force sunlight and shadows, using 
sun position from sky material.
+*  `r_forceSun` - Force sunlight and shadows, using sun 
position from sky material.
  0 - Don't. (default)
  1 - Do.
  2 - Sunrise, sunset.
@@ -327,7 +331,7 @@ Cvars that you probably don't care about or shouldn't mess 
with:
 Cvars that have broken bits:
 
 *  `r_dlightMode`   - Change how dynamic lights look.
- 0 - Quake 3 style dlights, fake
+ 0 - RTCW style dlights, fake
  brightening. (default)
  1 - Actual lighting, no shadows.
  2 - Light and shadows. (broken)
@@ -341,7 +345,7 @@ Cvars that have broken bits:
   MATERIALS
 ---
 
-OpenGL2 supports .mtr files, which are basically the same as .shader files, and
+Rend2 supports .mtr files, which are basically the same as .shader files, and
 are located in the same place, but override existing .shader files if they 
 exist.  This is to allow maps and mods to use the new material features without
 breaking the map when using the old renderer.
@@ -373,12 +377,12 @@ Here's an example of a material stored in one, showing 
off some new features:
 }
 }
 
-The first thing to notice is that this is basically the same as old Quake 3 
+The first thing to notice is that this is basically the same as old RTCW 
 shader files.  The next thing to notice are the new keywords.  Here is what 
 they mean:
 
   `stage `
-- State how this imagemap will be used by OpenGL2:
+- State how this imagemap will be used by Rend2:
 diffuseMap- Standard, same as no stage entry
 normalMap - Image will be used as a normal map
 normalParallaxMap - Image will be used as a normal map with 
@@ -562,7 +566,7 @@ adjust the effect before settling on fixed settings.
 I'd like to take this part of the readme to thank the numerous people who
 contributed thoughts, ideas, and whole swaths of code to this project.
 
-  - Id Software, for creating Quake 3 and releasing its source code under a
+  - Id Software, for creating RTCW and releasing its source code under a
 GPL license, without which this project would not be possible.
 
   - Zachary 'Zakk' Slater, Thilo Schulz, Tim Angus, and the rest of the

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 53/89: Remove duplicate rend2-readme

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit a67453c768e404fe819d65d703711854e536e1f5
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 16:19:22 2017 -0400

Remove duplicate rend2-readme
---
 MP/rend2-readme.md | 604 -
 1 file changed, 604 deletions(-)

diff --git a/MP/rend2-readme.md b/MP/rend2-readme.md
deleted file mode 100644
index 629cc9b..000
--- a/MP/rend2-readme.md
+++ /dev/null
@@ -1,604 +0,0 @@
-# Rend2
-
-
-Rend2 is an alternate renderer for iortcw.  It aims to implement modern
-features and technologies into the id tech 3 engine, but without sacrificing
-compatibility with existing RTCW mods.
-
-

-  FEATURES

-
-  - Compatible with most vanilla RTCW mods.
-  - HDR Rendering, and support for HDR lightmaps
-  - Tone mapping and auto-exposure.
-  - Cascaded shadow maps.
-  - Multisample anti-aliasing.
-  - Texture upsampling.
-  - Advanced materials support.
-  - Advanced shading and specular methods.
-  - RGTC and BPTC texture compression support.
-  - Screen-space ambient occlusion.
-
-

-  INSTALLATION

-
-For *nix:
-
-1. This should be identical to installing iortcw.  Check their README for more
-   details.
-
-   
-For Win32:
-
-1. Have a RTCW install, fully patched.
-
-2. Copy the following files into RTCW's install directory: 
- 
- ioWolfMP.x86.exe
- renderer_opengl1_x86.dll
- renderer_rend2_x86.dll
- 
-   These can be found in build/release-mingw32-x86 after compiling, or bug
-   someone to release binaries.
-  
-

-  RUNNING

-
-1. Start iowolfmp. (ioWolfMP.x86.exe on Win32)
- 
-2. Open the console (the default key is tilde ~) and type 
-`/cl_renderer rend2` and press enter
-`/vid_restart` then press enter again.
-
-3. Enjoy.
-
-

-  CVARS

-
-Cvars for simple rendering features:
-
-* `r_ext_compressed_textures`   - Automatically compress textures.
- 0 - No texture compression. (default)
- 1 - DXT/RGTC texture compression if
- supported.
- 2 - BPTC texture compression if supported.
-
-*  `r_ext_framebuffer_multisample`  - Multisample Anti-aliasing.
- 0- None. (default)
- 1-16 - Some.
- 17+  - Too much!
-
-*  `r_ssao` - Enable screen-space ambient occlusion.
-   Currently eats framerate and has some
-   visible artifacts.
- 0 - No. (default)
- 1 - Yes.
-
-Cvars for HDR and tonemapping:
-
- * `r_hdr`  - Do scene rendering in a framebuffer with
-   high dynamic range.  (Less banding, and
-   exposure changes look much better)
- 0 - No.
- 1 - Yes. (default)
-
-*  `r_cameraExposure`   - Cheat.  Alter brightness, in powers of 
two.
- -2  - 4x as dark.
- 0   - Normal. (default)
- 0.5 - Sqrt(2)x as bright.
- 2   - 4x as bright.
-
-*  `r_postProcess`  - Enable post-processing.
- 0 - No.
- 1 - Yes. (default)
-
-*  `r_toneMap`  - Enable tone mapping.  Requires 
-   r_hdr and r_postProcess.
- 0 - No.
- 1 - Yes. (default)
-
-*  `r_forceToneMap` - Cheat. Override built-in and map tonemap 
settings and use cvars r_forceToneMapAvg, r_forceToneMapMin, and 
r_forceToneMapMax.
- 0 - No. (default)
- 1 - Yes.
-
-*  `r_forceToneMapAvg`  - Cheat.  Map average scene luminance to 
this
-   value, in powers of two.  Requires 
- 

[iortcw] 47/89: Add 'addbot random' to README

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 035dd955d19d824338d5cd1268cb8db264c050f3
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 12:34:32 2017 -0400

Add 'addbot random' to README

(Also cvar_modified which was missed somewhere)
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d0ea3d8..36757bc 100644
--- a/README.md
+++ b/README.md
@@ -238,7 +238,8 @@ The defaults for these variables differ depending on the 
target platform.
 * kickall - kick all clients, similar to "kick all" ( but kicks everyone even 
if someone is named "all" )
 * kickbots - kick all bots, similar to "kick allbots" (but kicks all bots even 
if someone is named "allbots")
 * tell ( client num ) msg - send message to a single client (new to server)
-
+* cvar_modified [filter] - list modified cvars, can filter results (such as 
"r*" for renderer cvars) like cvarlist which lists all cvars
+* addbot random - the bot name "random" now selects a random bot
 
  README for Users
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 49/89: All: Rend2: Fix black planar projection shadows (cg_shadows 3)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 29c2ecc07a450ae1331b4c493cdd93c144c168c9
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 15:04:13 2017 -0400

All: Rend2: Fix black planar projection shadows (cg_shadows 3)
---
 MP/code/rend2/tr_mesh.c | 29 +
 SP/code/rend2/tr_mesh.c | 28 +---
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/MP/code/rend2/tr_mesh.c b/MP/code/rend2/tr_mesh.c
index f61968c..695491f 100644
--- a/MP/code/rend2/tr_mesh.c
+++ b/MP/code/rend2/tr_mesh.c
@@ -415,23 +415,36 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
shader = tr.shaders[ surface->shaderIndexes[ 
ent->e.skinNum % surface->numShaderIndexes ] ];
}
 
+   // we will add shadows even if the main object isn't visible in 
the view
+
+   // stencil shadows can't do personal models unless I polyhedron 
clip
+   if ( !personalModel
+   && r_shadows->integer == 2 
+   && fogNum == 0
+   && !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
+   && shader->sort == SS_OPAQUE ) {
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], 
tr.shadowShader, 0, qfalse, qfalse, 0 );
+   }
+
+   // projection shadows work fine with personal models
+   if ( r_shadows->integer == 3
+   && fogNum == 0
+   && (ent->e.renderfx & RF_SHADOW_PLANE )
+   && shader->sort == SS_OPAQUE ) {
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], 
tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
+   }
 
// for testing polygon shadows (on /all/ models)
if ( r_shadows->integer == 4 ) {
-   R_AddDrawSurf( (void *)surface, 
tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], 
tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
}
 
-
// don't add third_person objects if not viewing through a 
portal
-   if(!personalModel)
-   {
-   srfVaoMdvMesh_t *vaoSurface = >vaoSurfaces[i];
-
-   R_AddDrawSurf((void *)vaoSurface, shader, fogNum, 
qfalse, qfalse, cubemapIndex );
+   if ( !personalModel ) {
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], shader, 
fogNum, qfalse, qfalse, cubemapIndex );
}
 
surface++;
}
-
 }
 
diff --git a/SP/code/rend2/tr_mesh.c b/SP/code/rend2/tr_mesh.c
index 20b66f8..e24543a 100644
--- a/SP/code/rend2/tr_mesh.c
+++ b/SP/code/rend2/tr_mesh.c
@@ -430,16 +430,38 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
shader = tr.shaders[ surface->shaderIndexes[ 
ent->e.skinNum % surface->numShaderIndexes ] ];
}
 
+   // we will add shadows even if the main object isn't visible in 
the view
+
+   // stencil shadows can't do personal models unless I polyhedron 
clip
+   if ( !personalModel
+   && r_shadows->integer == 2 
+   && fogNum == 0
+   && !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
+   && shader->sort == SS_OPAQUE ) {
+// GR - tessellate according to model capabilities
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], 
tr.shadowShader, 0, qfalse, qfalse, 0, tr.currentModel->ATI_tess );
+   }
+
+   // projection shadows work fine with personal models
+   if ( r_shadows->integer == 3
+   && fogNum == 0
+   && (ent->e.renderfx & RF_SHADOW_PLANE )
+   && shader->sort == SS_OPAQUE ) {
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], 
tr.projectionShadowShader, 0, qfalse, qfalse, 0, tr.currentModel->ATI_tess );
+   }
+
+   // for testing polygon shadows (on /all/ models)
+   if ( r_shadows->integer == 4 ) {
+   R_AddDrawSurf( (void *)>vaoSurfaces[i], 
tr.projectionShadowShader, 0, qfalse, qfalse, 0, tr.currentModel->ATI_tess );
+   }
 
// don't add third_person objects if not viewing through a 
portal
if ( !personalModel ) {
 // GR - tessellate according to model capabilities
-   srfVaoMdvMesh_t *vaoSurface = >vaoSurfaces[i];
-   R_AddDrawSurf( (void *)vaoSurface, shader, fogNum, 
qfalse, qfalse, cubemapIndex, tr.currentModel->ATI_tess );
+   R_AddDrawSurf((void *)>vaoSurfaces[i], shader, 
fogNum, qfalse, qfalse, cubemapIndex, tr.currentModel->ATI_tess );
}
 
 

[iortcw] 41/89: All: Fix bot_minplayers passing delay as team to addbot in non-team gametypes

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit ca5aa2966bfdf8c512067fa6259d342f0d6c3277
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 11:53:32 2017 -0400

All: Fix bot_minplayers passing delay as team to addbot in non-team 
gametypes
---
 MP/code/game/g_bot.c | 6 +++---
 SP/code/game/g_bot.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index e9d7dab..e594e86 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -235,12 +235,12 @@ void G_AddRandomBot( int team ) {
value = Info_ValueForKey( g_botInfos[n], "name" );
 
skill = trap_Cvar_VariableIntegerValue( "g_spSkill" );
-   if (team == TEAM_RED) {
+   if ( team == TEAM_RED ) {
teamstr = "red";
-   } else if (team == TEAM_BLUE) {
+   } else if ( team == TEAM_BLUE ) {
teamstr = "blue";
} else {
-   teamstr = "";
+   teamstr = "free";
}
Q_strncpyz( netname, value, sizeof( netname ) );
Q_CleanStr( netname );
diff --git a/SP/code/game/g_bot.c b/SP/code/game/g_bot.c
index 3d7ef3c..f2343e9 100644
--- a/SP/code/game/g_bot.c
+++ b/SP/code/game/g_bot.c
@@ -236,12 +236,12 @@ void G_AddRandomBot( int team ) {
value = Info_ValueForKey( g_botInfos[n], "name" );
 
skill = trap_Cvar_VariableIntegerValue( "g_spSkill" );
-   if (team == TEAM_RED) {
+   if ( team == TEAM_RED ) {
teamstr = "red";
-   } else if (team == TEAM_BLUE) {
+   } else if ( team == TEAM_BLUE ) {
teamstr = "blue";
} else {
-   teamstr = "";
+   teamstr = "free";
}
Q_strncpyz( netname, value, sizeof( netname ) );
Q_CleanStr( netname );

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 45/89: All: Don't pick duplicate random bots until all bot types are added

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 7c1ec377603a26fcdfd0a55f4a1ad0d56c463370
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 12:27:48 2017 -0400

All: Don't pick duplicate random bots until all bot types are added
---
 MP/code/game/g_bot.c | 28 +++-
 SP/code/game/g_bot.c | 28 +++-
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index 34b55c4..9eb4367 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -190,11 +190,16 @@ Get random least used bot info on team or whole server if 
team is -1.
 ===
 */
 int G_SelectRandomBotInfo( int team ) {
-   int selection[MAX_BOTS];
-   int n, num;
-   int count, bestCount;
+   int selection[MAX_BOTS];
+   int n, num;
+   int count, bestCount;
char*value;
 
+   // don't add duplicate bots to the server if there are less bots than 
bot types
+   if ( team != -1 && G_CountBotPlayersByName( NULL, -1 ) < g_numBots ) {
+   team = -1;
+   }
+
num = 0;
bestCount = MAX_CLIENTS;
for ( n = 0; n < g_numBots ; n++ ) {
@@ -233,17 +238,8 @@ G_AddRandomBot
 ===
 */
 void G_AddRandomBot( int team ) {
-   int n, skill;
-   char*value, netname[36], *teamstr;
-
-   n = G_SelectRandomBotInfo( team );
-
-   if ( n < 0 ) {
-   // no bot info available
-   return;
-   }
-
-   value = Info_ValueForKey( g_botInfos[n], "name" );
+   char*teamstr;
+   int skill;
 
skill = trap_Cvar_VariableIntegerValue( "g_spSkill" );
if ( team == TEAM_RED ) {
@@ -253,9 +249,7 @@ void G_AddRandomBot( int team ) {
} else {
teamstr = "free";
}
-   Q_strncpyz( netname, value, sizeof( netname ) );
-   Q_CleanStr( netname );
-   trap_SendConsoleCommand( EXEC_INSERT, va( "addbot %s %i %s %i\n", 
netname, skill, teamstr, 0 ) );
+   trap_SendConsoleCommand( EXEC_INSERT, va( "addbot random %i %s %i\n", 
skill, teamstr, 0 ) );
 }
 
 /*
diff --git a/SP/code/game/g_bot.c b/SP/code/game/g_bot.c
index f13d571..239ceda 100644
--- a/SP/code/game/g_bot.c
+++ b/SP/code/game/g_bot.c
@@ -191,11 +191,16 @@ Get random least used bot info on team or whole server if 
team is -1.
 ===
 */
 int G_SelectRandomBotInfo( int team ) {
-   int selection[MAX_BOTS];
-   int n, num;
-   int count, bestCount;
+   int selection[MAX_BOTS];
+   int n, num;
+   int count, bestCount;
char*value;
 
+   // don't add duplicate bots to the server if there are less bots than 
bot types
+   if ( team != -1 && G_CountBotPlayersByName( NULL, -1 ) < g_numBots ) {
+   team = -1;
+   }
+
num = 0;
bestCount = MAX_CLIENTS;
for ( n = 0; n < g_numBots ; n++ ) {
@@ -234,17 +239,8 @@ G_AddRandomBot
 ===
 */
 void G_AddRandomBot( int team ) {
-   int n, skill;
-   char*value, netname[36], *teamstr;
-
-   n = G_SelectRandomBotInfo( team );
-
-   if ( n < 0 ) {
-   // no bot info available
-   return;
-   }
-
-   value = Info_ValueForKey( g_botInfos[n], "name" );
+   char*teamstr;
+   int skill;
 
skill = trap_Cvar_VariableIntegerValue( "g_spSkill" );
if ( team == TEAM_RED ) {
@@ -254,9 +250,7 @@ void G_AddRandomBot( int team ) {
} else {
teamstr = "free";
}
-   Q_strncpyz( netname, value, sizeof( netname ) );
-   Q_CleanStr( netname );
-   trap_SendConsoleCommand( EXEC_INSERT, va( "addbot %s %i %s %i\n", 
netname, skill, teamstr, 0 ) );
+   trap_SendConsoleCommand( EXEC_INSERT, va( "addbot random %i %s %i\n", 
skill, teamstr, 0 ) );
 }
 
 /*

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 48/89: All: Rend2: Fix checking r_shadowCascadeZFar pointer instead of value

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 41a358fa3a27ad33d4046e06754cf3b9733eda80
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 14:13:13 2017 -0400

All: Rend2: Fix checking r_shadowCascadeZFar pointer instead of value
---
 MP/code/rend2/tr_scene.c | 2 +-
 SP/code/rend2/tr_scene.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_scene.c b/MP/code/rend2/tr_scene.c
index 15d98b2..cffe6c9 100644
--- a/MP/code/rend2/tr_scene.c
+++ b/MP/code/rend2/tr_scene.c
@@ -609,7 +609,7 @@ void RE_RenderScene( const refdef_t *fd ) {
// playing with even more shadows
if(glRefConfig.framebufferObject && r_sunlightMode->integer && !( 
fd->rdflags & RDF_NOWORLDMODEL ) && (r_forceSun->integer || tr.sunShadows))
{
-   if (r_shadowCascadeZFar != 0)
+   if (r_shadowCascadeZFar->integer != 0)
{
R_RenderSunShadowMaps(fd, 0);
R_RenderSunShadowMaps(fd, 1);
diff --git a/SP/code/rend2/tr_scene.c b/SP/code/rend2/tr_scene.c
index 4741ff5..7c50dcb 100644
--- a/SP/code/rend2/tr_scene.c
+++ b/SP/code/rend2/tr_scene.c
@@ -622,7 +622,7 @@ void RE_RenderScene( const refdef_t *fd ) {
// playing with even more shadows
if(glRefConfig.framebufferObject && r_sunlightMode->integer && !( 
fd->rdflags & RDF_NOWORLDMODEL ) && (r_forceSun->integer || tr.sunShadows))
{
-   if (r_shadowCascadeZFar != 0)
+   if (r_shadowCascadeZFar->integer != 0)
{
R_RenderSunShadowMaps(fd, 0);
R_RenderSunShadowMaps(fd, 1);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 44/89: All: Fix duplicate (delayed) random bots being choosen

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit b22b6bacf4a556d2e7bf2dbd4688c3a6dbf8d51a
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 12:21:20 2017 -0400

All: Fix duplicate (delayed) random bots being choosen
---
 MP/code/game/g_bot.c | 4 +++-
 SP/code/game/g_bot.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index 4158aae..34b55c4 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -153,6 +153,8 @@ static void PlayerIntroSound( const char *modelAndSkin ) {
 ===
 G_CountBotPlayersByName
 
+Check connected and connecting (delay join) bots.
+
 Returns number of bots with name on specified team or whole server if team is 
-1.
 ===
 */
@@ -163,7 +165,7 @@ int G_CountBotPlayersByName( const char *name, int team ) {
num = 0;
for ( i=0 ; i< g_maxclients.integer ; i++ ) {
cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
+   if ( cl->pers.connected == CON_DISCONNECTED ) {
continue;
}
if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
diff --git a/SP/code/game/g_bot.c b/SP/code/game/g_bot.c
index b797a57..f13d571 100644
--- a/SP/code/game/g_bot.c
+++ b/SP/code/game/g_bot.c
@@ -154,6 +154,8 @@ static void PlayerIntroSound( const char *modelAndSkin ) {
 ===
 G_CountBotPlayersByName
 
+Check connected and connecting (delay join) bots.
+
 Returns number of bots with name on specified team or whole server if team is 
-1.
 ===
 */
@@ -164,7 +166,7 @@ int G_CountBotPlayersByName( const char *name, int team ) {
num = 0;
for ( i=0 ; i< g_maxclients.integer ; i++ ) {
cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
+   if ( cl->pers.connected == CON_DISCONNECTED ) {
continue;
}
if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 34/89: All: Make cg_teamChatsOnly only affect team gametypes

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 51a04c3f048c464116d51bc0642eeb2b2a5383f5
Author: MAN-AT-ARMS 
Date:   Tue Jul 18 08:30:22 2017 -0400

All: Make cg_teamChatsOnly only affect team gametypes
---
 MP/code/cgame/cg_servercmds.c | 59 ++-
 SP/code/cgame/cg_servercmds.c | 14 +-
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/MP/code/cgame/cg_servercmds.c b/MP/code/cgame/cg_servercmds.c
index 7b7c935..920b517 100644
--- a/MP/code/cgame/cg_servercmds.c
+++ b/MP/code/cgame/cg_servercmds.c
@@ -1245,6 +1245,10 @@ void CG_VoiceChatLocal( int mode, qboolean voiceOnly, 
int clientNum, int color,
}
 */
 
+   if ( mode == SAY_ALL && cgs.gametype >= GT_TEAM && 
cg_teamChatsOnly.integer ) {
+   return;
+   }
+
if ( clientNum < 0 || clientNum >= MAX_CLIENTS ) {
clientNum = 0;
}
@@ -1255,34 +1259,31 @@ void CG_VoiceChatLocal( int mode, qboolean voiceOnly, 
int clientNum, int color,
voiceChatList = CG_VoiceChatListForClient( clientNum );
 
if ( CG_GetVoiceChat( voiceChatList, cmd, , ,  ) ) {
-   //
-   if ( mode == SAY_TEAM || !cg_teamChatsOnly.integer ) {
-   vchat.clientNum = clientNum;
-   vchat.snd = snd;
-   vchat.sprite = sprite;
-   vchat.voiceOnly = voiceOnly;
-   VectorCopy( origin, vchat.origin ); // NERVE - SMF
-   Q_strncpyz( vchat.cmd, cmd, sizeof( vchat.cmd ) );
-
-   // NERVE - SMF - get location
-   loc = CG_ConfigString( CS_LOCATIONS + ci->location );
-   if ( !loc || !*loc ) {
-   loc = " ";
-   }
-   // -NERVE - SMF
-
-   if ( mode == SAY_TELL ) {
-   Com_sprintf( vchat.message, sizeof( 
vchat.message ), "[%s]%c%c[%s]: %c%c%s",
-ci->name, 
Q_COLOR_ESCAPE, COLOR_YELLOW, CG_TranslateString( loc ), Q_COLOR_ESCAPE, color, 
CG_TranslateString( chat ) );
-   } else if ( mode == SAY_TEAM )   {
-   Com_sprintf( vchat.message, sizeof( 
vchat.message ), "(%s)%c%c(%s): %c%c%s",
-ci->name, 
Q_COLOR_ESCAPE, COLOR_YELLOW, CG_TranslateString( loc ), Q_COLOR_ESCAPE, color, 
CG_TranslateString( chat ) );
-   } else {
-   Com_sprintf( vchat.message, sizeof( 
vchat.message ), "%s %c%c(%s): %c%c%s",
-ci->name, 
Q_COLOR_ESCAPE, COLOR_YELLOW, CG_TranslateString( loc ), Q_COLOR_ESCAPE, color, 
CG_TranslateString( chat ) );
-   }
-   CG_AddBufferedVoiceChat(  );
+   vchat.clientNum = clientNum;
+   vchat.snd = snd;
+   vchat.sprite = sprite;
+   vchat.voiceOnly = voiceOnly;
+   VectorCopy( origin, vchat.origin ); // NERVE - SMF
+   Q_strncpyz( vchat.cmd, cmd, sizeof( vchat.cmd ) );
+
+   // NERVE - SMF - get location
+   loc = CG_ConfigString( CS_LOCATIONS + ci->location );
+   if ( !loc || !*loc ) {
+   loc = " ";
}
+   // -NERVE - SMF
+
+   if ( mode == SAY_TELL ) {
+   Com_sprintf( vchat.message, sizeof( vchat.message ), 
"[%s]%c%c[%s]: %c%c%s",
+ci->name, Q_COLOR_ESCAPE, 
COLOR_YELLOW, CG_TranslateString( loc ), Q_COLOR_ESCAPE, color, 
CG_TranslateString( chat ) );
+   } else if ( mode == SAY_TEAM )   {
+   Com_sprintf( vchat.message, sizeof( vchat.message ), 
"(%s)%c%c(%s): %c%c%s",
+ci->name, Q_COLOR_ESCAPE, 
COLOR_YELLOW, CG_TranslateString( loc ), Q_COLOR_ESCAPE, color, 
CG_TranslateString( chat ) );
+   } else {
+   Com_sprintf( vchat.message, sizeof( vchat.message ), 
"%s %c%c(%s): %c%c%s",
+ci->name, Q_COLOR_ESCAPE, 
COLOR_YELLOW, CG_TranslateString( loc ), Q_COLOR_ESCAPE, color, 
CG_TranslateString( chat ) );
+   }
+   CG_AddBufferedVoiceChat(  );
}
 }
 
@@ -1486,9 +1487,9 @@ static void CG_ServerCommand( void ) {
if ( !strcmp( cmd, "chat" ) ) {
const char *s;
 
-   if ( cg_teamChatsOnly.integer ) {
+   if ( cgs.gametype >= GT_TEAM && cg_teamChatsOnly.integer ) {
return;
-   }
+   }
 
if ( atoi( CG_Argv( 2 ) ) 

[iortcw] 43/89: All: Check delayed bot's team when counting bots for bot_minplayers

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 1d2b137047ee7de6bbf9ed0356f0d62879b7f2fd
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 12:18:53 2017 -0400

All: Check delayed bot's team when counting bots for bot_minplayers
---
 MP/code/game/g_bot.c | 15 ---
 SP/code/game/g_bot.c | 15 ---
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index f97a53c..4158aae 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -311,16 +311,18 @@ int G_CountHumanPlayers( int team ) {
 /*
 ===
 G_CountBotPlayers
+
+Check connected and connecting (delay join) bots.
 ===
 */
 int G_CountBotPlayers( int team ) {
-   int i, n, num;
+   int i, num;
gclient_t   *cl;
 
num = 0;
for ( i = 0 ; i < g_maxclients.integer ; i++ ) {
cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
+   if ( cl->pers.connected == CON_DISCONNECTED ) {
continue;
}
if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
@@ -331,15 +333,6 @@ int G_CountBotPlayers( int team ) {
}
num++;
}
-   for ( n = 0; n < BOT_SPAWN_QUEUE_DEPTH; n++ ) {
-   if ( !botSpawnQueue[n].spawnTime ) {
-   continue;
-   }
-   if ( botSpawnQueue[n].spawnTime > level.time ) {
-   continue;
-   }
-   num++;
-   }
return num;
 }
 
diff --git a/SP/code/game/g_bot.c b/SP/code/game/g_bot.c
index 370f3bb..b797a57 100644
--- a/SP/code/game/g_bot.c
+++ b/SP/code/game/g_bot.c
@@ -312,16 +312,18 @@ int G_CountHumanPlayers( int team ) {
 /*
 ===
 G_CountBotPlayers
+
+Check connected and connecting (delay join) bots.
 ===
 */
 int G_CountBotPlayers( int team ) {
-   int i, n, num;
+   int i, num;
gclient_t   *cl;
 
num = 0;
for ( i = 0 ; i < g_maxclients.integer ; i++ ) {
cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
+   if ( cl->pers.connected == CON_DISCONNECTED ) {
continue;
}
if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
@@ -332,15 +334,6 @@ int G_CountBotPlayers( int team ) {
}
num++;
}
-   for ( n = 0; n < BOT_SPAWN_QUEUE_DEPTH; n++ ) {
-   if ( !botSpawnQueue[n].spawnTime ) {
-   continue;
-   }
-   if ( botSpawnQueue[n].spawnTime > level.time ) {
-   continue;
-   }
-   num++;
-   }
return num;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 36/89: All: Have spectator always be in first person view

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 9cf3f734c1ced4c4932563e6aca8790e9aa89409
Author: MAN-AT-ARMS 
Date:   Tue Jul 18 13:59:27 2017 -0400

All: Have spectator always be in first person view
---
 MP/code/cgame/cg_view.c | 3 ++-
 SP/code/cgame/cg_view.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/MP/code/cgame/cg_view.c b/MP/code/cgame/cg_view.c
index f67cf21..19324a2 100644
--- a/MP/code/cgame/cg_view.c
+++ b/MP/code/cgame/cg_view.c
@@ -1643,7 +1643,8 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t 
stereoView, qboolean demo
DEBUGTIME
 
// decide on third person view
-   cg.renderingThirdPerson = cg_thirdPerson.integer || ( 
cg.snap->ps.stats[STAT_HEALTH] <= 0 );
+   cg.renderingThirdPerson = cg.snap->ps.persistant[PERS_TEAM] != 
TEAM_SPECTATOR
+   && ( 
cg_thirdPerson.integer || ( cg.snap->ps.stats[STAT_HEALTH] <= 0 ) );
 
// build cg.refdef
inwater = CG_CalcViewValues();
diff --git a/SP/code/cgame/cg_view.c b/SP/code/cgame/cg_view.c
index 2407159..b6d2d07 100644
--- a/SP/code/cgame/cg_view.c
+++ b/SP/code/cgame/cg_view.c
@@ -1539,7 +1539,8 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t 
stereoView, qboolean demo
DEBUGTIME
 
// decide on third person view
-   cg.renderingThirdPerson = cg_thirdPerson.integer /*|| 
(cg.snap->ps.stats[STAT_HEALTH] <= 0)*/;
+   cg.renderingThirdPerson = cg.snap->ps.persistant[PERS_TEAM] != 
TEAM_SPECTATOR
+   && ( 
cg_thirdPerson.integer || ( cg.snap->ps.stats[STAT_HEALTH] <= 0 ) );
 
// build cg.refdef
inwater = CG_CalcViewValues();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 33/89: All: Fix g_teamAutoJoin and g_teamForceBalance

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit a0ba77d8757049d03473b27c2d734dc894924d4c
Author: MAN-AT-ARMS 
Date:   Tue Jul 18 07:52:46 2017 -0400

All: Fix g_teamAutoJoin and g_teamForceBalance

Merge from ioq3 
https://github.com/ioquake/ioq3/commit/f7c3276fe803388bd613ab6bf6ad8e0a6647b740

Adds g_localTeamPref for use with g_teamAutoJoin

TODO: Add class preference as well (i.e. g_localClassPref) to go with this.

Unused in SP but merged for the sake of coop, etc.
---
 MP/code/game/ai_dmq3.c |  7 +--
 MP/code/game/g_bot.c   |  3 +--
 MP/code/game/g_client.c| 22 +++---
 MP/code/game/g_cmds.c  |  4 ++--
 MP/code/game/g_local.h |  5 +++--
 MP/code/game/g_main.c  |  6 +-
 MP/code/game/g_session.c   | 20 ++--
 MP/code/ui/ui_main.c   | 12 +++-
 SP/code/game/ai_dmq3.c |  7 +--
 SP/code/game/g_bot.c   |  3 +--
 SP/code/game/g_client.c| 22 +++---
 SP/code/game/g_cmds.c  |  2 +-
 SP/code/game/g_func_decs.h |  2 +-
 SP/code/game/g_local.h |  4 ++--
 SP/code/game/g_main.c  |  4 
 SP/code/game/g_session.c   | 20 ++--
 SP/code/ui/ui_main.c   | 12 ++--
 17 files changed, 101 insertions(+), 54 deletions(-)

diff --git a/MP/code/game/ai_dmq3.c b/MP/code/game/ai_dmq3.c
index d0b4526..2ba84c2 100644
--- a/MP/code/game/ai_dmq3.c
+++ b/MP/code/game/ai_dmq3.c
@@ -2763,7 +2763,7 @@ BotDeathmatchAI
 ==
 */
 void BotDeathmatchAI( bot_state_t *bs, float thinktime ) {
-   char gender[144], name[144], buf[144];
+   char gender[144], name[144];
char userinfo[MAX_INFO_STRING];
int i;
 
@@ -2779,11 +2779,6 @@ void BotDeathmatchAI( bot_state_t *bs, float thinktime ) 
{
trap_GetUserinfo( bs->client, userinfo, sizeof( userinfo ) );
Info_SetValueForKey( userinfo, "sex", gender );
trap_SetUserinfo( bs->client, userinfo );
-   //set the team
-   if ( g_gametype.integer != GT_TOURNAMENT ) {
-   Com_sprintf( buf, sizeof( buf ), "team %s", 
bs->settings.team );
-   trap_EA_Command( bs->client, buf );
-   }
//set the chat gender
if ( gender[0] == 'm' ) {
trap_BotSetChatGender( bs->cs, CHAT_GENDERMALE );
diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index 4829cb0..1505c1e 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -454,7 +454,6 @@ qboolean G_BotConnect( int clientNum, qboolean restart ) {
 
Q_strncpyz( settings.characterfile, Info_ValueForKey( userinfo, 
"characterfile" ), sizeof( settings.characterfile ) );
settings.skill = atoi( Info_ValueForKey( userinfo, "skill" ) );
-   Q_strncpyz( settings.team, Info_ValueForKey( userinfo, "team" ), 
sizeof( settings.team ) );
 
if ( !BotAISetupClient( clientNum,  ) ) {
trap_DropClient( clientNum, "BotAISetupClient failed" );
@@ -561,7 +560,7 @@ static void G_AddBot( const char *name, float skill, const 
char *team, int delay
team = "red";
}
}
-   Info_SetValueForKey( userinfo, "team", team );
+   Info_SetValueForKey( userinfo, "teampref", team );
 
// register the userinfo
trap_SetUserinfo( clientNum, userinfo );
diff --git a/MP/code/game/g_client.c b/MP/code/game/g_client.c
index 67443f3..093dd1d 100644
--- a/MP/code/game/g_client.c
+++ b/MP/code/game/g_client.c
@@ -1332,12 +1332,6 @@ void ClientUserinfoChanged( int clientNum ) {
trap_DropClient(clientNum, "Invalid userinfo");
}
 
-   // check for local client
-   s = Info_ValueForKey( userinfo, "ip" );
-   if ( s && !strcmp( s, "localhost" ) ) {
-   client->pers.localClient = qtrue;
-   }
-
// check the item prediction
s = Info_ValueForKey( userinfo, "cg_predictItems" );
if ( !atoi( s ) ) {
@@ -1581,11 +1575,11 @@ char *ClientConnect( int clientNum, qboolean firstTime, 
qboolean isBot ) {
}
client->pers.complaints = 0;// DHM - Nerve
 
-   // read or initialize the session data
-   if ( firstTime || ( g_gametype.integer < GT_WOLF && level.newSession ) 
) {
-   G_InitSessionData( client, userinfo );
-   }
-   G_ReadSessionData( client );
+   // check for local client
+   value = Info_ValueForKey( userinfo, "ip" );
+   if ( !strcmp( value, "localhost" ) ) {
+   client->pers.localClient = qtrue;
+   }
 
if ( isBot ) {
ent->r.svFlags |= SVF_BOT;
@@ -1595,6 +1589,12 @@ char *ClientConnect( int clientNum, qboolean firstTime, 
qboolean isBot ) {
}
}
 
+   // read or initialize the session data

[iortcw] 46/89: All: Add range check for bot skill in addbot command

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 60ae34dea206060fc24c633afb4c126748d65c11
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 12:30:03 2017 -0400

All: Add range check for bot skill in addbot command
---
 MP/code/game/g_bot.c | 2 +-
 SP/code/game/g_bot.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index 9eb4367..8f9235e 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -666,7 +666,7 @@ void Svcmd_AddBot_f( void ) {
if ( !string[0] ) {
skill = 4;
} else {
-   skill = atoi( string );
+   skill = Com_Clamp( 1, 5, atoi( string ) );
}
 
// team
diff --git a/SP/code/game/g_bot.c b/SP/code/game/g_bot.c
index 239ceda..cb8fbad 100644
--- a/SP/code/game/g_bot.c
+++ b/SP/code/game/g_bot.c
@@ -667,7 +667,7 @@ void Svcmd_AddBot_f( void ) {
if ( !string[0] ) {
skill = 4;
} else {
-   skill = atoi( string );
+   skill = Com_Clamp( 1, 5, atoi( string ) );
}
 
// team

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 35/89: All: Check for unlimited time power up using INT_MAX

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit a73b906d97e2364e20e7b08f97d35b3e2f4fec0c
Author: MAN-AT-ARMS 
Date:   Tue Jul 18 09:14:24 2017 -0400

All: Check for unlimited time power up using INT_MAX
---
 MP/code/cgame/cg_newdraw.c | 11 ---
 SP/code/cgame/cg_draw.c| 11 ---
 SP/code/cgame/cg_newdraw.c | 11 ---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/MP/code/cgame/cg_newdraw.c b/MP/code/cgame/cg_newdraw.c
index 54675ed..c561812 100644
--- a/MP/code/cgame/cg_newdraw.c
+++ b/MP/code/cgame/cg_newdraw.c
@@ -1421,10 +1421,15 @@ static void CG_DrawAreaPowerUp( rectDef_t *rect, int 
align, float spacing, float
if ( !ps->powerups[ i ] ) {
continue;
}
-   t = ps->powerups[ i ] - cg.time;
-   // ZOID--don't draw if the power up has unlimited time (999 
seconds)
+
+   // ZOID--don't draw if the power up has unlimited time
// This is true of the CTF flags
-   if ( t <= 0 || t >= 999000 ) {
+   if ( ps->powerups[ i ] == INT_MAX ) {
+   continue;
+   }
+
+   t = ps->powerups[ i ] - cg.time;
+   if ( t <= 0 ) {
continue;
}
 
diff --git a/SP/code/cgame/cg_draw.c b/SP/code/cgame/cg_draw.c
index 2d0d90f..2a331fc 100644
--- a/SP/code/cgame/cg_draw.c
+++ b/SP/code/cgame/cg_draw.c
@@ -1395,10 +1395,15 @@ static float CG_DrawPowerups( float y ) {
if ( !ps->powerups[ i ] ) {
continue;
}
-   t = ps->powerups[ i ] - cg.time;
-   // ZOID--don't draw if the power up has unlimited time (999 
seconds)
+
+   // ZOID--don't draw if the power up has unlimited time
// This is true of the CTF flags
-   if ( t < 0 || t > 999000 ) {
+   if ( ps->powerups[ i ] == INT_MAX ) {
+   continue;
+   }
+
+   t = ps->powerups[ i ] - cg.time;
+   if ( t <= 0 ) {
continue;
}
 
diff --git a/SP/code/cgame/cg_newdraw.c b/SP/code/cgame/cg_newdraw.c
index ed93c30..c5ec4cc 100644
--- a/SP/code/cgame/cg_newdraw.c
+++ b/SP/code/cgame/cg_newdraw.c
@@ -1358,10 +1358,15 @@ static void CG_DrawAreaPowerUp( rectDef_t *rect, int 
align, float spacing, int f
if ( !ps->powerups[ i ] ) {
continue;
}
-   t = ps->powerups[ i ] - cg.time;
-   // ZOID--don't draw if the power up has unlimited time (999 
seconds)
+
+   // ZOID--don't draw if the power up has unlimited time
// This is true of the CTF flags
-   if ( t <= 0 || t >= 999000 ) {
+   if ( ps->powerups[ i ] == INT_MAX ) {
+   continue;
+   }
+
+   t = ps->powerups[ i ] - cg.time;
+   if ( t <= 0 ) {
continue;
}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 37/89: All: Allow spectators to use noclip

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit f082d803b2903055d9790cd2a3676f5e9b51378e
Author: MAN-AT-ARMS 
Date:   Tue Jul 18 14:02:45 2017 -0400

All: Allow spectators to use noclip
---
 MP/code/game/g_active.c | 7 ++-
 SP/code/game/g_active.c | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/MP/code/game/g_active.c b/MP/code/game/g_active.c
index df01504..edada51 100644
--- a/MP/code/game/g_active.c
+++ b/MP/code/game/g_active.c
@@ -372,7 +372,12 @@ void SpectatorThink( gentity_t *ent, usercmd_t *ucmd ) {
client = ent->client;
 
if ( client->sess.spectatorState != SPECTATOR_FOLLOW ) {
-   client->ps.pm_type = PM_SPECTATOR;
+   if ( client->noclip ) {
+   client->ps.pm_type = PM_NOCLIP;
+   } else {
+   client->ps.pm_type = PM_SPECTATOR;
+   }
+
client->ps.speed = 400; // faster than normal
if ( client->ps.sprintExertTime ) {
client->ps.speed *= 3;  // (SA) allow sprint in 
free-cam mode
diff --git a/SP/code/game/g_active.c b/SP/code/game/g_active.c
index 23e9fb0..b4200ef 100644
--- a/SP/code/game/g_active.c
+++ b/SP/code/game/g_active.c
@@ -372,7 +372,12 @@ void SpectatorThink( gentity_t *ent, usercmd_t *ucmd ) {
client = ent->client;
 
if ( client->sess.spectatorState != SPECTATOR_FOLLOW ) {
-   client->ps.pm_type = PM_SPECTATOR;
+   if ( client->noclip ) {
+   client->ps.pm_type = PM_NOCLIP;
+   } else {
+   client->ps.pm_type = PM_SPECTATOR;
+   }
+
client->ps.speed = 400; // faster than normal
if ( client->ps.sprintExertTime ) {
client->ps.speed *= 3;  // (SA) allow sprint in 
free-cam mode

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 38/89: All: Split G_AddRandomBot into multiple functions

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 7f04fb1f7b199494da6f9a9d7d87ab1f5162ab7c
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 11:29:36 2017 -0400

All: Split G_AddRandomBot into multiple functions
---
 MP/code/game/g_bot.c | 127 ++-
 SP/code/game/g_bot.c | 127 ++-
 2 files changed, 152 insertions(+), 102 deletions(-)

diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index 1505c1e..524b4b8 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -151,72 +151,97 @@ static void PlayerIntroSound( const char *modelAndSkin ) {
 
 /*
 ===
-G_AddRandomBot
+G_CountBotPlayersByName
+
+Returns number of bots with name on specified team or whole server if team is 
-1.
 ===
 */
-void G_AddRandomBot( int team ) {
-   int i, n, num, skill;
-   char*value, netname[36], *teamstr;
+int G_CountBotPlayersByName( const char *name, int team ) {
+   int i, num;
gclient_t   *cl;
 
num = 0;
-   for ( n = 0; n < g_numBots ; n++ ) {
-   value = Info_ValueForKey( g_botInfos[n], "name" );
-   //
-   for ( i = 0 ; i < g_maxclients.integer ; i++ ) {
-   cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
-   continue;
-   }
-   if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
-   continue;
-   }
-   if ( team >= 0 && cl->sess.sessionTeam != team ) {
-   continue;
-   }
-   if ( !Q_stricmp( value, cl->pers.netname ) ) {
-   break;
-   }
+   for ( i=0 ; i< g_maxclients.integer ; i++ ) {
+   cl = level.clients + i;
+   if ( cl->pers.connected != CON_CONNECTED ) {
+   continue;
}
-   if ( i >= g_maxclients.integer ) {
-   num++;
+   if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
+   continue;
+   }
+   if ( team >= 0 && cl->sess.sessionTeam != team ) {
+   continue;
}
+   if ( name && Q_stricmp( name, cl->pers.netname ) ) {
+   continue;
+   }
+   num++;
}
-   num = random() * num;
+   return num;
+}
+
+/*
+===
+G_SelectRandomBotInfo
+
+Get random unused bot info on team or whole server if team is -1.
+===
+*/
+int G_SelectRandomBotInfo( int team ) {
+   int selection[MAX_BOTS];
+   int n, num;
+   char*value;
+
+   num = 0;
for ( n = 0; n < g_numBots ; n++ ) {
value = Info_ValueForKey( g_botInfos[n], "name" );
//
-   for ( i = 0 ; i < g_maxclients.integer ; i++ ) {
-   cl = level.clients + i;
-   if ( cl->pers.connected != CON_CONNECTED ) {
-   continue;
-   }
-   if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
-   continue;
-   }
-   if ( team >= 0 && cl->sess.sessionTeam != team ) {
-   continue;
-   }
-   if ( !Q_stricmp( value, cl->pers.netname ) ) {
+   if ( G_CountBotPlayersByName( value, team ) == 0 ) {
+   selection[num++] = n;
+
+   if ( num == MAX_BOTS ) {
break;
}
}
-   if ( i >= g_maxclients.integer ) {
-   num--;
-   if ( num <= 0 ) {
-   skill = trap_Cvar_VariableIntegerValue( 
"g_spSkill" );
-   if ( team == TEAM_RED ) {
-   teamstr = "red";
-   } else if ( team == TEAM_BLUE ) {
-   teamstr = "blue";
-   } else { teamstr = "";}
-   Q_strncpyz(netname, value, sizeof(netname));
-   Q_CleanStr( netname );
-   trap_SendConsoleCommand( EXEC_INSERT, va( 
"addbot %s %i %s %i\n", netname, skill, teamstr, 0 ) );
-   return;
-   }
-   }
}
+
+   if ( num > 0 ) {
+   num = random() * ( num - 1 );
+   return selection[num];
+   }
+
+   return -1;
+}
+

[iortcw] 39/89: All: Make 'addbot random' command select a random bot info

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 86168c61bbb0539163c17e0cf7970ea4a88161cc
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 11:47:18 2017 -0400

All: Make 'addbot random' command select a random bot info
---
 MP/code/game/g_bot.c | 66 ++--
 SP/code/game/g_bot.c | 62 
 2 files changed, 96 insertions(+), 32 deletions(-)

diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index 524b4b8..6da033d 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -500,8 +500,10 @@ qboolean G_BotConnect( int clientNum, qboolean restart ) {
 G_AddBot
 ===
 */
-static void G_AddBot( const char *name, float skill, const char *team, int 
delay ) {
-   int clientNum;
+static void G_AddBot( const char *name, int skill, const char *team, int delay 
) {
+   int clientNum;
+   int teamNum;
+   int botinfoNum;
char*botinfo;
char*key;
char*s;
@@ -517,8 +519,50 @@ static void G_AddBot( const char *name, float skill, const 
char *team, int delay
return;
}
 
+   // set default team
+   if( !team || !*team ) {
+   if( g_gametype.integer >= GT_TEAM ) {
+   if( PickTeam(clientNum) == TEAM_RED) {
+   team = "red";
+   }
+   else {
+   team = "blue";
+   }
+   }
+   else {
+   team = "free";
+   }
+   }
+
// get the botinfo from bots.txt
-   botinfo = G_GetBotInfoByName( name );
+   if ( Q_stricmp( name, "random" ) == 0 ) {
+   if ( Q_stricmp( team, "red" ) == 0 || Q_stricmp( team, "r" ) == 
0 ) {
+   teamNum = TEAM_RED;
+   }
+   else if ( Q_stricmp( team, "blue" ) == 0 || Q_stricmp( team, 
"b" ) == 0 ) {
+   teamNum = TEAM_BLUE;
+   }
+   else if ( !Q_stricmp( team, "spectator" ) || !Q_stricmp( team, 
"s" ) ) {
+   teamNum = TEAM_SPECTATOR;
+   }
+   else {
+   teamNum = TEAM_FREE;
+   }
+
+   botinfoNum = G_SelectRandomBotInfo( teamNum );
+
+   if ( botinfoNum < 0 ) {
+   G_Printf( S_COLOR_YELLOW "WARNING: Cannot add random 
bot: all bot types in use on team '%s'.\n", team );
+   trap_BotFreeClient( clientNum );
+   return;
+   }
+
+   botinfo = G_GetBotInfoByNumber( botinfoNum );
+   }
+   else {
+   botinfo = G_GetBotInfoByName( name );
+   }
+
if ( !botinfo ) {
G_Printf( S_COLOR_RED "Error: Bot '%s' not defined\n", name );
trap_BotFreeClient( clientNum );
@@ -535,7 +579,8 @@ static void G_AddBot( const char *name, float skill, const 
char *team, int delay
Info_SetValueForKey( userinfo, "name", botname );
Info_SetValueForKey( userinfo, "rate", "25000" );
Info_SetValueForKey( userinfo, "snaps", "20" );
-   Info_SetValueForKey( userinfo, "skill", va("%.2f", skill) );
+   Info_SetValueForKey( userinfo, "skill", va("%i", skill) );
+   Info_SetValueForKey( userinfo, "teampref", team );
 
if ( skill == 1 ) {
Info_SetValueForKey( userinfo, "handicap", "50" );
@@ -574,19 +619,6 @@ static void G_AddBot( const char *name, float skill, const 
char *team, int delay
}
Info_SetValueForKey( userinfo, "characterfile", s );
 
-   if ( !team || !*team ) {
-   if ( g_gametype.integer == GT_TEAM || g_gametype.integer == 
GT_CTF ) {
-   if ( PickTeam( clientNum ) == TEAM_RED ) {
-   team = "red";
-   } else {
-   team = "blue";
-   }
-   } else {
-   team = "red";
-   }
-   }
-   Info_SetValueForKey( userinfo, "teampref", team );
-
// register the userinfo
trap_SetUserinfo( clientNum, userinfo );
 
diff --git a/SP/code/game/g_bot.c b/SP/code/game/g_bot.c
index 814cb7a..d32d5f4 100644
--- a/SP/code/game/g_bot.c
+++ b/SP/code/game/g_bot.c
@@ -502,7 +502,9 @@ G_AddBot
 ===
 */
 static void G_AddBot( const char *name, int skill, const char *team, int delay 
) {
-   int clientNum;
+   int clientNum;
+   int teamNum;
+   int botinfoNum;
char*botinfo;
char*key;
char*s;
@@ -518,8 +520,50 @@ static void G_AddBot( const char *name, int 

[iortcw] 40/89: All: Fix random bot not looking for bots by funname

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit a391173a06cee3267c9bbdf64b35875a51553cbd
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 11:51:19 2017 -0400

All: Fix random bot not looking for bots by funname
---
 MP/code/game/g_bot.c | 7 +--
 SP/code/game/g_bot.c | 5 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index 6da033d..e9d7dab 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -194,7 +194,10 @@ int G_SelectRandomBotInfo( int team ) {
 
num = 0;
for ( n = 0; n < g_numBots ; n++ ) {
-   value = Info_ValueForKey( g_botInfos[n], "name" );
+   value = Info_ValueForKey( g_botInfos[n], "funname" );
+   if ( !value[0] ) {
+   value = Info_ValueForKey( g_botInfos[n], "name" );
+   }
//
if ( G_CountBotPlayersByName( value, team ) == 0 ) {
selection[num++] = n;
@@ -579,7 +582,7 @@ static void G_AddBot( const char *name, int skill, const 
char *team, int delay )
Info_SetValueForKey( userinfo, "name", botname );
Info_SetValueForKey( userinfo, "rate", "25000" );
Info_SetValueForKey( userinfo, "snaps", "20" );
-   Info_SetValueForKey( userinfo, "skill", va("%i", skill) );
+   Info_SetValueForKey( userinfo, "skill", va( "%i", skill ) );
Info_SetValueForKey( userinfo, "teampref", team );
 
if ( skill == 1 ) {
diff --git a/SP/code/game/g_bot.c b/SP/code/game/g_bot.c
index d32d5f4..3d7ef3c 100644
--- a/SP/code/game/g_bot.c
+++ b/SP/code/game/g_bot.c
@@ -195,7 +195,10 @@ int G_SelectRandomBotInfo( int team ) {
 
num = 0;
for ( n = 0; n < g_numBots ; n++ ) {
-   value = Info_ValueForKey( g_botInfos[n], "name" );
+   value = Info_ValueForKey( g_botInfos[n], "funname" );
+   if ( !value[0] ) {
+   value = Info_ValueForKey( g_botInfos[n], "name" );
+   }
//
if ( G_CountBotPlayersByName( value, team ) == 0 ) {
selection[num++] = n;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 32/89: All: Scale the fadebox in UI when using cg_fixedAspect 2 (wide)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 87b51011d43facf2cdb86ca4e67259b219ea486f
Author: MAN-AT-ARMS 
Date:   Mon Jul 10 13:26:48 2017 -0400

All: Scale the fadebox in UI when using cg_fixedAspect 2 (wide)
---
 MP/code/ui/ui_shared.c | 16 ++--
 SP/code/ui/ui_shared.c | 16 ++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/MP/code/ui/ui_shared.c b/MP/code/ui/ui_shared.c
index ca40216..31128c1 100644
--- a/MP/code/ui/ui_shared.c
+++ b/MP/code/ui/ui_shared.c
@@ -793,8 +793,20 @@ void Window_Paint( Window *w, float fadeAmount, float 
fadeClamp, float fadeCycle
if ( w->background ) {
Fade( >flags, >backColor[3], fadeClamp, 
>nextTime, fadeCycle, qtrue, fadeAmount );
DC->setColor( w->backColor );
-   DC->drawHandlePic( fillRect.x, fillRect.y, fillRect.w, 
fillRect.h, w->background );
-   DC->setColor( NULL );
+   if ( ui_fixedAspect.integer == 2 ) {
+   if ( DC->glconfig.vidWidth * 480 > 
DC->glconfig.vidHeight * 640 ) {
+   // HACK ... stretch fadebox when using 
widescreen
+   if ( !Q_stricmpn( w->name, "fadebox", 7 
) ) {
+   
UI_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
+   DC->drawHandlePic( fillRect.x, 
fillRect.y, fillRect.w, fillRect.h, w->background );
+   DC->setColor( NULL );
+   }
+   }
+   UI_SetScreenPlacement(PLACE_CENTER, 
PLACE_CENTER);
+   } else {
+   DC->drawHandlePic( fillRect.x, fillRect.y, 
fillRect.w, fillRect.h, w->background );
+   DC->setColor( NULL );
+   }
} else {
DC->fillRect( fillRect.x, fillRect.y, fillRect.w, 
fillRect.h, w->backColor );
}
diff --git a/SP/code/ui/ui_shared.c b/SP/code/ui/ui_shared.c
index 5fff5c4..c2a0450 100644
--- a/SP/code/ui/ui_shared.c
+++ b/SP/code/ui/ui_shared.c
@@ -846,8 +846,20 @@ void Window_Paint( Window *w, float fadeAmount, float 
fadeClamp, float fadeCycle
if ( w->background ) {
Fade( >flags, >backColor[3], fadeClamp, 
>nextTime, fadeCycle, qtrue, fadeAmount );
DC->setColor( w->backColor );
-   DC->drawHandlePic( fillRect.x, fillRect.y, fillRect.w, 
fillRect.h, w->background );
-   DC->setColor( NULL );
+   if ( ui_fixedAspect.integer == 2 ) {
+   if ( DC->glconfig.vidWidth * 480 > 
DC->glconfig.vidHeight * 640 ) {
+   // HACK ... stretch fadebox when using 
widescreen
+   if ( !Q_stricmpn( w->name, "fadebox", 7 
) ) {
+   
UI_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
+   DC->drawHandlePic( fillRect.x, 
fillRect.y, fillRect.w, fillRect.h, w->background );
+   DC->setColor( NULL );
+   }
+   }
+   UI_SetScreenPlacement(PLACE_CENTER, 
PLACE_CENTER);
+   } else {
+   DC->drawHandlePic( fillRect.x, fillRect.y, 
fillRect.w, fillRect.h, w->background );
+   DC->setColor( NULL );
+   }
} else {
DC->fillRect( fillRect.x, fillRect.y, fillRect.w, 
fillRect.h, w->backColor );
}

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 42/89: All: Fix not adding random bot when all bot info are in use on team

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 03d2032770b0445684039863d9b1f835dbeb158d
Author: MAN-AT-ARMS 
Date:   Wed Jul 19 12:15:23 2017 -0400

All: Fix not adding random bot when all bot info are in use on team
---
 MP/code/game/g_bot.c | 17 +
 SP/code/game/g_bot.c | 17 +
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/MP/code/game/g_bot.c b/MP/code/game/g_bot.c
index e594e86..f97a53c 100644
--- a/MP/code/game/g_bot.c
+++ b/MP/code/game/g_bot.c
@@ -184,22 +184,31 @@ int G_CountBotPlayersByName( const char *name, int team ) 
{
 ===
 G_SelectRandomBotInfo
 
-Get random unused bot info on team or whole server if team is -1.
+Get random least used bot info on team or whole server if team is -1.
 ===
 */
 int G_SelectRandomBotInfo( int team ) {
int selection[MAX_BOTS];
int n, num;
+   int count, bestCount;
char*value;
 
num = 0;
+   bestCount = MAX_CLIENTS;
for ( n = 0; n < g_numBots ; n++ ) {
value = Info_ValueForKey( g_botInfos[n], "funname" );
if ( !value[0] ) {
value = Info_ValueForKey( g_botInfos[n], "name" );
}
//
-   if ( G_CountBotPlayersByName( value, team ) == 0 ) {
+   count = G_CountBotPlayersByName( value, team );
+
+   if ( count < bestCount ) {
+   bestCount = count;
+   num = 0;
+   }
+
+   if ( count == bestCount ) {
selection[num++] = n;
 
if ( num == MAX_BOTS ) {
@@ -228,7 +237,7 @@ void G_AddRandomBot( int team ) {
n = G_SelectRandomBotInfo( team );
 
if ( n < 0 ) {
-   // all bot types are in use on team
+   // no bot info available
return;
}
 
@@ -555,7 +564,7 @@ static void G_AddBot( const char *name, int skill, const 
char *team, int delay )
botinfoNum = G_SelectRandomBotInfo( teamNum );
 
if ( botinfoNum < 0 ) {
-   G_Printf( S_COLOR_YELLOW "WARNING: Cannot add random 
bot: all bot types in use on team '%s'.\n", team );
+   G_Printf( S_COLOR_RED "Error: Cannot add random bot, no 
bot info available.\n" );
trap_BotFreeClient( clientNum );
return;
}
diff --git a/SP/code/game/g_bot.c b/SP/code/game/g_bot.c
index f2343e9..370f3bb 100644
--- a/SP/code/game/g_bot.c
+++ b/SP/code/game/g_bot.c
@@ -185,22 +185,31 @@ int G_CountBotPlayersByName( const char *name, int team ) 
{
 ===
 G_SelectRandomBotInfo
 
-Get random unused bot info on team or whole server if team is -1.
+Get random least used bot info on team or whole server if team is -1.
 ===
 */
 int G_SelectRandomBotInfo( int team ) {
int selection[MAX_BOTS];
int n, num;
+   int count, bestCount;
char*value;
 
num = 0;
+   bestCount = MAX_CLIENTS;
for ( n = 0; n < g_numBots ; n++ ) {
value = Info_ValueForKey( g_botInfos[n], "funname" );
if ( !value[0] ) {
value = Info_ValueForKey( g_botInfos[n], "name" );
}
//
-   if ( G_CountBotPlayersByName( value, team ) == 0 ) {
+   count = G_CountBotPlayersByName( value, team );
+
+   if ( count < bestCount ) {
+   bestCount = count;
+   num = 0;
+   }
+
+   if ( count == bestCount ) {
selection[num++] = n;
 
if ( num == MAX_BOTS ) {
@@ -229,7 +238,7 @@ void G_AddRandomBot( int team ) {
n = G_SelectRandomBotInfo( team );
 
if ( n < 0 ) {
-   // all bot types are in use on team
+   // no bot info available
return;
}
 
@@ -556,7 +565,7 @@ static void G_AddBot( const char *name, int skill, const 
char *team, int delay )
botinfoNum = G_SelectRandomBotInfo( teamNum );
 
if ( botinfoNum < 0 ) {
-   G_Printf( S_COLOR_YELLOW "WARNING: Cannot add random 
bot: all bot types in use on team '%s'.\n", team );
+   G_Printf( S_COLOR_RED "Error: Cannot add random bot, no 
bot info available.\n" );
trap_BotFreeClient( clientNum );
return;
}

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org

[iortcw] 27/89: All: Rename variables for QVM 'dynamic' memory

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit bf4d40075671a225326d46b9597b0fad76211ccd
Author: Zack Middleton 
Date:   Wed Jun 21 20:46:47 2017 -0500

All: Rename variables for QVM 'dynamic' memory

vm->dataAlloc conflicts with a change made to ioq3. So rename it and
other related variables to heapAlloc etc.
---
 MP/code/qcommon/vm.c   | 36 ++--
 MP/code/qcommon/vm_local.h |  6 +++---
 SP/code/qcommon/vm.c   | 36 ++--
 SP/code/qcommon/vm_local.h |  6 +++---
 4 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/MP/code/qcommon/vm.c b/MP/code/qcommon/vm.c
index 5cf2c84..f3b04a0 100644
--- a/MP/code/qcommon/vm.c
+++ b/MP/code/qcommon/vm.c
@@ -446,7 +446,7 @@ vmHeader_t *VM_LoadQVM( vm_t *vm, qboolean alloc, qboolean 
unpure)
dataLength = header.h->dataLength + header.h->litLength +
header.h->bssLength;
 
-   vm->dataAlloc = vm->dataLength = dataLength - PROGRAM_STACK_SIZE;
+   vm->heapAlloc = vm->heapLength = dataLength - PROGRAM_STACK_SIZE;
 
dataLength += vm_minQvmHunkMegs->integer * 1024 * 1024;
 
@@ -706,7 +706,7 @@ vm_t *VM_Create( const char *module, intptr_t 
(*systemCalls)(intptr_t *),
vm->stackBottom = vm->programStack - PROGRAM_STACK_SIZE;
 
// allocate temporary memory down from the bottom of the stack
-   vm->dataAllocTop = vm->stackBottom;
+   vm->heapAllocTop = vm->stackBottom;
 
Com_Printf("%s loaded in %d bytes on the hunk\n", module, remaining - 
Hunk_MemoryRemaining());
 
@@ -1002,10 +1002,10 @@ void VM_VmInfo_f( void ) {
Com_Printf( "code length : %7i\n", vm->codeLength );
Com_Printf( "table length: %7i\n", vm->instructionCount*4 );
Com_Printf( "data length : %7i\n", vm->dataMask + 1 );
-   Com_Printf( "total memory: %7i\n", vm->stackBottom - 
vm->dataLength );
-   Com_Printf( "free memory : %7i\n", vm->dataAllocTop - 
vm->dataAlloc );
-   Com_Printf( "used permanent memory: %7i\n", vm->dataAlloc - 
vm->dataLength );
-   Com_Printf( "used temporary memory: %7i\n", vm->stackBottom 
- vm->dataAllocTop );
+   Com_Printf( "total memory: %7i\n", vm->stackBottom - 
vm->heapLength );
+   Com_Printf( "free memory : %7i\n", vm->heapAllocTop - 
vm->heapAlloc );
+   Com_Printf( "used permanent memory: %7i\n", vm->heapAlloc - 
vm->heapLength );
+   Com_Printf( "used temporary memory: %7i\n", vm->stackBottom 
- vm->heapAllocTop );
}
 }
 
@@ -1068,19 +1068,19 @@ unsigned VM_GetTempMemory( vm_t *vm, int size, const 
void *initData ) {
// align addresses
allocSize = ( size + 31 ) & ~31;
 
-   if ( vm->dataAllocTop - allocSize <= vm->dataAlloc ) {
+   if ( vm->heapAllocTop - allocSize <= vm->heapAlloc ) {
return 0;
}
 
-   vm->dataAllocTop -= allocSize;
+   vm->heapAllocTop -= allocSize;
 
if ( initData ) {
-   Com_Memcpy( vm->dataBase + vm->dataAllocTop, initData, size );
+   Com_Memcpy( vm->dataBase + vm->heapAllocTop, initData, size );
} else {
-   Com_Memset( vm->dataBase + vm->dataAllocTop, 0, size );
+   Com_Memset( vm->dataBase + vm->heapAllocTop, 0, size );
}
 
-   return vm->dataAllocTop;
+   return vm->heapAllocTop;
 }
 
 /*
@@ -1100,17 +1100,17 @@ void VM_FreeTempMemory( vm_t *vm, unsigned qvmPointer, 
int size, void *outData )
// align addresses
allocSize = ( size + 31 ) & ~31;
 
-   if ( vm->dataAllocTop + allocSize > vm->stackBottom ) {
+   if ( vm->heapAllocTop + allocSize > vm->stackBottom ) {
Com_Error( ERR_DROP, "Tried to free too much QVM temporary 
memory!");
}
 
if ( outData ) {
-   Com_Memcpy( outData, vm->dataBase + vm->dataAllocTop, size );
+   Com_Memcpy( outData, vm->dataBase + vm->heapAllocTop, size );
}
 
-   Com_Memset( vm->dataBase + vm->dataAllocTop, 0, size );
+   Com_Memset( vm->dataBase + vm->heapAllocTop, 0, size );
 
-   vm->dataAllocTop += allocSize;
+   vm->heapAllocTop += allocSize;
 }
 
 #if 0 // ZTM: new unused code for allocating unfreeable memory in dlls and 
qvms.
@@ -1126,13 +1126,13 @@ unsigned int QVM_Alloc( vm_t *vm, int size ) {
// align addresses
allocSize = ( size + 31 ) & ~31;
 
-   if ( vm->dataAlloc + allocSize > vm->dataAllocTop ) {
+   if ( vm->heapAlloc + allocSize > vm->heapAllocTop ) {
Com_Error( ERR_DROP, "QVM_Alloc: %s failed on allocation of %i 
bytes", vm->name, size );
return 0;
}
 
-   pointer = vm->dataAlloc;
-   vm->dataAlloc += allocSize;
+   pointer = 

[iortcw] 28/89: All: Allow unaligned load/store in QVM interpreter/x86 compiler

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit d1144d2200e8f73ba7c89bd5dbd8d347b532479f
Author: ec- 
Date:   Wed Mar 15 11:42:58 2017 +0200

All: Allow unaligned load/store in QVM interpreter/x86 compiler
---
 MP/code/qcommon/vm.c |  8 +---
 MP/code/qcommon/vm_interpreted.c | 14 +++---
 MP/code/qcommon/vm_local.h   |  1 +
 MP/code/qcommon/vm_x86.c |  8 
 SP/code/qcommon/vm.c |  8 +---
 SP/code/qcommon/vm_interpreted.c | 14 +++---
 SP/code/qcommon/vm_local.h   |  1 +
 SP/code/qcommon/vm_x86.c |  8 
 8 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/MP/code/qcommon/vm.c b/MP/code/qcommon/vm.c
index f3b04a0..e37cce9 100644
--- a/MP/code/qcommon/vm.c
+++ b/MP/code/qcommon/vm.c
@@ -457,13 +457,15 @@ vmHeader_t *VM_LoadQVM( vm_t *vm, qboolean alloc, 
qboolean unpure)
if(alloc)
{
// allocate zero filled space for initialized and uninitialized 
data
-   vm->dataBase = Hunk_Alloc(dataLength, h_high);
+   // leave some space beyond data mask so we can secure all mask 
operations
+   vm->dataAlloc = dataLength + 4;
+   vm->dataBase = Hunk_Alloc(vm->dataAlloc, h_high);
vm->dataMask = dataLength - 1;
}
else
{
// clear the data, but make sure we're not clearing more than 
allocated
-   if(vm->dataMask + 1 != dataLength)
+   if(vm->dataAlloc != dataLength + 4)
{
VM_Free(vm);
FS_FreeFile(header.v);
@@ -473,7 +475,7 @@ vmHeader_t *VM_LoadQVM( vm_t *vm, qboolean alloc, qboolean 
unpure)
return NULL;
}

-   Com_Memset(vm->dataBase, 0, dataLength);
+   Com_Memset(vm->dataBase, 0, vm->dataAlloc);
}
 
// copy the intialized data
diff --git a/MP/code/qcommon/vm_interpreted.c b/MP/code/qcommon/vm_interpreted.c
index f630d05..cb86a08 100644
--- a/MP/code/qcommon/vm_interpreted.c
+++ b/MP/code/qcommon/vm_interpreted.c
@@ -436,31 +436,31 @@ nextInstruction2:
return 0;
}
 #endif
-   r0 = opStack[opStackOfs] = *(int *) [r0 & 
dataMask & ~3 ];
+   r0 = opStack[opStackOfs] = *(int *) [ r0 & 
dataMask ];
goto nextInstruction2;
case OP_LOAD2:
-   r0 = opStack[opStackOfs] = *(unsigned short *)[ 
r0&~1 ];
+   r0 = opStack[opStackOfs] = *(unsigned short *)[ 
r0 & dataMask ];
goto nextInstruction2;
case OP_LOAD1:
-   r0 = opStack[opStackOfs] = image[ r0 ];
+   r0 = opStack[opStackOfs] = image[ r0 & dataMask ];
goto nextInstruction2;
 
case OP_STORE4:
-   *(int *)[ r1&(dataMask & ~3) ] = r0;
+   *(int *)[ r1 & dataMask ] = r0;
opStackOfs -= 2;
goto nextInstruction;
case OP_STORE2:
-   *(short *)[ r1&(dataMask & ~1) ] = r0;
+   *(short *)[ r1 & dataMask ] = r0;
opStackOfs -= 2;
goto nextInstruction;
case OP_STORE1:
-   image[ r1 ] = r0;
+   image[ r1 & dataMask ] = r0;
opStackOfs -= 2;
goto nextInstruction;
 
case OP_ARG:
// single byte offset from programStack
-   *(int *)[ (codeImage[programCounter] + 
programStack)&~3 ] = r0;
+   *(int *)[ (codeImage[programCounter] + 
programStack) & dataMask ] = r0;
opStackOfs--;
programCounter += 1;
goto nextInstruction;
diff --git a/MP/code/qcommon/vm_local.h b/MP/code/qcommon/vm_local.h
index d1b60c5..4e9dab9 100644
--- a/MP/code/qcommon/vm_local.h
+++ b/MP/code/qcommon/vm_local.h
@@ -170,6 +170,7 @@ struct vm_s {
 
byte*dataBase;
int dataMask;
+   int dataAlloc;  // actually 
allocated
 
int heapLength; // length of 
QVMs data
int heapAlloc;  // QVM's 
current allocate point
diff --git a/MP/code/qcommon/vm_x86.c b/MP/code/qcommon/vm_x86.c
index 9ee2679..2435a6e 100644
--- a/MP/code/qcommon/vm_x86.c
+++ b/MP/code/qcommon/vm_x86.c
@@ -790,7 +790,7 @@ qboolean ConstOptimize(vm_t *vm, int callProcOfsSyscall)
return qtrue;
 
case OP_STORE4:
-

[iortcw] 29/89: All: Add some missing newlines to printfs

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 96e253cc5757eeeae544755e6dbbc9922884311a
Author: Zack Middleton 
Date:   Wed Jun 21 21:04:53 2017 -0500

All: Add some missing newlines to printfs
---
 MP/code/cgame/cg_weapons.c| 4 ++--
 MP/code/game/ai_cast_script_actions.c | 6 +++---
 SP/code/cgame/cg_weapons.c| 4 ++--
 SP/code/game/ai_cast_script_actions.c | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MP/code/cgame/cg_weapons.c b/MP/code/cgame/cg_weapons.c
index af8930b..5a2cae6 100644
--- a/MP/code/cgame/cg_weapons.c
+++ b/MP/code/cgame/cg_weapons.c
@@ -1040,7 +1040,7 @@ static qboolean CG_ParseWeaponConfig( const char 
*filename, weaponInfo_t *wi ) {
}
 
if ( i != MAX_WP_ANIMATIONS ) {
-   CG_Printf( "Error parsing weapon animation file: %s", filename 
);
+   CG_Printf( "Error parsing weapon animation file: %s\n", 
filename );
return qfalse;
}
 
@@ -1112,7 +1112,7 @@ void CG_RegisterWeapon( int weaponNum ) {
//  ie. every weapon and it's associated 
effects/parts/sounds etc. are loaded for every level.
// This was turned off when we started (the "only load what the 
level calls for" thing) because when
// DM does a "give all" and fires, he doesn't want to wait for 
everything to load.  So perhaps a "cacheallweaps" or something.
-// CG_Printf( "Couldn't register weapon model %i (unable to load 
view model)", weaponNum );
+// CG_Printf( "Couldn't register weapon model %i (unable to load 
view model)\n", weaponNum );
 // CG_Error( "Couldn't register weapon model %i (unable to load 
view model)", weaponNum );
return;
}
diff --git a/MP/code/game/ai_cast_script_actions.c 
b/MP/code/game/ai_cast_script_actions.c
index 39f6f4e..edbf849 100644
--- a/MP/code/game/ai_cast_script_actions.c
+++ b/MP/code/game/ai_cast_script_actions.c
@@ -887,7 +887,7 @@ qboolean AICast_ScriptAction_SetAmmo( cast_state_t *cs, 
char *params ) {
 //(SA) end
 
} else {
-// G_Printf( "--SCRIPTER WARNING-- AI Scripting: setammo: unknown 
ammo \"%s\"", params );
+// G_Printf( "--SCRIPTER WARNING-- AI Scripting: setammo: unknown 
ammo \"%s\"\n", params );
return qfalse;  // (SA) temp as scripts transition to new names
}
 
@@ -949,7 +949,7 @@ qboolean AICast_ScriptAction_SetClip( cast_state_t *cs, 
char *params ) {
}
 
} else {
-// G_Printf( "--SCRIPTER WARNING-- AI Scripting: setclip: unknown 
weapon \"%s\"", params );
+// G_Printf( "--SCRIPTER WARNING-- AI Scripting: setclip: unknown 
weapon \"%s\"\n", params );
return qfalse;  // (SA) temp as scripts transition to new names
}
 
@@ -996,7 +996,7 @@ qboolean AICast_ScriptAction_SelectWeapon( cast_state_t 
*cs, char *params ) {
g_entities[cs->entityNum].client->ps.weaponTime = 500;  
// (SA) HACK: FIXME: TODO: delay to catch initial weapon reload
}
} else {
-// G_Printf( "--SCRIPTER WARNING-- AI Scripting: selectweapon: 
unknown weapon \"%s\"", params );
+// G_Printf( "--SCRIPTER WARNING-- AI Scripting: selectweapon: 
unknown weapon \"%s\"\n", params );
return qfalse;  // (SA) temp as scripts transition to new names
 // G_Error( "AI Scripting: selectweapon: unknown weapon \"%s\"", 
params );
}
diff --git a/SP/code/cgame/cg_weapons.c b/SP/code/cgame/cg_weapons.c
index e458413..a8742ca 100644
--- a/SP/code/cgame/cg_weapons.c
+++ b/SP/code/cgame/cg_weapons.c
@@ -983,7 +983,7 @@ static qboolean CG_ParseWeaponConfig( const char *filename, 
weaponInfo_t *wi ) {
}
 
if ( i != MAX_WP_ANIMATIONS ) {
-   CG_Printf( "Error parsing weapon animation file: %s", filename 
);
+   CG_Printf( "Error parsing weapon animation file: %s\n", 
filename );
return qfalse;
}
 
@@ -1062,7 +1062,7 @@ void CG_RegisterWeapon( int weaponNum ) {
//  ie. every weapon and it's associated 
effects/parts/sounds etc. are loaded for every level.
// This was turned off when we started (the "only load what the 
level calls for" thing) because when
// DM does a "give all" and fires, he doesn't want to wait for 
everything to load.  So perhaps a "cacheallweaps" or something.
-// CG_Printf( "Couldn't register weapon model %i (unable to load 
view model)", weaponNum );
+// CG_Printf( "Couldn't register weapon model %i (unable to load 
view model)\n", weaponNum );
 // RF, I need to be able to run the game, I dont have the silencer weapon (19)
 #ifndef _DEBUG
 // CG_Error( "Couldn't register weapon model %i (unable 

[iortcw] 31/89: SP: Add a couple of missing token checks

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 2fa7c3126d065f3bf2598a5b1aa0ce7b0fce40a4
Author: MAN-AT-ARMS 
Date:   Sat Jun 24 11:21:52 2017 -0400

SP: Add a couple of missing token checks

Missed these ones in 4aad7c6
---
 SP/code/game/bg_animation.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SP/code/game/bg_animation.c b/SP/code/game/bg_animation.c
index b45d02a..9a9b117 100644
--- a/SP/code/game/bg_animation.c
+++ b/SP/code/game/bg_animation.c
@@ -1282,7 +1282,7 @@ void BG_AnimParseAnimScript( animModelInfo_t *modelInfo, 
animScriptData_t *scrip
 //(SA) // RF mod
// check for the open bracket
token = COM_ParseExt( _p, qtrue );
-   if ( !token || Q_stricmp( token, "{" ) ) {
+   if ( !token[0] || Q_stricmp( token, "{" ) ) {
BG_AnimParseError( 
"BG_AnimParseAnimScript: expected '{'" );
}
indentLevel++;
@@ -1404,7 +1404,7 @@ void BG_AnimParseAnimScript( animModelInfo_t *modelInfo, 
animScriptData_t *scrip
 //(SA) // RF mod
// check for the open bracket
token = COM_ParseExt( _p, qtrue );
-   if ( !token || Q_stricmp( token, "{" ) 
) {
+   if ( !token[0] || Q_stricmp( token, "{" 
) ) {
BG_AnimParseError( 
"BG_AnimParseAnimScript: expected '{'" );
}
indentLevel++;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 30/89: All: Don't warn when weapon cfg is missing altswitch animations

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit a868a26377904dc4f0fe94a62d87206115e16f9d
Author: Zack Middleton 
Date:   Wed Jun 21 22:10:17 2017 -0500

All: Don't warn when weapon cfg is missing altswitch animations

The parser was recently fixed to detect missing tokens. This caused
an error message for some of the default MP weapon cfgs that do not
include altswitch animations. None of the weapons actually use the
altswitch animation so disable the warning for them.

Previously the missing animations would be loaded with 0 for all
params. I just copy idle1 to them instead. Shouldn't be used in
any case.
---
 MP/code/cgame/cg_weapons.c | 10 --
 SP/code/cgame/cg_weapons.c | 10 --
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/MP/code/cgame/cg_weapons.c b/MP/code/cgame/cg_weapons.c
index 5a2cae6..79a1f82 100644
--- a/MP/code/cgame/cg_weapons.c
+++ b/MP/code/cgame/cg_weapons.c
@@ -916,7 +916,7 @@ CG_ParseWeaponConfig
read information for weapon animations (first/length/fps)
 ==
 */
-static qboolean CG_ParseWeaponConfig( const char *filename, weaponInfo_t *wi ) 
{
+static qboolean CG_ParseWeaponConfig( const char *filename, weaponInfo_t *wi, 
int weaponNum ) {
char*text_p, *prev;
int len;
int i;
@@ -977,6 +977,12 @@ static qboolean CG_ParseWeaponConfig( const char 
*filename, weaponInfo_t *wi ) {
 
token = COM_Parse( _p );   // first frame
if ( !token[0] ) {
+   // don't show warning for weapon cfg without altswitch 
that does not require it.
+   if ( i == WEAP_ALTSWITCHFROM && weapAlts[weaponNum] == 
WP_NONE ) {
+   for ( ; i < MAX_WP_ANIMATIONS  ; i++ ) {
+   Com_Memcpy( >weapAnimations[i], 
>weapAnimations[WEAP_IDLE1], sizeof( wi->weapAnimations[0] ) );
+   }
+   }
break;
}
wi->weapAnimations[i].firstFrame = atoi( token );
@@ -1122,7 +1128,7 @@ void CG_RegisterWeapon( int weaponNum ) {
 //(SA) modified.  use first person model for finding weapon config 
name, not third
if ( item->world_model[W_FP_MODEL] ) {
COM_StripFilename( item->world_model[W_FP_MODEL], path );
-   if ( !CG_ParseWeaponConfig( va( "%sweapon.cfg", path ), 
weaponInfo ) ) {
+   if ( !CG_ParseWeaponConfig( va( "%sweapon.cfg", path ), 
weaponInfo, weaponNum ) ) {
 // CG_Error( "Couldn't register weapon %i (%s) (failed to 
parse weapon.cfg)", weaponNum, path );
}
}
diff --git a/SP/code/cgame/cg_weapons.c b/SP/code/cgame/cg_weapons.c
index a8742ca..0e10f0b 100644
--- a/SP/code/cgame/cg_weapons.c
+++ b/SP/code/cgame/cg_weapons.c
@@ -859,7 +859,7 @@ CG_ParseWeaponConfig
read information for weapon animations (first/length/fps)
 ==
 */
-static qboolean CG_ParseWeaponConfig( const char *filename, weaponInfo_t *wi ) 
{
+static qboolean CG_ParseWeaponConfig( const char *filename, weaponInfo_t *wi, 
int weaponNum ) {
char*text_p, *prev;
int len;
int i;
@@ -920,6 +920,12 @@ static qboolean CG_ParseWeaponConfig( const char 
*filename, weaponInfo_t *wi ) {
 
token = COM_Parse( _p );   // first frame
if ( !token[0] ) {
+   // don't show warning for weapon cfg without altswitch 
that does not require it.
+   if ( i == WEAP_ALTSWITCHFROM && weapAlts[weaponNum] == 
WP_NONE ) {
+   for ( ; i < MAX_WP_ANIMATIONS  ; i++ ) {
+   Com_Memcpy( >weapAnimations[i], 
>weapAnimations[WEAP_IDLE1], sizeof( wi->weapAnimations[0] ) );
+   }
+   }
break;
}
wi->weapAnimations[i].firstFrame = atoi( token );
@@ -1075,7 +1081,7 @@ void CG_RegisterWeapon( int weaponNum ) {
 //(SA) modified.  use first person model for finding weapon config 
name, not third
if ( item->world_model[W_FP_MODEL] ) {
COM_StripFilename( item->world_model[W_FP_MODEL], path );
-   if ( !CG_ParseWeaponConfig( va( "%sweapon.cfg", path ), 
weaponInfo ) ) {
+   if ( !CG_ParseWeaponConfig( va( "%sweapon.cfg", path ), 
weaponInfo, weaponNum ) ) {
CG_Error( "Couldn't register weapon %i (%s) (failed to 
parse weapon.cfg)", weaponNum, path );
}
}

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list

[iortcw] 26/89: All: Don't use CVAR_PROTECTED flag for cl_renderer

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit b27e0ff69b32fd77eac23ac4c8835335c1a9bd18
Author: MAN-AT-ARMS 
Date:   Wed Jun 21 08:59:18 2017 -0400

All: Don't use CVAR_PROTECTED flag for cl_renderer
---
 MP/code/client/cl_main.c | 2 +-
 SP/code/client/cl_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
index 44511d1..605c81d 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
@@ -3693,7 +3693,7 @@ void CL_InitRef( void ) {
Com_Printf( "- Initializing Renderer \n" );
 
 #ifdef USE_RENDERER_DLOPEN
-   cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | 
CVAR_LATCH | CVAR_PROTECTED);
+   cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | 
CVAR_LATCH);
 
Com_sprintf(dllName, sizeof(dllName), "renderer_mp_%s_" ARCH_STRING 
DLL_EXT, cl_renderer->string);
 
diff --git a/SP/code/client/cl_main.c b/SP/code/client/cl_main.c
index 9558c85..2f18fd2 100644
--- a/SP/code/client/cl_main.c
+++ b/SP/code/client/cl_main.c
@@ -3356,7 +3356,7 @@ void CL_InitRef( void ) {
Com_Printf( "- Initializing Renderer \n" );
 
 #ifdef USE_RENDERER_DLOPEN
-   cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | 
CVAR_LATCH | CVAR_PROTECTED);
+   cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | 
CVAR_LATCH);
 
Com_sprintf(dllName, sizeof(dllName), "renderer_sp_%s_" ARCH_STRING 
DLL_EXT, cl_renderer->string);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 23/89: All: Add con_autochat and con_autoclear cvars

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 4006b9c8864eb4cd81ecf6eb7614a7d38e3b5044
Author: MAN-AT-ARMS 
Date:   Fri Jun 16 19:14:22 2017 -0400

All: Add con_autochat and con_autoclear cvars
---
 MP/README   | 732 
 MP/code/client/cl_console.c |   6 +-
 MP/code/client/cl_keys.c|   6 +-
 MP/code/qcommon/common.c|  11 +-
 MP/code/qcommon/qcommon.h   |   3 +
 MP/code/sys/con_tty.c   |   8 +-
 README.md   |   3 +
 SP/README   | 732 
 SP/code/client/cl_console.c |   6 +-
 SP/code/client/cl_keys.c|   6 +-
 SP/code/qcommon/common.c|  11 +-
 SP/code/qcommon/qcommon.h   |   3 +
 SP/code/sys/con_tty.c   |   8 +-
 13 files changed, 57 insertions(+), 1478 deletions(-)

diff --git a/MP/README b/MP/README
deleted file mode 100644
index c5423e1..000
--- a/MP/README
+++ /dev/null
@@ -1,732 +0,0 @@
-__
-   (_)  | |   
-_  ___  _ __| |_ _  __
-   | |/ _ \| '__| __/ __\ \ /\ / /
-   | | (_) | |  | || (__ \ V  V / 
-   |_|\___/|_|   \__\___| \_/\_/  
-   
-   
-
-The intent of this project is to provide a baseline RTCW which may be used
-for further development and fun. 
-Some of the major features currently implemented are:
-
-  * SDL backend
-  * OpenAL sound API support (multiple speaker support and better sound
-quality)
-  * Full x86_64 support
-  * VoIP support, both in-game and external support through Mumble.
-  * MinGW compilation support on Windows and cross compilation support on Linux
-  * AVI video capture of demos
-  * Much improved console autocompletion
-  * Persistent console history
-  * Colorized terminal output
-  * Optional Ogg Vorbis support
-  * Much improved QVM tools
-  * Support for various esoteric operating systems
-  * cl_guid support
-  * HTTP/FTP download redirection (using cURL)
-  * Multiuser support on Windows systems (user specific game data
-is stored in "My Documents\RTCW")
-  * PNG support
-  * Many, many bug fixes
-
-The map editor and associated compiling tools are not included. We suggest you
-use a modern copy from http://icculus.org/gtkradiant/.
-
-The original id software readme that accompanied the RTCW source release has 
been
-renamed to id-readme.txt so as to prevent confusion. Please refer to the
-web-site for updated status.
-
-
-- Compilation and installation 
-
-
-For *nix
-  1. Change to the directory containing this readme.
-  2. Run 'make'.
-
-For Windows,
-  1. Please refer to the excellent instructions here: 
- http://wiki.ioquake3.org/Building_ioquake3
-
-For Mac OS X, building a Universal Binary
-  1. Install MacOSX SDK packages from XCode.  For maximum compatibility,
- install MacOSX10.4u.sdk and MacOSX10.3.9.sdk, and MacOSX10.2.8.sdk.
-  2. Change to the directory containing this README file.
-  3. Run './make-macosx-ub.sh'
-  4. Copy the resulting iowolfmp.app or iowolfsp.app in 
/build/release-darwin-ub to your
- /Applications/iortcw folder.
-
-Installation, for *nix
-  1. Set the COPYDIR variable in the shell to be where you installed RTCW
- to. By default it will be /usr/local/games/wolf if you haven't set it.
- This is the path as used by the original Linux RTCW installer and 
subsequent
- point releases.
-  2. Run 'make copyfiles'.
-
-It is also possible to cross compile for Windows under *nix and Cygwin using 
MinGW. Your
-distribution may have mingw32 packages available. On debian/Ubuntu, you need to
-install 'mingw-w64'. Thereafter cross compiling is simply a case running
-'PLATFORM=mingw32 ARCH=x86 make' in place of 'make'. ARCH may also be set to
-x86_64.
-
-The following variables may be set, either on the command line or in
-Makefile.local:
-
-  CFLAGS - use this for custom CFLAGS
-  V  - set to show cc command line when building
-  DEFAULT_BASEDIR- extra path to search for main and such
-  BUILD_SERVER   - build the 'iowolfmpded' server binary
-  BUILD_CLIENT   - build the 'iowolfmp' or 'iowolfsp' client binary
-  BUILD_BASEGAME - build the 'main' binaries
-  BUILD_GAME_SO  - build the game shared libraries
-  BUILD_GAME_QVM - build the game qvms
-  BUILD_STANDALONE   - build binaries suited for stand-alone games
-  SERVERBIN  - rename 'iowolfmpded' server binary
-  CLIENTBIN  - rename 'iowolfmp' or 'iowolfsp' client binary
-  BASEGAME   - rename 'main'
-  BASEGAME_CFLAGS- custom CFLAGS for basegame
-  USE_OPENAL - use OpenAL where available
-  USE_OPENAL_DLOPEN  - link with 

[iortcw] 24/89: All: Only allow connectionless print/echo from server/rcon address

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit c2bba260c4832a746966b9ca0e27012a662bc064
Author: MAN-AT-ARMS 
Date:   Fri Jun 16 19:42:30 2017 -0400

All: Only allow connectionless print/echo from server/rcon address
---
 MP/code/client/cl_main.c | 18 ++
 MP/code/client/client.h  |  2 ++
 SP/code/client/cl_main.c | 19 +--
 SP/code/client/client.h  |  2 ++
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
index d479de4..44511d1 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
@@ -1968,6 +1968,7 @@ void CL_Rcon_f( void ) {
}
 
NET_SendPacket( NS_CLIENT, strlen( message ) + 1, message, to );
+   cls.rconAddress = to;
 }
 
 /*
@@ -2939,7 +2940,14 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg 
) {
 
// echo request from server
if ( !Q_stricmp( c, "echo" ) ) {
+#ifdef UPDATE_SERVER
NET_OutOfBandPrint( NS_CLIENT, from, "%s", Cmd_Argv( 1 ) );
+#else
+   // NOTE: we may have to add exceptions for auth and update 
servers
+   if ( NET_CompareAdr( from, clc.serverAddress ) || 
NET_CompareAdr( from, cls.rconAddress ) ) {
+   NET_OutOfBandPrint( NS_CLIENT, from, "%s", Cmd_Argv(1) 
);
+   }
+#endif
return;
}
 
@@ -2957,10 +2965,20 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg 
) {
 
// echo request from server
if ( !Q_stricmp( c, "print" ) ) {
+#ifdef UPDATE_SERVER
s = MSG_ReadString( msg );

Q_strncpyz( clc.serverMessage, s, sizeof( clc.serverMessage ) );
Com_Printf( "%s", s );
+#else
+   // NOTE: we may have to add exceptions for auth and update 
servers
+   if ( NET_CompareAdr( from, clc.serverAddress ) || 
NET_CompareAdr( from, cls.rconAddress ) ) {
+   s = MSG_ReadString( msg );
+ 
+   Q_strncpyz( clc.serverMessage, s, sizeof( 
clc.serverMessage ) );
+   Com_Printf( "%s", s );
+   }
+#endif
return;
}
 
diff --git a/MP/code/client/client.h b/MP/code/client/client.h
index b8ef895..2634dc0 100644
--- a/MP/code/client/client.h
+++ b/MP/code/client/client.h
@@ -384,6 +384,8 @@ typedef struct {
 
netadr_t authorizeServer;
 
+   netadr_t rconAddress;
+
// DHM - Nerve :: Auto-update Info
char autoupdateServerNames[MAX_AUTOUPDATE_SERVERS][MAX_QPATH];
netadr_t autoupdateServer;
diff --git a/SP/code/client/cl_main.c b/SP/code/client/cl_main.c
index 93bd387..9558c85 100644
--- a/SP/code/client/cl_main.c
+++ b/SP/code/client/cl_main.c
@@ -1866,6 +1866,7 @@ void CL_Rcon_f( void ) {
}
 
NET_SendPacket( NS_CLIENT, strlen( message ) + 1, message, to );
+   cls.rconAddress = to;
 }
 
 /*
@@ -2739,7 +2740,10 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg 
) {
 
// echo request from server
if ( !Q_stricmp( c, "echo" ) ) {
-   NET_OutOfBandPrint( NS_CLIENT, from, "%s", Cmd_Argv( 1 ) );
+   // NOTE: we may have to add exceptions for auth and update 
servers
+   if ( NET_CompareAdr( from, clc.serverAddress ) || 
NET_CompareAdr( from, cls.rconAddress ) ) {
+   NET_OutOfBandPrint( NS_CLIENT, from, "%s", Cmd_Argv(1) 
);
+   }
return;
}
 
@@ -2756,11 +2760,14 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg 
) {
}
 
// echo request from server
-   if ( !Q_stricmp( c, "print" ) ) {
-   s = MSG_ReadString( msg );
-   
-   Q_strncpyz( clc.serverMessage, s, sizeof( clc.serverMessage ) );
-   Com_Printf( "%s", s );
+   if ( !Q_stricmp(c, "print") ) {
+   // NOTE: we may have to add exceptions for auth and update 
servers
+   if ( NET_CompareAdr( from, clc.serverAddress ) || 
NET_CompareAdr( from, cls.rconAddress ) ) {
+   s = MSG_ReadString( msg );
+ 
+   Q_strncpyz( clc.serverMessage, s, sizeof( 
clc.serverMessage ) );
+   Com_Printf( "%s", s );
+   }
return;
}
 
diff --git a/SP/code/client/client.h b/SP/code/client/client.h
index e1528f1..e3463fc 100644
--- a/SP/code/client/client.h
+++ b/SP/code/client/client.h
@@ -370,6 +370,8 @@ typedef struct {
 
netadr_t authorizeServer;
 
+   netadr_t rconAddress;
+
// rendering info
glconfig_t glconfig;
qhandle_t charSetShader;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list

[iortcw] 25/89: All: Rend2: Remove SF_VAO_MESH

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 2d0e3445662f38575b4741a3f606f9e21751dbdd
Author: MAN-AT-ARMS 
Date:   Fri Jun 16 20:43:38 2017 -0400

All: Rend2: Remove SF_VAO_MESH
---
 MP/code/rend2/tr_light.c   |  1 -
 MP/code/rend2/tr_local.h   | 10 +-
 MP/code/rend2/tr_surface.c | 36 
 MP/code/rend2/tr_world.c   |  2 --
 SP/code/rend2/tr_light.c   |  1 -
 SP/code/rend2/tr_local.h   | 10 +-
 SP/code/rend2/tr_surface.c | 36 
 SP/code/rend2/tr_world.c   |  2 --
 8 files changed, 2 insertions(+), 96 deletions(-)

diff --git a/MP/code/rend2/tr_light.c b/MP/code/rend2/tr_light.c
index 081d724..8d350ba 100644
--- a/MP/code/rend2/tr_light.c
+++ b/MP/code/rend2/tr_light.c
@@ -114,7 +114,6 @@ void R_DlightBmodel( bmodel_t *bmodel ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
-   case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = 
mask;
break;
 
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index f1e0eb1..941849e 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -961,7 +961,6 @@ typedef enum {
SF_IQM,
SF_FLARE,
SF_ENTITY,  // beams, rails, lightning, etc that can be 
determined by entity
-   SF_VAO_MESH,
SF_VAO_MDVMESH,
 
SF_NUM_SURFACE_TYPES,
@@ -1015,7 +1014,7 @@ typedef struct
 
 #define srfVert_t_cleared(x) srfVert_t (x) = {{0, 0, 0}, {0, 0}, {0, 0}, {0, 
0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}
 
-// srfBspSurface_t covers SF_GRID, SF_TRIANGLES, SF_POLY, and SF_VAO_MESH
+// srfBspSurface_t covers SF_GRID, SF_TRIANGLES, and SF_POLY
 typedef struct srfBspSurface_s
 {
surfaceType_t surfaceType;
@@ -1038,13 +1037,6 @@ typedef struct srfBspSurface_s
int numVerts;
srfVert_t  *verts;
 
-   // BSP VBO offsets
-   int firstVert;
-   int firstIndex;
-
-   // static render data
-   vao_t  *vao;
-
// SF_GRID specific variables after here
 
// lod information, which may be different
diff --git a/MP/code/rend2/tr_surface.c b/MP/code/rend2/tr_surface.c
index 7b79e27..02b455e 100644
--- a/MP/code/rend2/tr_surface.c
+++ b/MP/code/rend2/tr_surface.c
@@ -479,35 +479,6 @@ static qboolean RB_SurfaceVaoCached(int numVerts, 
srfVert_t *verts, int numIndex
 }
 
 
-static qboolean RB_SurfaceVao(vao_t *vao, int numVerts, int numIndexes, int 
firstIndex, int dlightBits, int pshadowBits, qboolean shaderCheck)
-{
-   if (!vao)
-   {
-   return qfalse;
-   }
-
-   if (shaderCheck && !(!ShaderRequiresCPUDeforms(tess.shader) && 
!tess.shader->isSky && !tess.shader->isPortal))
-   {
-   return qfalse;
-   }
-
-   RB_CheckVao(vao);
-
-   tess.dlightBits |= dlightBits;
-   tess.pshadowBits |= pshadowBits;
-
-   RB_EndSurface();
-   RB_BeginSurface(tess.shader, tess.fogNum, tess.cubemapIndex);
-
-   backEnd.pc.c_staticVaoDraws++;
-
-   tess.numIndexes = numIndexes;
-   tess.numVertexes = numVerts;
-
-   return qtrue;
-}
-
-
 /*
 =
 RB_SurfaceTriangles
@@ -1270,12 +1241,6 @@ static void RB_SurfaceFlare( srfFlare_t *surf ) {
RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, 1.0f, 
surf->normal, 0, qtrue);
 }
 
-static void RB_SurfaceVaoMesh(srfBspSurface_t * srf)
-{
-   RB_SurfaceVao (srf->vao, srf->numVerts, srf->numIndexes, 
srf->firstIndex,
-   srf->dlightBits, srf->pshadowBits, qfalse );
-}
-
 void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface)
 {
//mdvModel_t *mdvModel;
@@ -1383,6 +1348,5 @@ void( *rb_surfaceTable[SF_NUM_SURFACE_TYPES] ) ( void * ) 
= {
( void( * ) ( void* ) )RB_IQMSurfaceAnim,   // SF_IQM,
( void( * ) ( void* ) )RB_SurfaceFlare, // SF_FLARE,
( void( * ) ( void* ) )RB_SurfaceEntity,// SF_ENTITY
-   ( void( * ) ( void* ) )RB_SurfaceVaoMesh,   // SF_VAO_MESH,
( void( * ) ( void* ) )RB_SurfaceVaoMdvMesh,// SF_VAO_MDVMESH
 };
diff --git a/MP/code/rend2/tr_world.c b/MP/code/rend2/tr_world.c
index 43ba9ff..6ac604c 100644
--- a/MP/code/rend2/tr_world.c
+++ b/MP/code/rend2/tr_world.c
@@ -219,7 +219,6 @@ static int R_DlightSurface( msurface_t *surf, int 
dlightBits ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
-   case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = 
dlightBits;
break;
 
@@ -305,7 +304,6 @@ static int R_PshadowSurface( msurface_t *surf, int 
pshadowBits ) {
case SF_FACE:
   

[iortcw] 22/89: All: Fix strncpy usage in botlib

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit fcb3a15d89cfc1df39e53ae4c22736dbd87a2e69
Author: MAN-AT-ARMS 
Date:   Fri Jun 16 18:01:23 2017 -0400

All: Fix strncpy usage in botlib
---
 MP/code/botlib/be_aas_main.c | 2 +-
 MP/code/botlib/be_ai_chat.c  | 8 
 MP/code/botlib/be_ai_goal.c  | 4 ++--
 MP/code/botlib/be_ai_weap.c  | 2 +-
 MP/code/botlib/l_log.c   | 2 +-
 MP/code/botlib/l_precomp.c   | 2 +-
 MP/code/botlib/l_script.c| 2 +-
 MP/code/botlib/l_struct.c| 2 +-
 SP/code/botlib/be_aas_main.c | 2 +-
 SP/code/botlib/be_ai_chat.c  | 8 
 SP/code/botlib/be_ai_goal.c  | 4 ++--
 SP/code/botlib/be_ai_weap.c  | 2 +-
 SP/code/botlib/l_log.c   | 2 +-
 SP/code/botlib/l_precomp.c   | 2 +-
 SP/code/botlib/l_script.c| 2 +-
 SP/code/botlib/l_struct.c| 2 +-
 16 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/MP/code/botlib/be_aas_main.c b/MP/code/botlib/be_aas_main.c
index 3683dd3..833eaf2 100644
--- a/MP/code/botlib/be_aas_main.c
+++ b/MP/code/botlib/be_aas_main.c
@@ -339,7 +339,7 @@ int AAS_LoadFiles( const char *mapname ) {
}
 
botimport.Print( PRT_MESSAGE, "loaded %s\n", aasfile );
-   strncpy( ( *aasworld ).filename, aasfile, MAX_PATH );
+   Q_strncpyz( ( *aasworld ).filename, aasfile, sizeof( ( *aasworld 
).filename ) );
return BLERR_NOERROR;
 } //end of the function AAS_LoadFiles
 //===
diff --git a/MP/code/botlib/be_ai_chat.c b/MP/code/botlib/be_ai_chat.c
index 33f925e..3511277 100644
--- a/MP/code/botlib/be_ai_chat.c
+++ b/MP/code/botlib/be_ai_chat.c
@@ -354,7 +354,7 @@ void BotQueueConsoleMessage( int chatstate, int type, char 
*message ) {
m->handle = cs->handle;
m->time = AAS_Time();
m->type = type;
-   strncpy( m->message, message, MAX_MESSAGE_SIZE );
+   Q_strncpyz( m->message, message, MAX_MESSAGE_SIZE );
m->next = NULL;
if ( cs->lastmessage ) {
cs->lastmessage->next = m;
@@ -1468,7 +1468,7 @@ int BotFindMatch( char *str, bot_match_t *match, unsigned 
long int context ) {
int i;
bot_matchtemplate_t *ms;
 
-   strncpy( match->string, str, MAX_MESSAGE_SIZE );
+   Q_strncpyz( match->string, str, MAX_MESSAGE_SIZE );
//remove any trailing enters
while ( strlen( match->string ) &&
match->string[strlen( match->string ) - 1] == '\n' )
@@ -2015,7 +2015,7 @@ bot_chat_t *BotLoadInitialChat( char *chatfile, char 
*chatname ) {
StripDoubleQuotes( token.string 
);
if ( pass && ptr ) {
chattype = 
(bot_chattype_t *) ptr;
-   strncpy( 
chattype->name, token.string, MAX_CHATTYPE_NAME );
+   Q_strncpyz( 
chattype->name, token.string, MAX_CHATTYPE_NAME );

chattype->firstchatmessage = NULL;
//add the chat type to 
the chat
chattype->next = 
chat->types;
@@ -2754,7 +2754,7 @@ void BotSetChatName( int chatstate, char *name ) {
return;
}
memset( cs->name, 0, sizeof( cs->name ) );
-   strncpy( cs->name, name, sizeof( cs->name ) );
+   strncpy( cs->name, name, sizeof( cs->name ) - 1 );
cs->name[sizeof( cs->name ) - 1] = '\0';
 } //end of the function BotSetChatName
 //===
diff --git a/MP/code/botlib/be_ai_goal.c b/MP/code/botlib/be_ai_goal.c
index b3fa965..b449c7e 100644
--- a/MP/code/botlib/be_ai_goal.c
+++ b/MP/code/botlib/be_ai_goal.c
@@ -278,7 +278,7 @@ itemconfig_t *LoadItemConfig( char *filename ) {
LibVarSet( "max_iteminfo", "128" );
}
 
-   strncpy( path, filename, MAX_PATH );
+   Q_strncpyz( path, filename, sizeof( path ) );
source = LoadSourceFile( path );
if ( !source ) {
botimport.Print( PRT_ERROR, "counldn't load %s\n", path );
@@ -307,7 +307,7 @@ itemconfig_t *LoadItemConfig( char *filename ) {
return NULL;
} //end if
StripDoubleQuotes( token.string );
-   strncpy( ii->classname, token.string, sizeof( 
ii->classname ) - 1 );
+   Q_strncpyz( ii->classname, token.string, sizeof( 
ii->classname ) );
if ( !ReadStructure( source, _struct, (char *) 
ii ) ) {
FreeMemory( ic );
FreeSource( source );
diff --git 

[iortcw] 21/89: All: Fix notarget cheat

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 415827f9de29303a35cae2ff38f9c50e55a5eb3b
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 16:33:53 2017 -0400

All: Fix notarget cheat
---
 MP/code/game/ai_dmq3.c | 4 
 SP/code/game/ai_dmq3.c | 4 
 2 files changed, 8 insertions(+)

diff --git a/MP/code/game/ai_dmq3.c b/MP/code/game/ai_dmq3.c
index 4044cb8..d0b4526 100644
--- a/MP/code/game/ai_dmq3.c
+++ b/MP/code/game/ai_dmq3.c
@@ -1455,6 +1455,10 @@ int BotFindEnemy( bot_state_t *bs, int curenemy ) {
if ( i == curenemy ) {
continue;
}
+   //if the enemy has targeting disabled
+   if (g_entities[i].flags & FL_NOTARGET) {
+   continue;
+   }
//
BotEntityInfo( i,  );
//
diff --git a/SP/code/game/ai_dmq3.c b/SP/code/game/ai_dmq3.c
index 5d0c513..8bd0c28 100644
--- a/SP/code/game/ai_dmq3.c
+++ b/SP/code/game/ai_dmq3.c
@@ -1453,6 +1453,10 @@ int BotFindEnemy( bot_state_t *bs, int curenemy ) {
if ( i == curenemy ) {
continue;
}
+   //if the enemy has targeting disabled
+   if (g_entities[i].flags & FL_NOTARGET) {
+   continue;
+   }
//
BotEntityInfo( i,  );
//

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 16/89: All: Range check client number for trap_BotUserCommand

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 5168397ea7768314bbb45495919f86431d196b01
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 14:33:40 2017 -0400

All: Range check client number for trap_BotUserCommand
---
 MP/code/server/sv_game.c | 8 +++-
 SP/code/server/sv_game.c | 8 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/MP/code/server/sv_game.c b/MP/code/server/sv_game.c
index e868901..d1204a0 100644
--- a/MP/code/server/sv_game.c
+++ b/MP/code/server/sv_game.c
@@ -485,7 +485,13 @@ intptr_t SV_GameSystemCalls( intptr_t *args ) {
case BOTLIB_GET_CONSOLE_MESSAGE:
return SV_BotGetConsoleMessage( args[1], VMA( 2 ), args[3] );
case BOTLIB_USER_COMMAND:
-   SV_ClientThink( [args[1]], VMA( 2 ) );
+   {
+   int clientNum = args[1];
+
+   if ( clientNum >= 0 && clientNum < 
sv_maxclients->integer ) {
+   SV_ClientThink( [clientNum], VMA(2) 
);
+   }
+   }
return 0;
 
case BOTLIB_AAS_ENTITY_INFO:
diff --git a/SP/code/server/sv_game.c b/SP/code/server/sv_game.c
index 9e8f379..952cddc 100644
--- a/SP/code/server/sv_game.c
+++ b/SP/code/server/sv_game.c
@@ -481,7 +481,13 @@ intptr_t SV_GameSystemCalls( intptr_t *args ) {
case BOTLIB_GET_CONSOLE_MESSAGE:
return SV_BotGetConsoleMessage( args[1], VMA( 2 ), args[3] );
case BOTLIB_USER_COMMAND:
-   SV_ClientThink( [args[1]], VMA( 2 ) );
+   {
+   int clientNum = args[1];
+
+   if ( clientNum >= 0 && clientNum < 
sv_maxclients->integer ) {
+   SV_ClientThink( [clientNum], VMA(2) 
);
+   }
+   }
return 0;
 
case BOTLIB_AAS_ENTITY_INFO:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 18/89: All: Don't copy p->org to itself in cg_particles.c

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit c91afd1855906172374123b2fb2edef8af1447c7
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 16:08:48 2017 -0400

All: Don't copy p->org to itself in cg_particles.c
---
 MP/code/cgame/cg_particles.c | 4 
 SP/code/cgame/cg_particles.c | 4 
 2 files changed, 8 deletions(-)

diff --git a/MP/code/cgame/cg_particles.c b/MP/code/cgame/cg_particles.c
index e82fec1..e89cc28 100644
--- a/MP/code/cgame/cg_particles.c
+++ b/MP/code/cgame/cg_particles.c
@@ -1038,10 +1038,6 @@ void CG_ParticleSnowFlurry( qhandle_t pshader, centity_t 
*cent ) {
 
VectorCopy( cent->currentState.origin, p->org );
 
-   p->org[0] = p->org[0];
-   p->org[1] = p->org[1];
-   p->org[2] = p->org[2];
-
p->vel[0] = p->vel[1] = 0;
 
p->accel[0] = p->accel[1] = p->accel[2] = 0;
diff --git a/SP/code/cgame/cg_particles.c b/SP/code/cgame/cg_particles.c
index 86cc3a2..fe28eb1 100644
--- a/SP/code/cgame/cg_particles.c
+++ b/SP/code/cgame/cg_particles.c
@@ -1095,10 +1095,6 @@ void CG_ParticleSnowFlurry( qhandle_t pshader, centity_t 
*cent ) {
 
VectorCopy( cent->currentState.origin, p->org );
 
-   p->org[0] = p->org[0];
-   p->org[1] = p->org[1];
-   p->org[2] = p->org[2];
-
p->vel[0] = p->vel[1] = 0;
 
p->accel[0] = p->accel[1] = p->accel[2] = 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 14/89: MP: Fix unused variable warning

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit eaedb55733a0adb4974061541ae32dcae726a5ba
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 14:23:06 2017 -0400

MP: Fix unused variable warning
---
 MP/code/game/g_cmds.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MP/code/game/g_cmds.c b/MP/code/game/g_cmds.c
index 10a03f4..0d736a3 100644
--- a/MP/code/game/g_cmds.c
+++ b/MP/code/game/g_cmds.c
@@ -1425,7 +1425,6 @@ void Cmd_CallVote_f( gentity_t *ent ) {
int i;
char arg1[MAX_STRING_TOKENS];
char arg2[MAX_STRING_TOKENS];
-   char cleanName[64];// JPW NERVE
int mask = 0;
 
if ( !g_voteFlags.integer ) {
@@ -1571,7 +1570,9 @@ void Cmd_CallVote_f( gentity_t *ent ) {
 #if 0
 // JPW NERVE
} else if ( !Q_stricmp( arg1,"kick" ) ) {
-   int i,kicknum = MAX_CLIENTS;
+   int i, kicknum = MAX_CLIENTS;
+   char cleanName[64];// JPW NERVE
+   
for ( i = 0; i < MAX_CLIENTS; i++ ) {
if ( level.clients[i].pers.connected != CON_CONNECTED ) 
{
continue;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 19/89: All: Remove unused define MAX_COMMANDARGUMENTS from be_ea.c

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 6486f3d24303d0857ffcae5c2546738ac48c8919
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 16:10:41 2017 -0400

All: Remove unused define MAX_COMMANDARGUMENTS from be_ea.c
---
 MP/code/botlib/be_ea.c | 1 -
 SP/code/botlib/be_ea.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/MP/code/botlib/be_ea.c b/MP/code/botlib/be_ea.c
index 27fd415..c00c344 100644
--- a/MP/code/botlib/be_ea.c
+++ b/MP/code/botlib/be_ea.c
@@ -45,7 +45,6 @@ If you have questions concerning this license or the 
applicable additional terms
 #include "be_ea.h"
 
 #define MAX_USERMOVE400
-#define MAX_COMMANDARGUMENTS10
 #define ACTION_JUMPEDLASTFRAME 128
 
 bot_input_t *botinputs;
diff --git a/SP/code/botlib/be_ea.c b/SP/code/botlib/be_ea.c
index d6da565..cd03f88 100644
--- a/SP/code/botlib/be_ea.c
+++ b/SP/code/botlib/be_ea.c
@@ -45,7 +45,6 @@ If you have questions concerning this license or the 
applicable additional terms
 #include "be_ea.h"
 
 #define MAX_USERMOVE400
-#define MAX_COMMANDARGUMENTS10
 #define ACTION_JUMPEDLASTFRAME 128
 
 bot_input_t *botinputs;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 20/89: All: Make bots stop attacking player after disconnect

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 71ff98baaa7cd1d817a4ae2c0e27c2dead2d5b03
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 16:22:04 2017 -0400

All: Make bots stop attacking player after disconnect
---
 MP/code/game/ai_dmq3.c | 6 +-
 SP/code/game/ai_dmq3.c | 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/MP/code/game/ai_dmq3.c b/MP/code/game/ai_dmq3.c
index 404a8f8..4044cb8 100644
--- a/MP/code/game/ai_dmq3.c
+++ b/MP/code/game/ai_dmq3.c
@@ -1317,8 +1317,12 @@ float BotEntityVisible( int viewer, vec3_t eye, vec3_t 
viewangles, float fov, in
aas_entityinfo_t entinfo;
vec3_t dir, entangles, start, end, middle;
 
-   //calculate middle of bounding box
BotEntityInfo( ent,  );
+   if (!entinfo.valid) {
+   return 0;
+   }
+
+   //calculate middle of bounding box
VectorAdd( entinfo.mins, entinfo.maxs, middle );
VectorScale( middle, 0.5, middle );
VectorAdd( entinfo.origin, middle, middle );
diff --git a/SP/code/game/ai_dmq3.c b/SP/code/game/ai_dmq3.c
index 6a224e2..5d0c513 100644
--- a/SP/code/game/ai_dmq3.c
+++ b/SP/code/game/ai_dmq3.c
@@ -1315,8 +1315,12 @@ float BotEntityVisible( int viewer, vec3_t eye, vec3_t 
viewangles, float fov, in
aas_entityinfo_t entinfo;
vec3_t dir, entangles, start, end, middle;
 
-   //calculate middle of bounding box
BotEntityInfo( ent,  );
+   if (!entinfo.valid) {
+   return 0;
+   }
+
+   //calculate middle of bounding box
VectorAdd( entinfo.mins, entinfo.maxs, middle );
VectorScale( middle, 0.5, middle );
VectorAdd( entinfo.origin, middle, middle );

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 17/89: All: Fix overdraw in CG_DrawRect

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit f58ab93fccf82eb2ae8cc748538f4855fa65ee71
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 15:57:31 2017 -0400

All: Fix overdraw in CG_DrawRect
---
 MP/code/cgame/cg_drawtools.c | 2 +-
 SP/code/cgame/cg_drawtools.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/cgame/cg_drawtools.c b/MP/code/cgame/cg_drawtools.c
index f24599b..ea2489b 100644
--- a/MP/code/cgame/cg_drawtools.c
+++ b/MP/code/cgame/cg_drawtools.c
@@ -363,7 +363,7 @@ void CG_DrawRect( float x, float y, float width, float 
height, float size, const
trap_R_SetColor( hudAlphaColor );
 
CG_DrawTopBottom( x, y, width, height, size );
-   CG_DrawSides( x, y, width, height, size );
+   CG_DrawSides( x, y + size, width, height - size * 2, size );
 
trap_R_SetColor( NULL );
 }
diff --git a/SP/code/cgame/cg_drawtools.c b/SP/code/cgame/cg_drawtools.c
index bed8394..7af0b21 100644
--- a/SP/code/cgame/cg_drawtools.c
+++ b/SP/code/cgame/cg_drawtools.c
@@ -300,7 +300,7 @@ void CG_DrawRect( float x, float y, float width, float 
height, float size, const
trap_R_SetColor( hudAlphaColor );
 
CG_DrawTopBottom( x, y, width, height, size );
-   CG_DrawSides( x, y, width, height, size );
+   CG_DrawSides( x, y + size, width, height - size * 2, size );
 
trap_R_SetColor( NULL );
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 11/89: All: Fix score info being dropped by server

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 1618ed904a4b50c3cd0c9a2fb34f5ffd1c34b340
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 09:55:03 2017 -0400

All: Fix score info being dropped by server
---
 MP/code/game/g_cmds.c | 2 +-
 SP/code/game/g_cmds.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/game/g_cmds.c b/MP/code/game/g_cmds.c
index 626207e..e85f380 100644
--- a/MP/code/game/g_cmds.c
+++ b/MP/code/game/g_cmds.c
@@ -35,7 +35,7 @@ DeathmatchScoreboardMessage
 */
 void DeathmatchScoreboardMessage( gentity_t *ent ) {
char entry[1024];
-   char string[1400];
+   char string[1000];
int stringlength;
int i, j;
gclient_t   *cl;
diff --git a/SP/code/game/g_cmds.c b/SP/code/game/g_cmds.c
index c41aa22..cd0b951 100644
--- a/SP/code/game/g_cmds.c
+++ b/SP/code/game/g_cmds.c
@@ -36,7 +36,7 @@ DeathmatchScoreboardMessage
 */
 void DeathmatchScoreboardMessage( gentity_t *ent ) {
char entry[1024];
-   char string[1400];
+   char string[1000];
int stringlength;
int i, j;
gclient_t   *cl;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 12/89: All: Refactor ClientNumberFromString

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 2f826e2a4ee3144278a00931bbfaffdc5334fd77
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 14:12:24 2017 -0400

All: Refactor ClientNumberFromString

MP: kick-clientkick refactor / prevent local client kicks
SP: Not used
---
 MP/code/game/g_cmds.c | 62 ---
 MP/code/server/sv_ccmds.c |  2 +-
 SP/code/game/g_cmds.c | 47 +++
 SP/code/server/sv_ccmds.c |  2 +-
 4 files changed, 70 insertions(+), 43 deletions(-)

diff --git a/MP/code/game/g_cmds.c b/MP/code/game/g_cmds.c
index e85f380..10a03f4 100644
--- a/MP/code/game/g_cmds.c
+++ b/MP/code/game/g_cmds.c
@@ -196,31 +196,35 @@ Returns a player number for either a number or name string
 Returns -1 if invalid
 ==
 */
-int ClientNumberFromString( gentity_t *to, char *s ) {
+int ClientNumberFromString( gentity_t *to, char *s, qboolean checkNums, 
qboolean checkNames ) {
gclient_t   *cl;
int idnum;
char cleanName[MAX_STRING_CHARS];
 
-   // numeric values could be slot numbers
-   if ( StringIsInteger( s ) ) {
-   idnum = atoi( s );
-   if ( idnum >= 0 && idnum < level.maxclients ) {
-   cl = [idnum];
-   if ( cl->pers.connected == CON_CONNECTED ) {
-   return idnum;
+   if ( checkNums ) {
+   // numeric values could be slot numbers
+   if ( StringIsInteger( s ) ) {
+   idnum = atoi( s );
+   if ( idnum >= 0 && idnum < level.maxclients ) {
+   cl = [idnum];
+   if ( cl->pers.connected == CON_CONNECTED ) {
+   return idnum;
+   }
}
}
}
 
-   // check for a name match
-   for ( idnum = 0,cl = level.clients ; idnum < level.maxclients ; 
idnum++,cl++ ) {
-   if ( cl->pers.connected != CON_CONNECTED ) {
-   continue;
-   }
-   Q_strncpyz(cleanName, cl->pers.netname, sizeof(cleanName));
-   Q_CleanStr(cleanName);
-   if ( !Q_stricmp( cleanName, s ) ) {
-   return idnum;
+   if ( checkNames ) {
+   // check for a name match
+   for ( idnum = 0, cl = level.clients; idnum < level.maxclients; 
idnum++, cl++ ) {
+   if ( cl->pers.connected != CON_CONNECTED ) {
+   continue;
+   }
+   Q_strncpyz( cleanName, cl->pers.netname, sizeof( 
cleanName ) );
+   Q_CleanStr( cleanName );
+   if ( !Q_stricmp( cleanName, s ) ) {
+   return idnum;
+   }
}
}
 
@@ -819,7 +823,7 @@ void Cmd_Follow_f( gentity_t *ent ) {
}
 
trap_Argv( 1, arg, sizeof( arg ) );
-   i = ClientNumberFromString( ent, arg );
+   i = ClientNumberFromString( ent, arg, qtrue, qtrue );
if ( i == -1 ) {
return;
}
@@ -1097,7 +1101,7 @@ static void Cmd_Tell_f( gentity_t *ent ) {
}
 
trap_Argv( 1, arg, sizeof( arg ) );
-   targetNum = ClientNumberFromString( ent, arg );
+   targetNum = ClientNumberFromString( ent, arg, qtrue, qtrue );
if ( targetNum == -1 ) {
return;
}
@@ -1370,7 +1374,7 @@ void Cmd_GameCommand_f( gentity_t *ent ) {
}
 
trap_Argv( 1, arg, sizeof( arg ) );
-   targetNum = ClientNumberFromString( ent, arg );
+   targetNum = ClientNumberFromString( ent, arg, qtrue, qtrue );
if ( targetNum == -1 ) {
return;
}
@@ -1548,6 +1552,23 @@ void Cmd_CallVote_f( gentity_t *ent ) {
}
Com_sprintf( level.voteString, sizeof( level.voteString ), 
"vstr nextmap" );
Com_sprintf( level.voteDisplayString, sizeof( 
level.voteDisplayString ), "%s", level.voteString );
+   } else if ( !Q_stricmp( arg1, "clientkick" ) || !Q_stricmp( arg1, 
"kick" ) ) {
+   i = ClientNumberFromString( ent, arg2, !Q_stricmp( arg1, 
"clientkick" ), !Q_stricmp( arg1, "kick" ) );
+   if ( i == -1 ) {
+   // if it can't do a client number match, don't allow 
kick (to prevent votekick text spam wars)
+   trap_SendServerCommand( ent - g_entities, "print 
\"Client not on server.\n\"" );
+   return;
+   }
+
+   if ( level.clients[i].pers.localClient ) {
+   trap_SendServerCommand( ent - g_entities, "print 
\"Cannot kick host player.\n\"" );
+   return;
+   

[iortcw] 13/89: All: Don't start game entity loops at index 1

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 734bcc5a3db45ceefc0c91580a5e74a92c53cd3d
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 14:20:14 2017 -0400

All: Don't start game entity loops at index 1
---
 MP/code/game/g_main.c   | 2 +-
 MP/code/game/g_svcmds.c | 4 ++--
 SP/code/game/g_main.c   | 2 +-
 SP/code/game/g_svcmds.c | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MP/code/game/g_main.c b/MP/code/game/g_main.c
index 23deb24..563a563 100644
--- a/MP/code/game/g_main.c
+++ b/MP/code/game/g_main.c
@@ -879,7 +879,7 @@ void G_FindTeams( void ) {
 
c = 0;
c2 = 0;
-   for ( i = 1, e = g_entities + i ; i < level.num_entities ; i++,e++ ) {
+   for ( i = MAX_CLIENTS, e = g_entities + i ; i < level.num_entities ; 
i++,e++ ) {
if ( !e->inuse ) {
continue;
}
diff --git a/MP/code/game/g_svcmds.c b/MP/code/game/g_svcmds.c
index d6de89c..38271c8 100644
--- a/MP/code/game/g_svcmds.c
+++ b/MP/code/game/g_svcmds.c
@@ -388,8 +388,8 @@ voidSvcmd_EntityList_f( void ) {
int e;
gentity_t   *check;
 
-   check = g_entities + 1;
-   for ( e = 1; e < level.num_entities ; e++, check++ ) {
+   check = g_entities;
+   for ( e = 0; e < level.num_entities ; e++, check++ ) {
if ( !check->inuse ) {
continue;
}
diff --git a/SP/code/game/g_main.c b/SP/code/game/g_main.c
index 666fe03..91fafb6 100644
--- a/SP/code/game/g_main.c
+++ b/SP/code/game/g_main.c
@@ -857,7 +857,7 @@ void G_FindTeams( void ) {
 
c = 0;
c2 = 0;
-   for ( i = 1, e = g_entities + i ; i < level.num_entities ; i++,e++ ) {
+   for ( i = MAX_CLIENTS, e = g_entities + i ; i < level.num_entities ; 
i++,e++ ) {
if ( !e->inuse ) {
continue;
}
diff --git a/SP/code/game/g_svcmds.c b/SP/code/game/g_svcmds.c
index 20934a3..810e0b3 100644
--- a/SP/code/game/g_svcmds.c
+++ b/SP/code/game/g_svcmds.c
@@ -318,8 +318,8 @@ voidSvcmd_EntityList_f( void ) {
int e;
gentity_t   *check;
 
-   check = g_entities + 1;
-   for ( e = 1; e < level.num_entities ; e++, check++ ) {
+   check = g_entities;
+   for ( e = 0; e < level.num_entities ; e++, check++ ) {
if ( !check->inuse ) {
continue;
}

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 15/89: MP: Some Cmd_CallVote_f cleanup

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 69fd713631f018dbfb650b9f02fbc12f52c2
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 14:29:36 2017 -0400

MP: Some Cmd_CallVote_f cleanup
---
 MP/code/game/g_cmds.c | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/MP/code/game/g_cmds.c b/MP/code/game/g_cmds.c
index 0d736a3..30ac59b 100644
--- a/MP/code/game/g_cmds.c
+++ b/MP/code/game/g_cmds.c
@@ -1565,8 +1565,12 @@ void Cmd_CallVote_f( gentity_t *ent ) {
}
 
// found a client number to kick, so override votestring with 
better one
-   Com_sprintf( level.voteString, sizeof( level.voteString ), 
"clientkick \"%d\"", i );
-   Com_sprintf( level.voteDisplayString, sizeof( 
level.voteDisplayString ), "kick %s", level.clients[i].pers.netname );
+   if ( i != MAX_CLIENTS ) {
+   Com_sprintf( level.voteString, sizeof( level.voteString 
), "clientkick \"%d\"", i );
+   Com_sprintf( level.voteDisplayString, sizeof( 
level.voteDisplayString ), "kick %s", level.clients[i].pers.netname );
+   } else {
+   return;
+   }
 #if 0
 // JPW NERVE
} else if ( !Q_stricmp( arg1,"kick" ) ) {
@@ -1577,14 +1581,17 @@ void Cmd_CallVote_f( gentity_t *ent ) {
if ( level.clients[i].pers.connected != CON_CONNECTED ) 
{
continue;
}
-// strip the color crap out
+
+   // strip the color crap out
Q_strncpyz( cleanName, level.clients[i].pers.netname, 
sizeof( cleanName ) );
Q_CleanStr( cleanName );
if ( !Q_stricmp( cleanName, arg2 ) ) {
kicknum = i;
}
}
+
Com_sprintf( level.voteDisplayString, sizeof( 
level.voteDisplayString ), "kick %s", level.clients[kicknum].pers.netname );
+
if ( kicknum != MAX_CLIENTS ) { // found a client # to kick, so 
override votestring with better one
Com_sprintf( level.voteString, sizeof( level.voteString 
),"clientkick \"%d\"",kicknum );
} else { // if it can't do a name match, don't allow kick (to 
prevent votekick text spam wars)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 10/89: All: Don't build score info for bots, they don't parse it

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 7a3a0a868239c64a657a128b76fc790ce22c6a2b
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 09:53:43 2017 -0400

All: Don't build score info for bots, they don't parse it
---
 MP/code/game/g_cmds.c | 5 +
 SP/code/game/g_cmds.c | 5 +
 2 files changed, 10 insertions(+)

diff --git a/MP/code/game/g_cmds.c b/MP/code/game/g_cmds.c
index f745688..626207e 100644
--- a/MP/code/game/g_cmds.c
+++ b/MP/code/game/g_cmds.c
@@ -42,6 +42,11 @@ void DeathmatchScoreboardMessage( gentity_t *ent ) {
int numSorted;
int scoreFlags;
 
+   // don't send scores to bots, they don't parse it
+   if ( ent->r.svFlags & SVF_BOT ) {
+   return;
+   }
+
// send the latest information on all clients
string[0] = 0;
stringlength = 0;
diff --git a/SP/code/game/g_cmds.c b/SP/code/game/g_cmds.c
index e9db813..c41aa22 100644
--- a/SP/code/game/g_cmds.c
+++ b/SP/code/game/g_cmds.c
@@ -43,6 +43,11 @@ void DeathmatchScoreboardMessage( gentity_t *ent ) {
int numSorted;
int scoreFlags;
 
+   // don't send scores to bots, they don't parse it
+   if ( ent->r.svFlags & SVF_BOT ) {
+   return;
+   }
+
// send the latest information on all clients
string[0] = 0;
stringlength = 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 08/89: All: Fix (unused) check for map restart in CG_TransitionSnapshot

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 4aee17a833e479cbed5a846cddc85bef96a2b5dc
Author: MAN-AT-ARMS 
Date:   Mon Jun 12 18:21:49 2017 -0400

All: Fix (unused) check for map restart in CG_TransitionSnapshot
---
 MP/code/cgame/cg_snapshot.c | 6 ++
 SP/code/cgame/cg_snapshot.c | 6 ++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/MP/code/cgame/cg_snapshot.c b/MP/code/cgame/cg_snapshot.c
index d2db1b7..27dcac8 100644
--- a/MP/code/cgame/cg_snapshot.c
+++ b/MP/code/cgame/cg_snapshot.c
@@ -206,10 +206,8 @@ static void CG_TransitionSnapshot( void ) {
// execute any server string commands before transitioning entities
CG_ExecuteNewServerCommands( cg.nextSnap->serverCommandSequence );
 
-   // if we had a map_restart, set everthing with initial
-
-   if ( !( cg.snap ) || !( cg.nextSnap ) ) {
-   return;
+   // if we had a map_restart, set everything with initial
+   if ( cg.mapRestart ) {
}
 
// clear the currentValid flag for all entities in the existing snapshot
diff --git a/SP/code/cgame/cg_snapshot.c b/SP/code/cgame/cg_snapshot.c
index 2716934..cff03b8 100644
--- a/SP/code/cgame/cg_snapshot.c
+++ b/SP/code/cgame/cg_snapshot.c
@@ -221,10 +221,8 @@ static void CG_TransitionSnapshot( void ) {
// execute any server string commands before transitioning entities
CG_ExecuteNewServerCommands( cg.nextSnap->serverCommandSequence );
 
-   // if we had a map_restart, set everthing with initial
-
-   if ( !( cg.snap ) || !( cg.nextSnap ) ) {
-   return;
+   // if we had a map_restart, set everything with initial
+   if ( cg.mapRestart ) {  
}
 
// clear the currentValid flag for all entities in the existing snapshot

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 07/89: All: Fix comment for CG_SetInitialSnapshot

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 56d0754490d271f44dfbbb018672fcd705ddf165
Author: MAN-AT-ARMS 
Date:   Mon Jun 12 18:14:11 2017 -0400

All: Fix comment for CG_SetInitialSnapshot
---
 MP/code/cgame/cg_snapshot.c | 7 ++-
 SP/code/cgame/cg_snapshot.c | 7 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/MP/code/cgame/cg_snapshot.c b/MP/code/cgame/cg_snapshot.c
index 47af275..d2db1b7 100644
--- a/MP/code/cgame/cg_snapshot.c
+++ b/MP/code/cgame/cg_snapshot.c
@@ -123,11 +123,8 @@ static void CG_TransitionEntity( centity_t *cent ) {
 ==
 CG_SetInitialSnapshot
 
-This will only happen on the very first snapshot, or
-on tourney restarts.  All other times will use
-CG_TransitionSnapshot instead.
-
-FIXME: Also called by map_restart?
+This will only happen on the very first snapshot.
+All other times will use CG_TransitionSnapshot instead.
 ==
 */
 void CG_SetInitialSnapshot( snapshot_t *snap ) {
diff --git a/SP/code/cgame/cg_snapshot.c b/SP/code/cgame/cg_snapshot.c
index 937c67e..2716934 100644
--- a/SP/code/cgame/cg_snapshot.c
+++ b/SP/code/cgame/cg_snapshot.c
@@ -127,11 +127,8 @@ static void CG_TransitionEntity( centity_t *cent ) {
 ==
 CG_SetInitialSnapshot
 
-This will only happen on the very first snapshot, or
-on tourney restarts.  All other times will use
-CG_TransitionSnapshot instead.
-
-FIXME: Also called by map_restart?
+This will only happen on the very first snapshot.
+All other times will use CG_TransitionSnapshot instead.
 ==
 */
 void CG_SetInitialSnapshot( snapshot_t *snap ) {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 06/89: All: Unify checks for missing token

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 4aad7c63df738744a86dd2e399029a7fedbda4c7
Author: MAN-AT-ARMS 
Date:   Mon Jun 12 18:11:20 2017 -0400

All: Unify checks for missing token
---
 MP/code/cgame/cg_info.c   |  2 +-
 MP/code/cgame/cg_main.c   |  4 +--
 MP/code/cgame/cg_servercmds.c | 12 -
 MP/code/cgame/cg_view.c   | 20 +++
 MP/code/game/ai_cast_script_actions.c |  6 ++---
 MP/code/game/bg_animation.c   | 42 
 MP/code/game/g_client.c   |  6 ++---
 MP/code/game/g_script_actions.c   |  8 +++---
 MP/code/ui/ui_main.c  | 14 +--
 MP/code/ui/ui_players.c   | 16 ++--
 SP/code/cgame/cg_info.c   |  4 +--
 SP/code/cgame/cg_main.c   |  4 +--
 SP/code/cgame/cg_servercmds.c |  2 +-
 SP/code/cgame/cg_sound.c  |  2 +-
 SP/code/cgame/cg_view.c   | 20 +++
 SP/code/game/ai_cast_script_actions.c |  6 ++---
 SP/code/game/bg_animation.c   | 46 +--
 SP/code/game/g_client.c   |  8 +++---
 SP/code/game/g_script_actions.c   |  8 +++---
 SP/code/ui/ui_main.c  | 14 +--
 SP/code/ui/ui_players.c   | 16 ++--
 21 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/MP/code/cgame/cg_info.c b/MP/code/cgame/cg_info.c
index 05cc5d7..efa813b 100644
--- a/MP/code/cgame/cg_info.c
+++ b/MP/code/cgame/cg_info.c
@@ -186,7 +186,7 @@ void CG_DrawStats( char *stats ) {
varIndex = v;
for ( j = 0; j < statsItems[i].numVars; j++ ) {
token = COM_Parse(  );
-   if ( !token || !token[0] ) {
+   if ( !token[0] ) {
CG_Error( "error parsing mission 
stats\n" );
return;
}
diff --git a/MP/code/cgame/cg_main.c b/MP/code/cgame/cg_main.c
index 4329118..dbaf31f 100644
--- a/MP/code/cgame/cg_main.c
+++ b/MP/code/cgame/cg_main.c
@@ -1805,7 +1805,7 @@ qboolean CG_Load_Menu( char **p ) {
return qtrue;
}
 
-   if ( !token || token[0] == 0 ) {
+   if ( !token[0] ) {
return qfalse;
}
 
@@ -1852,7 +1852,7 @@ void CG_LoadMenus( const char *menuFile ) {
 
while ( 1 ) {
token = COM_ParseExt( , qtrue );
-   if ( !token || token[0] == 0 || token[0] == '}' ) {
+   if ( !token[0] || token[0] == '}' ) {
break;
}
 
diff --git a/MP/code/cgame/cg_servercmds.c b/MP/code/cgame/cg_servercmds.c
index f78278d..7b7c935 100644
--- a/MP/code/cgame/cg_servercmds.c
+++ b/MP/code/cgame/cg_servercmds.c
@@ -857,7 +857,7 @@ int CG_ParseVoiceChats( const char *filename, 
voiceChatList_t *voiceChatList, in
voiceChats[i].id[0] = 0;
}
token = COM_ParseExt( p, qtrue );
-   if ( !token || token[0] == 0 ) {
+   if ( !token[0] ) {
return qtrue;
}
if ( !Q_stricmp( token, "female" ) ) {
@@ -874,7 +874,7 @@ int CG_ParseVoiceChats( const char *filename, 
voiceChatList_t *voiceChatList, in
voiceChatList->numVoiceChats = 0;
while ( 1 ) {
token = COM_ParseExt( p, qtrue );
-   if ( !token || token[0] == 0 ) {
+   if ( !token[0] ) {
return qtrue;
}
Com_sprintf( voiceChats[voiceChatList->numVoiceChats].id, 
sizeof( voiceChats[voiceChatList->numVoiceChats].id ), "%s", token );
@@ -888,7 +888,7 @@ int CG_ParseVoiceChats( const char *filename, 
voiceChatList_t *voiceChatList, in
 
while ( 1 ) {
token = COM_ParseExt( p, qtrue );
-   if ( !token || token[0] == 0 ) {
+   if ( !token[0] ) {
return qtrue;
}
if ( !Q_stricmp( token, "}" ) ) {
@@ -896,14 +896,14 @@ int CG_ParseVoiceChats( const char *filename, 
voiceChatList_t *voiceChatList, in
}

voiceChats[voiceChatList->numVoiceChats].sounds[current] = 
trap_S_RegisterSound( token );
token = COM_ParseExt( p, qtrue );
-   if ( !token || token[0] == 0 ) {
+   if ( !token[0] ) {
return qtrue;
}
Com_sprintf( 
voiceChats[voiceChatList->numVoiceChats].chats[current], MAX_CHATSIZE, "%s", 
token );
 
// DHM - Nerve :: Specify sprite shader to 

[iortcw] 05/89: All: Fix 'missing token' in parsers

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 82abba3f1f28afe765e090cd0e02dce37dea479f
Author: MAN-AT-ARMS 
Date:   Mon Jun 12 16:56:08 2017 -0400

All: Fix 'missing token' in parsers
---
 MP/code/cgame/cg_players.c  |  2 +-
 MP/code/cgame/cg_weapons.c  | 18 +-
 MP/code/game/bg_animation.c | 22 +++---
 MP/code/ui/ui_players.c | 14 +++---
 SP/code/cgame/cg_players.c  |  2 +-
 SP/code/cgame/cg_weapons.c  | 18 +-
 SP/code/game/bg_animation.c | 20 ++--
 SP/code/ui/ui_players.c | 14 +++---
 8 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/MP/code/cgame/cg_players.c b/MP/code/cgame/cg_players.c
index 4bee246..36cc1d3 100644
--- a/MP/code/cgame/cg_players.c
+++ b/MP/code/cgame/cg_players.c
@@ -169,7 +169,7 @@ static qboolean CG_ParseGibModels( const char *filename, 
clientInfo_t *ci ) {
 
for ( i = 0; i < MAX_GIB_MODELS; i++ ) {
token = COM_Parse( _p );
-   if ( !token ) {
+   if ( !token[0] ) {
break;
}
// cache this model
diff --git a/MP/code/cgame/cg_weapons.c b/MP/code/cgame/cg_weapons.c
index 2b7f55e..af8930b 100644
--- a/MP/code/cgame/cg_weapons.c
+++ b/MP/code/cgame/cg_weapons.c
@@ -948,12 +948,12 @@ static qboolean CG_ParseWeaponConfig( const char 
*filename, weaponInfo_t *wi ) {
while ( 1 ) {
prev = text_p;  // so we can unget
token = COM_Parse( _p );
-   if ( !token ) { // get the variable
+   if ( !token[0] ) { // get the variable
break;
}
if ( !Q_stricmp( token, "whatever_variable" ) ) {
token = COM_Parse( _p );   // get the value
-   if ( !token ) {
+   if ( !token[0] ) {
break;
}
continue;
@@ -976,19 +976,19 @@ static qboolean CG_ParseWeaponConfig( const char 
*filename, weaponInfo_t *wi ) {
for ( i = 0 ; i < MAX_WP_ANIMATIONS  ; i++ ) {
 
token = COM_Parse( _p );   // first frame
-   if ( !token ) {
+   if ( !token[0] ) {
break;
}
wi->weapAnimations[i].firstFrame = atoi( token );
 
token = COM_Parse( _p );   // length
-   if ( !token ) {
+   if ( !token[0] ) {
break;
}
wi->weapAnimations[i].numFrames = atoi( token );
 
token = COM_Parse( _p );   // fps
-   if ( !token ) {
+   if ( !token[0] ) {
break;
}
fps = atof( token );
@@ -1000,7 +1000,7 @@ static qboolean CG_ParseWeaponConfig( const char 
*filename, weaponInfo_t *wi ) {
wi->weapAnimations[i].initialLerp = 1000 / fps;
 
token = COM_Parse( _p );   // looping frames
-   if ( !token ) {
+   if ( !token[0] ) {
break;
}
wi->weapAnimations[i].loopFrames = atoi( token );
@@ -1017,13 +1017,13 @@ static qboolean CG_ParseWeaponConfig( const char 
*filename, weaponInfo_t *wi ) {
 
if ( newfmt ) {
token = COM_Parse( _p );   // barrel anim bits
-   if ( !token ) {
+   if ( !token[0] ) {
break;
}
wi->weapAnimations[i].moveSpeed = atoi( token );
 
token = COM_Parse( _p );   // animated weapon
-   if ( !token ) {
+   if ( !token[0] ) {
break;
}
if ( atoi( token ) ) {
@@ -1031,7 +1031,7 @@ static qboolean CG_ParseWeaponConfig( const char 
*filename, weaponInfo_t *wi ) {
 
}
token = COM_Parse( _p );   // barrel hide bits (so 
objects can be flagged to not be drawn during all sequences (a reloading hand 
that comes in from off screen for that one animation for example)
-   if ( !token ) {
+   if ( !token[0] ) {
break;
}
wi->weapAnimations[i].moveSpeed |= ( ( atoi( token ) ) 
<< 8 ); // use 2nd byte for draw bits
diff --git a/MP/code/game/bg_animation.c b/MP/code/game/bg_animation.c
index da025eb..04be86b 100644
--- a/MP/code/game/bg_animation.c
+++ b/MP/code/game/bg_animation.c
@@ -531,12 +531,12 @@ qboolean BG_AnimParseAnimConfig( animModelInfo_t 
*animModelInfo, const char *fil

[iortcw] 09/89: All: Fix Coverity warning that endVelocity is uninitialized

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 61dfb290d66443cfe7d12b1bf0ea01e01cbdc10d
Author: MAN-AT-ARMS 
Date:   Tue Jun 13 09:24:30 2017 -0400

All: Fix Coverity warning that endVelocity is uninitialized
---
 MP/code/game/bg_slidemove.c | 27 +++
 SP/code/game/bg_slidemove.c | 27 +++
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/MP/code/game/bg_slidemove.c b/MP/code/game/bg_slidemove.c
index cac17be..c54e842 100644
--- a/MP/code/game/bg_slidemove.c
+++ b/MP/code/game/bg_slidemove.c
@@ -164,8 +164,10 @@ qbooleanPM_SlideMove( qboolean gravity ) {
// slide along the plane
PM_ClipVelocity( pm->ps->velocity, planes[i], 
clipVelocity, OVERCLIP );
 
-   // slide along the plane
-   PM_ClipVelocity( endVelocity, planes[i], 
endClipVelocity, OVERCLIP );
+   if ( gravity ) {
+   // slide along the plane
+   PM_ClipVelocity( endVelocity, planes[i], 
endClipVelocity, OVERCLIP );
+   }
 
// see if there is a second plane that the new move 
enters
for ( j = 0 ; j < numplanes ; j++ ) {
@@ -178,7 +180,10 @@ qbooleanPM_SlideMove( qboolean gravity ) {
 
// try clipping the move to the plane
PM_ClipVelocity( clipVelocity, planes[j], 
clipVelocity, OVERCLIP );
-   PM_ClipVelocity( endClipVelocity, planes[j], 
endClipVelocity, OVERCLIP );
+
+   if ( gravity ) {
+   PM_ClipVelocity( endClipVelocity, 
planes[j], endClipVelocity, OVERCLIP );
+   }
 
// see if it goes back into the first clip plane
if ( DotProduct( clipVelocity, planes[i] ) >= 0 
) {
@@ -191,10 +196,12 @@ qbooleanPM_SlideMove( qboolean gravity ) {
d = DotProduct( dir, pm->ps->velocity );
VectorScale( dir, d, clipVelocity );
 
-   CrossProduct( planes[i], planes[j], dir );
-   VectorNormalize( dir );
-   d = DotProduct( dir, endVelocity );
-   VectorScale( dir, d, endClipVelocity );
+   if ( gravity ) {
+   CrossProduct( planes[i], planes[j], dir 
);
+   VectorNormalize( dir );
+   d = DotProduct( dir, endVelocity );
+   VectorScale( dir, d, endClipVelocity );
+   }
 
// see if there is a third plane the the new 
move enters
for ( k = 0 ; k < numplanes ; k++ ) {
@@ -213,7 +220,11 @@ qbooleanPM_SlideMove( qboolean gravity ) {
 
// if we have fixed all interactions, try another move
VectorCopy( clipVelocity, pm->ps->velocity );
-   VectorCopy( endClipVelocity, endVelocity );
+
+   if ( gravity ) {
+   VectorCopy( endClipVelocity, endVelocity );
+   }
+
break;
}
}
diff --git a/SP/code/game/bg_slidemove.c b/SP/code/game/bg_slidemove.c
index 175d82c..a62c348 100644
--- a/SP/code/game/bg_slidemove.c
+++ b/SP/code/game/bg_slidemove.c
@@ -164,8 +164,10 @@ qbooleanPM_SlideMove( qboolean gravity ) {
// slide along the plane
PM_ClipVelocity( pm->ps->velocity, planes[i], 
clipVelocity, OVERCLIP );
 
-   // slide along the plane
-   PM_ClipVelocity( endVelocity, planes[i], 
endClipVelocity, OVERCLIP );
+   if ( gravity ) {
+   // slide along the plane
+   PM_ClipVelocity( endVelocity, planes[i], 
endClipVelocity, OVERCLIP );
+   }
 
// see if there is a second plane that the new move 
enters
for ( j = 0 ; j < numplanes ; j++ ) {
@@ -178,7 +180,10 @@ qbooleanPM_SlideMove( qboolean gravity ) {
 
// try clipping the move to the plane
PM_ClipVelocity( clipVelocity, planes[j], 
clipVelocity, OVERCLIP );
-   PM_ClipVelocity( endClipVelocity, planes[j], 
endClipVelocity, OVERCLIP );
+
+   if ( gravity ) {
+   

[iortcw] 95/95: All: Update whitelist for release mp_bin0 and remove git tags

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51
in repository iortcw.

commit fba26a1007b09b68ab8a1870cbf1f17b952c1b2e
Author: MAN-AT-ARMS 
Date:   Thu Jun 8 11:15:00 2017 -0400

All: Update whitelist for release mp_bin0 and remove git tags
---
 MP/Makefile | 17 -
 MP/code/qcommon/files.c |  2 +-
 SP/Makefile | 17 -
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 7a3efc2..530f3bd 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -350,16 +350,6 @@ ifneq ($(BUILD_CLIENT),0)
   endif
 endif
 
-# Add git version info
-USE_GIT=
-ifeq ($(wildcard ../.git),../.git)
-  GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
-  ifneq ($(GIT_REV),)
-VERSION:=$(VERSION)_GIT_$(GIT_REV)
-USE_GIT=1
-  endif
-endif
-
 
 #
 # SETUP AND BUILD -- LINUX
@@ -2703,13 +2693,6 @@ $(B)/ded/%.o: $(SYSDIR)/%.rc
 $(B)/ded/%.o: $(NDIR)/%.c
$(DO_DED_CC)
 
-# Extra dependencies to ensure the git version is incorporated
-ifeq ($(USE_GIT),1)
-  $(B)/client/cl_console.o : ../.git
-  $(B)/client/common.o : ../.git
-  $(B)/ded/common.o : ../.git
-endif
-
 
 #
 ## GAME MODULE RULES
diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index 275c0aa..6bb2260 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -206,7 +206,7 @@ static const unsigned int mppak_checksums[] = {
 
 static const unsigned int binpak_checksums[] = {
4022537001u,// mp_bin.pk3 (1.4/1.41)
-   1215509415u,// mp_bin0.pk3 (1.5a)
+   686580754u, // mp_bin0.pk3 (1.51)
3375536862u,// Degeneration (1.11)
2977960779u,// Omni-Bot (0.81/0.82)
618492725u, // Omnit-Bot (0.85)
diff --git a/SP/Makefile b/SP/Makefile
index c2b3958..3da48dd 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -339,16 +339,6 @@ ifneq ($(BUILD_CLIENT),0)
   endif
 endif
 
-# Add git version info
-USE_GIT=
-ifeq ($(wildcard ../.git),../.git)
-  GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
-  ifneq ($(GIT_REV),)
-VERSION:=$(VERSION)_GIT_$(GIT_REV)
-USE_GIT=1
-  endif
-endif
-
 
 #
 # SETUP AND BUILD -- LINUX
@@ -2669,13 +2659,6 @@ $(B)/ded/%.o: $(SYSDIR)/%.rc
 $(B)/ded/%.o: $(NDIR)/%.c
$(DO_DED_CC)
 
-# Extra dependencies to ensure the git version is incorporated
-ifeq ($(USE_GIT),1)
-  $(B)/client/cl_console.o : ../.git
-  $(B)/client/common.o : ../.git
-  $(B)/ded/common.o : ../.git
-endif
-
 
 #
 ## GAME MODULE RULES

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] tag 1.51b created (now 08408c5)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to tag 1.51b
in repository iortcw.

at  08408c5   (commit)
This tag includes the following new commits:

   new  7af580f   All: Move SDL 2.0.1 branch to trunk
   new  85a8f78   SP: Update the mac build scripts with new naming 
convention
   new  81d3a4d   All: Bump default com_hunkmegs to 256
   new  62fadc4   MP: Only touch legacy dll for pure check
   new  9fed949   All: Rend2: Dont call va each frame in 
GLSL_VertexAttribPointers
   new  0b49c4d   All: Fix SCR_UpdateScreen crash from VOIP
   new  310fed3   MP: Fix cgame key binds staying bound while in console
   new  5eeab8d   All: Rend2: Fix non-HDR map surface over brighting
   new  1811d3f   MP: Properly handle vm_* cvars / Always extract dlls from 
mp_bin so they can be found
   new  2254bc6   All: Fix flamethrower stream sound (Still missing when 
using vanilla MP cgame)
   new  b65ae5d   All: Update the readme's
   new  de879bf   All: Rename the SDL2 libraries so that x86 and x64 can 
coexist in the same directory
   new  830a2cb   All: Rename the included 32bit SDL2 dll
   new  2f46cb4   All: Update the win64 SDL libs to use the new dll name 
(SDL264.dll)
   new  1147f7a   All: Make the AL version of AddLoopingSound closer to 
Base version
   new  594d44e   All: Change to full volume for AddRealLoopingSound (not 
used) in AL
   new  47a1152   MP: Add stub for FS_Delete (not used in MP)
   new  e9549aa   All: Fix stuttering in non-local looping sounds
   new  1dfad37   All: Fix indentation issue in Makefiles
   new  8b787af   MP: Missed one line in last commit
   new  1e2cc90   All: Remove check for Windows versions in make copyfiles
   new  79137ec   MP: Use Punkbuster MD5 implementation for cl_guid / 
Rename autogenerated key to avoid confusion
   new  1aa3306   MP: Add the Punkbuster implementation of MD5
   new  5ab5797   MP: Remove the console print of CD key / clean up some 
stuff uncrustify shifted
   new  450a83b   MP: Only calculate cl_guid on startup when using 
Punkbuster MD5
   new  ee12f94   MP: Use upper-case for Punkbuster cl_guid like vanilla 
client
   new  ca79516   All: Don't play all 'local' sounds at full volume
   new  03cb290   All: Check for buffer overflow for rail/lightning surfaces
   new  7101f80   All: Update opusfile to 0.5
   new  4fd0b1c   All: Change the OpenAL driver and device cvars to 
CVAR_ROM / Add the reference OpenAL dll's for windows
   new  79967c1   All: Fix check for jpeg_mem_ to work with libjpeg-turbo
   new  7a3f820   All: Re-allow setting OpenAL input device / Fix fallback 
driver code
   new  35fd158   All: Revert r507
   new  2770901   MP: Set cl_guid to NO_GUID when no cdkey is present like 
vanilla client
   new  9a70228   MP: Add ability for server to load a map-specific config 
on map load
   new  3503e5c   All: Don't restart the renderer in SV_SpawnServer
   new  eb3d821   All: Don't use zip target in Makefile unless 
BUILD_ARCHIVE define is set
   new  6f53efb   All: Don't clear screen during CA_LOADING and CA_PRIMED
   new  640d13f   MP: Add gender specific obituaries for self kills
   new  6793031   All: When cross compiling on mingw32, make sure it finds 
a CC
   new  bf54555   All: Add vorbis 1.3.4 support (Still disabled by default)
   new  6654b64   All: Clear referenced paks when disconnecting
   new  3a6b770   All: Fix sending pk3 download error messages to clients
   new  97d0d96   All: Add support for clang 3.4
   new  f4afead   MP: Fix a warning when compiling with clang
   new  109689a   All: Rend2: Set RGBM to use a multiplier of 1, and only 
use it with HDR lightmaps
   new  b8d03f5   All: Update curl to 7.35.0
   new  bffea3e   All: Rend2: Fix rendering when r_hdr = 0 and 
r_floatLightmap = 1
   new  724d1f7   All: Rend2: Remove and force r_softOverbright
   new  438b979   All: Fix colored name padding and allow IPv6 address to 
fit in output of 'status' command
   new  9d961a6   All: Remove references to alDopplerVelocity
   new  0cb77f0   SP: Don't check AI for connection status (Fix phone jack 
icon issue)
   new  b5a3663   All: Fix native trap_BotMutateGoalFuzzyLogic
   new  588b86f   All: Rend2: Minor GLSL shader improvements
   new  52047c1   All: Rend2: Add normalScale and parallaxDepth stage 
keywords and helper cvars
   new  1afa4c3   All: Rend2: Update the README
   new  8d3ee48   All: Rend2: Remove 'Cheat' label from r_forcesun in README
   new  3a8b3df   All: Rend2: Set default normal/specular in 
RE_RegisterShaderFromImage
   new  5683b60   All: Update SDL libraries and headers to 2.0.2
   new  7ad9fe9   All: Rend2: Don't wash out HDR vertex light surfaces
   new  5ec86cb   All: Some various renderer cleanups (See notes)
   

[iortcw] 02/89: All: Use const char pointers when possible in botlib's libvar code

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 23e899e3ba78de71e21f3cc60494b36877a4aeb9
Author: MAN-AT-ARMS 
Date:   Fri Jun 9 19:48:39 2017 -0400

All: Use const char pointers when possible in botlib's libvar code
---
 MP/code/botlib/be_interface.c |  4 ++--
 MP/code/botlib/botlib.h   |  4 ++--
 MP/code/botlib/l_libvar.c | 22 +++---
 MP/code/botlib/l_libvar.h | 18 +-
 SP/code/botlib/be_interface.c |  4 ++--
 SP/code/botlib/botlib.h   |  4 ++--
 SP/code/botlib/l_libvar.c | 22 +++---
 SP/code/botlib/l_libvar.h | 18 +-
 8 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/MP/code/botlib/be_interface.c b/MP/code/botlib/be_interface.c
index 58f5144..bb2f2ee 100644
--- a/MP/code/botlib/be_interface.c
+++ b/MP/code/botlib/be_interface.c
@@ -269,7 +269,7 @@ int Export_BotLibShutdown( void ) {
 // Returns:-
 // Changes Globals:-
 //===
-int Export_BotLibVarSet( char *var_name, char *value ) {
+int Export_BotLibVarSet( const char *var_name, const char *value ) {
LibVarSet( var_name, value );
return BLERR_NOERROR;
 } //end of the function Export_BotLibVarSet
@@ -279,7 +279,7 @@ int Export_BotLibVarSet( char *var_name, char *value ) {
 // Returns:-
 // Changes Globals:-
 //===
-int Export_BotLibVarGet( char *var_name, char *value, int size ) {
+int Export_BotLibVarGet( const char *var_name, char *value, int size ) {
char *varvalue;
 
varvalue = LibVarGetString( var_name );
diff --git a/MP/code/botlib/botlib.h b/MP/code/botlib/botlib.h
index c19d656..d87352d 100644
--- a/MP/code/botlib/botlib.h
+++ b/MP/code/botlib/botlib.h
@@ -440,9 +440,9 @@ typedef struct botlib_export_s
//shutdown the bot library, returns BLERR_
int ( *BotLibShutdown )( void );
//sets a library variable returns BLERR_
-   int ( *BotLibVarSet )( char *var_name, char *value );
+   int ( *BotLibVarSet )( const char *var_name, const char *value );
//gets a library variable returns BLERR_
-   int ( *BotLibVarGet )( char *var_name, char *value, int size );
+   int ( *BotLibVarGet )( const char *var_name, char *value, int size );
 
//sets a C-like define returns BLERR_
int ( *PC_AddGlobalDefine )( char *string );
diff --git a/MP/code/botlib/l_libvar.c b/MP/code/botlib/l_libvar.c
index ea25d5a..6d9d65c 100644
--- a/MP/code/botlib/l_libvar.c
+++ b/MP/code/botlib/l_libvar.c
@@ -48,7 +48,7 @@ libvar_t *libvarlist = NULL;
 // Returns:-
 // Changes Globals:-
 //===
-float LibVarStringValue( char *string ) {
+float LibVarStringValue( const char *string ) {
int dotfound = 0;
float value = 0;
 
@@ -82,7 +82,7 @@ float LibVarStringValue( char *string ) {
 // Returns:-
 // Changes Globals:-
 //===
-libvar_t *LibVarAlloc( char *var_name ) {
+libvar_t *LibVarAlloc( const char *var_name ) {
libvar_t *v;
 
v = (libvar_t *) GetMemory(sizeof(libvar_t));
@@ -129,7 +129,7 @@ void LibVarDeAllocAll( void ) {
 // Returns:-
 // Changes Globals:-
 //===
-libvar_t *LibVarGet( char *var_name ) {
+libvar_t *LibVarGet( const char *var_name ) {
libvar_t *v;
 
for ( v = libvarlist; v; v = v->next )
@@ -146,7 +146,7 @@ libvar_t *LibVarGet( char *var_name ) {
 // Returns:-
 // Changes Globals:-
 //===
-char *LibVarGetString( char *var_name ) {
+char *LibVarGetString( const char *var_name ) {
libvar_t *v;
 
v = LibVarGet( var_name );
@@ -164,7 +164,7 @@ char *LibVarGetString( char *var_name ) {
 // Returns:-
 // Changes Globals:-
 //===
-float LibVarGetValue( char *var_name ) {
+float LibVarGetValue( const char *var_name ) {
libvar_t *v;
 
v = LibVarGet( var_name );
@@ -182,7 +182,7 @@ float LibVarGetValue( char *var_name ) {
 // Returns:-
 // Changes Globals:-
 //===
-libvar_t *LibVar( char *var_name, char *value ) {
+libvar_t *LibVar( const char *var_name, const 

[iortcw] 04/89: All: Don't use uninitialized ps from BotAI_GetClientState

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 77b1042632463eb1d0b7dd0ac56e84cedecc1326
Author: MAN-AT-ARMS 
Date:   Mon Jun 12 16:12:03 2017 -0400

All: Don't use uninitialized ps from BotAI_GetClientState
---
 MP/code/game/ai_chat.c | 12 
 MP/code/game/ai_dmq3.c |  5 -
 MP/code/game/ai_main.c |  5 -
 MP/code/game/ai_team.c |  8 ++--
 SP/code/game/ai_chat.c | 12 
 SP/code/game/ai_dmq3.c |  5 -
 SP/code/game/ai_main.c |  5 -
 SP/code/game/ai_team.c |  8 ++--
 8 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/MP/code/game/ai_chat.c b/MP/code/game/ai_chat.c
index 3eac6fb..82cceea 100644
--- a/MP/code/game/ai_chat.c
+++ b/MP/code/game/ai_chat.c
@@ -107,8 +107,7 @@ int BotIsFirstInRankings( bot_state_t *bs ) {
continue;
}
//
-   BotAI_GetClientState( i,  );
-   if ( score < ps.persistant[PERS_SCORE] ) {
+   if ( BotAI_GetClientState( i,  ) && score < 
ps.persistant[PERS_SCORE] ) {
return qfalse;
}
}
@@ -137,8 +136,7 @@ int BotIsLastInRankings( bot_state_t *bs ) {
continue;
}
//
-   BotAI_GetClientState( i,  );
-   if ( score > ps.persistant[PERS_SCORE] ) {
+   if ( BotAI_GetClientState( i,  ) && score > 
ps.persistant[PERS_SCORE] ) {
return qfalse;
}
}
@@ -169,8 +167,7 @@ char *BotFirstClientInRankings( void ) {
continue;
}
//
-   BotAI_GetClientState( i,  );
-   if ( ps.persistant[PERS_SCORE] > bestscore ) {
+   if ( BotAI_GetClientState( i,  ) && 
ps.persistant[PERS_SCORE] > bestscore ) {
bestscore = ps.persistant[PERS_SCORE];
bestclient = i;
}
@@ -203,8 +200,7 @@ char *BotLastClientInRankings( void ) {
continue;
}
//
-   BotAI_GetClientState( i,  );
-   if ( ps.persistant[PERS_SCORE] < worstscore ) {
+   if ( BotAI_GetClientState( i,  ) && 
ps.persistant[PERS_SCORE] < worstscore ) {
worstscore = ps.persistant[PERS_SCORE];
bestclient = i;
}
diff --git a/MP/code/game/ai_dmq3.c b/MP/code/game/ai_dmq3.c
index 55990da..404a8f8 100644
--- a/MP/code/game/ai_dmq3.c
+++ b/MP/code/game/ai_dmq3.c
@@ -614,7 +614,10 @@ qboolean EntityIsDead( aas_entityinfo_t *entinfo ) {
 
if ( entinfo->number >= 0 && entinfo->number < MAX_CLIENTS ) {
//retrieve the current client state
-   BotAI_GetClientState( entinfo->number,  );
+   if ( !BotAI_GetClientState( entinfo->number,  ) ) {
+   return qfalse;
+   }
+
if ( ps.pm_type != PM_NORMAL ) {
return qtrue;
}
diff --git a/MP/code/game/ai_main.c b/MP/code/game/ai_main.c
index eef1af4..c9a93b3 100644
--- a/MP/code/game/ai_main.c
+++ b/MP/code/game/ai_main.c
@@ -545,7 +545,10 @@ int BotAI( int client, float thinktime ) {
}
 
//retrieve the current client state
-   BotAI_GetClientState( client, >cur_ps );
+   if ( !BotAI_GetClientState( client, >cur_ps ) ) {
+   BotAI_Print( PRT_FATAL, "BotAI: failed to get player state for 
player %d\n", client );
+   return qfalse;
+   }
 
//retrieve any waiting console messages
while ( trap_BotGetServerCommand( client, buf, sizeof( buf ) ) ) {
diff --git a/MP/code/game/ai_team.c b/MP/code/game/ai_team.c
index 51b32f3..02629c3 100644
--- a/MP/code/game/ai_team.c
+++ b/MP/code/game/ai_team.c
@@ -106,8 +106,12 @@ int BotClientTravelTimeToGoal( int client, bot_goal_t 
*goal ) {
playerState_t ps;
int areanum;
 
-   BotAI_GetClientState( client,  );
-   areanum = BotPointAreaNum( ps.origin );
+   if ( BotAI_GetClientState( client,  ) ) {
+   areanum = BotPointAreaNum( ps.origin );
+   } else {
+   areanum = 0;
+   }
+
if ( !areanum ) {
return 1;
}
diff --git a/SP/code/game/ai_chat.c b/SP/code/game/ai_chat.c
index 0942694..0c17366 100644
--- a/SP/code/game/ai_chat.c
+++ b/SP/code/game/ai_chat.c
@@ -107,8 +107,7 @@ int BotIsFirstInRankings( bot_state_t *bs ) {
continue;
}
//
-   BotAI_GetClientState( i,  );
-   if ( score < ps.persistant[PERS_SCORE] ) {
+   if ( BotAI_GetClientState( i,  ) && score < 
ps.persistant[PERS_SCORE] ) {
return qfalse;
}
}
@@ -137,8 +136,7 @@ int 

[iortcw] 01/89: All: Bump version to 1.51b

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit 4b2a1f9ad2ec9cea641ce8858fc38716742cf69e
Author: MAN-AT-ARMS 
Date:   Thu Jun 8 11:26:46 2017 -0400

All: Bump version to 1.51b
---
 MP/Makefile| 19 ++-
 MP/code/qcommon/q_shared.h |  2 +-
 SP/Makefile| 19 ++-
 SP/code/qcommon/q_shared.h |  2 +-
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 530f3bd..146eb3a 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -126,7 +126,7 @@ endif
 export CROSS_COMPILING
 
 ifndef VERSION
-VERSION=1.51-MP
+VERSION=1.51b-MP
 endif
 
 ifndef CLIENTBIN
@@ -350,6 +350,16 @@ ifneq ($(BUILD_CLIENT),0)
   endif
 endif
 
+# Add git version info
+USE_GIT=
+ifeq ($(wildcard ../.git),../.git)
+  GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
+  ifneq ($(GIT_REV),)
+VERSION:=$(VERSION)_GIT_$(GIT_REV)
+USE_GIT=1
+  endif
+endif
+
 
 #
 # SETUP AND BUILD -- LINUX
@@ -2693,6 +2703,13 @@ $(B)/ded/%.o: $(SYSDIR)/%.rc
 $(B)/ded/%.o: $(NDIR)/%.c
$(DO_DED_CC)
 
+# Extra dependencies to ensure the git version is incorporated
+ifeq ($(USE_GIT),1)
+  $(B)/client/cl_console.o : ../.git
+  $(B)/client/common.o : ../.git
+  $(B)/ded/common.o : ../.git
+endif
+
 
 #
 ## GAME MODULE RULES
diff --git a/MP/code/qcommon/q_shared.h b/MP/code/qcommon/q_shared.h
index f1fca4d..1aeb853 100644
--- a/MP/code/qcommon/q_shared.h
+++ b/MP/code/qcommon/q_shared.h
@@ -88,7 +88,7 @@ If you have questions concerning this license or the 
applicable additional terms
 #define LEGACY_HEARTBEAT_FOR_MASTER"Wolfenstein-1"
 
 #ifndef PRODUCT_VERSION
-  #define PRODUCT_VERSION "1.51-MP"
+  #define PRODUCT_VERSION "1.51b-MP"
 #endif
 
 #ifndef OLD_PRODUCT_VERSION
diff --git a/SP/Makefile b/SP/Makefile
index 3da48dd..2fc5e6f 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -123,7 +123,7 @@ endif
 export CROSS_COMPILING
 
 ifndef VERSION
-VERSION=1.51-SP
+VERSION=1.51b-SP
 endif
 
 ifndef CLIENTBIN
@@ -339,6 +339,16 @@ ifneq ($(BUILD_CLIENT),0)
   endif
 endif
 
+# Add git version info
+USE_GIT=
+ifeq ($(wildcard ../.git),../.git)
+  GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short)
+  ifneq ($(GIT_REV),)
+VERSION:=$(VERSION)_GIT_$(GIT_REV)
+USE_GIT=1
+  endif
+endif
+
 
 #
 # SETUP AND BUILD -- LINUX
@@ -2659,6 +2669,13 @@ $(B)/ded/%.o: $(SYSDIR)/%.rc
 $(B)/ded/%.o: $(NDIR)/%.c
$(DO_DED_CC)
 
+# Extra dependencies to ensure the git version is incorporated
+ifeq ($(USE_GIT),1)
+  $(B)/client/cl_console.o : ../.git
+  $(B)/client/common.o : ../.git
+  $(B)/ded/common.o : ../.git
+endif
+
 
 #
 ## GAME MODULE RULES
diff --git a/SP/code/qcommon/q_shared.h b/SP/code/qcommon/q_shared.h
index a35a19f..4678f84 100644
--- a/SP/code/qcommon/q_shared.h
+++ b/SP/code/qcommon/q_shared.h
@@ -85,7 +85,7 @@ If you have questions concerning this license or the 
applicable additional terms
 #define LEGACY_HEARTBEAT_FOR_MASTER"Wolfenstein-1"
 
 #ifndef PRODUCT_VERSION
-  #define PRODUCT_VERSION "1.51-SP"
+  #define PRODUCT_VERSION "1.51b-SP"
 #endif
 
 #ifndef PRODUCT_DATE

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 03/89: All: Stop caching sv_maxclients in bot code

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit f53f9fd13aa7648731ba8a54d1a6a41a1979ce3a
Author: MAN-AT-ARMS 
Date:   Mon Jun 12 15:31:40 2017 -0400

All: Stop caching sv_maxclients in bot code
---
 MP/code/game/ai_chat.c | 42 ++
 MP/code/game/ai_cmd.c  | 23 +--
 MP/code/game/ai_dmq3.c | 10 +++---
 MP/code/game/ai_main.c |  5 +
 MP/code/game/ai_team.c | 14 ++
 SP/code/game/ai_chat.c | 42 ++
 SP/code/game/ai_cmd.c  | 23 +--
 SP/code/game/ai_dmq3.c | 10 +++---
 SP/code/game/ai_main.c |  5 +
 SP/code/game/ai_team.c | 14 ++
 10 files changed, 34 insertions(+), 154 deletions(-)

diff --git a/MP/code/game/ai_chat.c b/MP/code/game/ai_chat.c
index 7c71d3f..3eac6fb 100644
--- a/MP/code/game/ai_chat.c
+++ b/MP/code/game/ai_chat.c
@@ -67,14 +67,9 @@ BotNumActivePlayers
 int BotNumActivePlayers( void ) {
int i, num;
char buf[MAX_INFO_STRING];
-   static int maxclients;
-
-   if ( !maxclients ) {
-   maxclients = trap_Cvar_VariableIntegerValue( "sv_maxclients" );
-   }
 
num = 0;
-   for ( i = 0; i < maxclients && i < MAX_CLIENTS; i++ ) {
+   for ( i = 0; i < level.maxclients; i++ ) {
trap_GetConfigstring( CS_PLAYERS + i, buf, sizeof( buf ) );
//if no config string or no name
if ( !strlen( buf ) || !strlen( Info_ValueForKey( buf, "n" ) ) 
) {
@@ -98,15 +93,10 @@ BotIsFirstInRankings
 int BotIsFirstInRankings( bot_state_t *bs ) {
int i, score;
char buf[MAX_INFO_STRING];
-   static int maxclients;
playerState_t ps;
 
-   if ( !maxclients ) {
-   maxclients = trap_Cvar_VariableIntegerValue( "sv_maxclients" );
-   }
-
score = bs->cur_ps.persistant[PERS_SCORE];
-   for ( i = 0; i < maxclients && i < MAX_CLIENTS; i++ ) {
+   for ( i = 0; i < level.maxclients; i++ ) {
trap_GetConfigstring( CS_PLAYERS + i, buf, sizeof( buf ) );
//if no config string or no name
if ( !strlen( buf ) || !strlen( Info_ValueForKey( buf, "n" ) ) 
) {
@@ -133,15 +123,10 @@ BotIsLastInRankings
 int BotIsLastInRankings( bot_state_t *bs ) {
int i, score;
char buf[MAX_INFO_STRING];
-   static int maxclients;
playerState_t ps;
 
-   if ( !maxclients ) {
-   maxclients = trap_Cvar_VariableIntegerValue( "sv_maxclients" );
-   }
-
score = bs->cur_ps.persistant[PERS_SCORE];
-   for ( i = 0; i < maxclients && i < MAX_CLIENTS; i++ ) {
+   for ( i = 0; i < level.maxclients; i++ ) {
trap_GetConfigstring( CS_PLAYERS + i, buf, sizeof( buf ) );
//if no config string or no name
if ( !strlen( buf ) || !strlen( Info_ValueForKey( buf, "n" ) ) 
) {
@@ -169,16 +154,11 @@ char *BotFirstClientInRankings( void ) {
int i, bestscore, bestclient;
char buf[MAX_INFO_STRING];
static char name[32];
-   static int maxclients;
playerState_t ps;
 
-   if ( !maxclients ) {
-   maxclients = trap_Cvar_VariableIntegerValue( "sv_maxclients" );
-   }
-
bestscore = -99;
bestclient = 0;
-   for ( i = 0; i < maxclients && i < MAX_CLIENTS; i++ ) {
+   for ( i = 0; i < level.maxclients; i++ ) {
trap_GetConfigstring( CS_PLAYERS + i, buf, sizeof( buf ) );
//if no config string or no name
if ( !strlen( buf ) || !strlen( Info_ValueForKey( buf, "n" ) ) 
) {
@@ -208,16 +188,11 @@ char *BotLastClientInRankings( void ) {
int i, worstscore, bestclient;
char buf[MAX_INFO_STRING];
static char name[32];
-   static int maxclients;
playerState_t ps;
 
-   if ( !maxclients ) {
-   maxclients = trap_Cvar_VariableIntegerValue( "sv_maxclients" );
-   }
-
worstscore = 99;
bestclient = 0;
-   for ( i = 0; i < maxclients && i < MAX_CLIENTS; i++ ) {
+   for ( i = 0; i < level.maxclients; i++ ) {
trap_GetConfigstring( CS_PLAYERS + i, buf, sizeof( buf ) );
//if no config string or no name
if ( !strlen( buf ) || !strlen( Info_ValueForKey( buf, "n" ) ) 
) {
@@ -247,16 +222,11 @@ char *BotRandomOpponentName( bot_state_t *bs ) {
int i, count;
char buf[MAX_INFO_STRING];
int opponents[MAX_CLIENTS], numopponents;
-   static int maxclients;
static char name[32];
 
-   if ( !maxclients ) {
-   maxclients = trap_Cvar_VariableIntegerValue( "sv_maxclients" );
-   }
-
numopponents = 0;
opponents[0] = 0;
-   for ( i = 0; i < maxclients && i < MAX_CLIENTS; i++ ) {
+   for ( i = 0; i < level.maxclients; i++ ) {
 

[iortcw] 94/95: MP: Don't check whitelisted checksums when standalone

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51
in repository iortcw.

commit adbe1fa4595ae5067886f6a3332f55b57fb01913
Author: MAN-AT-ARMS 
Date:   Mon Jun 5 18:18:54 2017 -0400

MP: Don't check whitelisted checksums when standalone
---
 MP/code/qcommon/files.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index b07ccca..275c0aa 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -1595,10 +1595,10 @@ int FS_FindVM(void **startSearch, char *found, int 
foundlen, const char *name, q
// that they can be referenced
if (Q_stricmp(name, "qagame"))
{
+   netpath = FS_BuildOSPath(fs_homepath->string, 
pack->pakGamename, dllName);
+#ifndef STANDALONE
int index;
qboolean whitelisted = qfalse;
-
-   netpath = FS_BuildOSPath(fs_homepath->string, 
pack->pakGamename, dllName);

// Check whether this pak's checksum is on the 
whitelist
for(index = 0; index < 
ARRAY_LEN(binpak_checksums); index++)
@@ -1611,6 +1611,10 @@ int FS_FindVM(void **startSearch, char *found, int 
foundlen, const char *name, q
 
if (FS_FOpenFileReadDir(dllName, search, NULL, 
qfalse, unpure) > 0
&& whitelisted)
+#else
+   if (FS_FOpenFileReadDir(dllName, search, NULL, 
qfalse, unpure) > 0
+   && 
FS_CL_ExtractFromPakFile(search, netpath, dllName, NULL))
+#endif
{
Com_Printf( "Loading %s dll from %s\n", 
name, pack->pakFilename );
Q_strncpyz(found, netpath, foundlen);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 91/95: All: Only auto update empty internet server cache

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51
in repository iortcw.

commit b510b46ce8dcd4b8094fd6b300f1e9ad3816e0f1
Author: MAN-AT-ARMS 
Date:   Sun Jun 4 07:24:27 2017 -0400

All: Only auto update empty internet server cache

Unused in SP
---
 MP/code/ui/ui_main.c | 7 +++
 SP/code/ui/ui_main.c | 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c
index 0e3f299..b496e34 100644
--- a/MP/code/ui/ui_main.c
+++ b/MP/code/ui/ui_main.c
@@ -7919,11 +7919,10 @@ static void UI_StartServerRefresh( qboolean full, 
qboolean force ) {
 
// This function is called with force=qfalse when server browser menu 
opens or net source changes.
// Automatically update local and favorite servers.
-   // Only update master server list the first time because the server 
info cache will be available after that.
+   // Only auto update master server list if there is no server info cache.
if ( !force && ( ui_netSource.integer >= UIAS_GLOBAL1 && 
ui_netSource.integer <= UIAS_GLOBAL5 ) ) {
-   char *value = UI_Cvar_VariableString( va( 
"ui_lastServerRefresh_%i", ui_netSource.integer ) );
-   if ( value[0] != 0 ) {
-   return; // should have cached list
+   if ( trap_LAN_GetServerCount( UI_SourceForLAN() ) > 0 ) {
+   return; // have cached list
}
}
 
diff --git a/SP/code/ui/ui_main.c b/SP/code/ui/ui_main.c
index bd957bd..521e2c6 100644
--- a/SP/code/ui/ui_main.c
+++ b/SP/code/ui/ui_main.c
@@ -7707,11 +7707,10 @@ static void UI_StartServerRefresh( qboolean full, 
qboolean force ) {
 
// This function is called with force=qfalse when server browser menu 
opens or net source changes.
// Automatically update local and favorite servers.
-   // Only update master server list the first time because the server 
info cache will be available after that.
+   // Only auto update master server list if there is no server info cache.
if ( !force && ( ui_netSource.integer >= UIAS_GLOBAL1 && 
ui_netSource.integer <= UIAS_GLOBAL5 ) ) {
-   char *value = UI_Cvar_VariableString( va( 
"ui_lastServerRefresh_%i", ui_netSource.integer ) );
-   if ( value[0] != 0 ) {
-   return; // should have cached list
+   if ( trap_LAN_GetServerCount( UI_SourceForLAN() ) > 0 ) {
+   return; // have cached list
}
}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 90/95: All: Rend2: Remove unneeded code from RB_RenderDrawSurfList

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51
in repository iortcw.

commit 6a135cc5c9f1709f602d7f7a9e25fee129230656
Author: MAN-AT-ARMS 
Date:   Sun Jun 4 07:15:45 2017 -0400

All: Rend2: Remove unneeded code from RB_RenderDrawSurfList
---
 MP/code/rend2/tr_backend.c | 18 ++
 SP/code/rend2/tr_backend.c | 39 +--
 2 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/MP/code/rend2/tr_backend.c b/MP/code/rend2/tr_backend.c
index 9d26607..7744a02 100644
--- a/MP/code/rend2/tr_backend.c
+++ b/MP/code/rend2/tr_backend.c
@@ -544,8 +544,6 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
FBO_t*  fbo = NULL;
qbooleaninQuery = qfalse;
 
-   float   depth[2];
-
// save original time for entity shader offsets
originalTime = backEnd.refdef.floatTime;
 
@@ -563,9 +561,6 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
oldCubemapIndex = -1;
oldSort = -1;
 
-   depth[0] = 0.f;
-   depth[1] = 1.f;
-
backEnd.pc.c_surfaces += numDrawSurfs;
 
for ( i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++ 
) {
@@ -606,7 +601,6 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
// change the modelview matrix if needed
//
if ( entityNum != oldEntityNum ) {
-   qboolean sunflare = qfalse;
depthRange = isCrosshair = qfalse;
 
if ( entityNum != REFENTITYNUM_WORLD ) {
@@ -675,11 +669,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
}
 
if(!oldDepthRange)
-   {
-   depth[0] = 0;
-   depth[1] = 0.3f;
-   qglDepthRange (depth[0], 
depth[1]);
-   }
+   qglDepthRange (0, 0.3);
}
else
{
@@ -688,11 +678,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
GL_SetProjectionMatrix( 
backEnd.viewParms.projectionMatrix );
}
 
-   if (!sunflare)
-   qglDepthRange (0, 1);
-
-   depth[0] = 0;
-   depth[1] = 1;
+   qglDepthRange (0, 1);
}
 
oldDepthRange = depthRange;
diff --git a/SP/code/rend2/tr_backend.c b/SP/code/rend2/tr_backend.c
index d3478d3..3ece870 100644
--- a/SP/code/rend2/tr_backend.c
+++ b/SP/code/rend2/tr_backend.c
@@ -851,9 +851,8 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
FBO_t*  fbo = NULL;
qbooleaninQuery = qfalse;
 
-   float   depth[2];
int oldNumVerts, oldNumIndex;
-//GR - tessellation flag
+   //GR - tessellation flag
int atiTess = 0, oldAtiTess;
 
// save original time for entity shader offsets
@@ -872,12 +871,9 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
oldPshadowed = qfalse;
oldCubemapIndex = -1;
oldSort = -1;
-// GR - tessellation also forces to draw everything
+   // GR - tessellation also forces to draw everything
oldAtiTess = -1;
 
-   depth[0] = 0.f;
-   depth[1] = 1.f;
-
backEnd.pc.c_surfaces += numDrawSurfs;
 
for ( i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++ 
) {
@@ -902,7 +898,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
continue;
}
oldSort = drawSurf->sort;
-// GR - also extract tesselation flag
+   // GR - also extract tesselation flag
R_DecomposeSort( drawSurf->sort, , , , 
, ,  );
cubemapIndex = drawSurf->cubemapIndex;
 
@@ -911,12 +907,12 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
// a "entityMergable" shader is a shader that can have surfaces 
from seperate
// entities merged into a single batch, like smoke and blood 
puff sprites
if ( shader != NULL && ( shader != oldShader || fogNum != 
oldFogNum || dlighted != oldDlighted || pshadowed != oldPshadowed || 
cubemapIndex != oldCubemapIndex
-// GR 

[iortcw] 92/95: All: Add mouse wheel support to UI list boxes

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51
in repository iortcw.

commit ea30c07df52748f2791e92643e0e980da9d33357
Author: MAN-AT-ARMS 
Date:   Sun Jun 4 08:43:26 2017 -0400

All: Add mouse wheel support to UI list boxes
---
 MP/code/ui/ui_shared.c | 21 +
 SP/code/ui/ui_shared.c | 21 +
 2 files changed, 42 insertions(+)

diff --git a/MP/code/ui/ui_shared.c b/MP/code/ui/ui_shared.c
index dd65d0b..ca40216 100644
--- a/MP/code/ui/ui_shared.c
+++ b/MP/code/ui/ui_shared.c
@@ -2213,6 +2213,27 @@ qboolean Item_ListBox_HandleKey( itemDef_t *item, int 
key, qboolean down, qboole
return qtrue;
}
}
+
+   // Use mouse wheel in vertical and horizontal menus.
+   // If scrolling 3 items would replace over half of the
+   // displayed items, only scroll 1 item at a time.
+   if ( key == K_MWHEELUP ) {
+   int scroll = viewmax < 6 ? 1 : 3;
+   listPtr->startPos -= scroll;
+   if (listPtr->startPos < 0) {
+   listPtr->startPos = 0;
+   }
+   return qtrue;
+   }
+   if ( key == K_MWHEELDOWN ) {
+   int scroll = viewmax < 6 ? 1 : 3;
+   listPtr->startPos += scroll;
+   if (listPtr->startPos > max) {
+   listPtr->startPos = max;
+   }
+   return qtrue;
+   }
+
// mouse hit
if ( key == K_MOUSE1 || key == K_MOUSE2 ) {
if ( item->window.flags & WINDOW_LB_LEFTARROW ) {
diff --git a/SP/code/ui/ui_shared.c b/SP/code/ui/ui_shared.c
index c7f5545..5fff5c4 100644
--- a/SP/code/ui/ui_shared.c
+++ b/SP/code/ui/ui_shared.c
@@ -2206,6 +2206,27 @@ qboolean Item_ListBox_HandleKey( itemDef_t *item, int 
key, qboolean down, qboole
return qtrue;
}
}
+
+   // Use mouse wheel in vertical and horizontal menus.
+   // If scrolling 3 items would replace over half of the
+   // displayed items, only scroll 1 item at a time.
+   if ( key == K_MWHEELUP ) {
+   int scroll = viewmax < 6 ? 1 : 3;
+   listPtr->startPos -= scroll;
+   if (listPtr->startPos < 0) {
+   listPtr->startPos = 0;
+   }
+   return qtrue;
+   }
+   if ( key == K_MWHEELDOWN ) {
+   int scroll = viewmax < 6 ? 1 : 3;
+   listPtr->startPos += scroll;
+   if (listPtr->startPos > max) {
+   listPtr->startPos = max;
+   }
+   return qtrue;
+   }
+
// mouse hit
if ( key == K_MOUSE1 || key == K_MOUSE2 ) {
if ( item->window.flags & WINDOW_LB_LEFTARROW ) {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[iortcw] 86/95: All: Fix levelshot displayed in server browser

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51
in repository iortcw.

commit 0c9e8e36af23ecd1470e4a2f875584131725f2b5
Author: MAN-AT-ARMS 
Date:   Sat Jun 3 11:05:50 2017 -0400

All: Fix levelshot displayed in server browser

Unused in SP
---
 MP/code/ui/ui_main.c | 8 
 SP/code/ui/ui_main.c | 8 
 2 files changed, 16 insertions(+)

diff --git a/MP/code/ui/ui_main.c b/MP/code/ui/ui_main.c
index db53177..b4c0936 100644
--- a/MP/code/ui/ui_main.c
+++ b/MP/code/ui/ui_main.c
@@ -3432,6 +3432,9 @@ void UI_ServersSort( int column, qboolean force ) {
 
uiInfo.serverStatus.sortKey = column;
qsort( [0], 
uiInfo.serverStatus.numDisplayServers, sizeof( int ), UI_ServersQsortCompare );
+
+   // update displayed levelshot
+   UI_FeederSelection( FEEDER_SERVERS, uiInfo.serverStatus.currentServer );
 }
 
 
@@ -5287,6 +5290,11 @@ static void UI_InsertServerIntoDisplayList( int num, int 
position ) {
uiInfo.serverStatus.displayServers[i] = 
uiInfo.serverStatus.displayServers[i - 1];
}
uiInfo.serverStatus.displayServers[position] = num;
+
+   // update displayed levelshot
+   if ( position == uiInfo.serverStatus.currentServer ) {
+   UI_FeederSelection( FEEDER_SERVERS, 
uiInfo.serverStatus.currentServer );
+   }
 }
 
 /*
diff --git a/SP/code/ui/ui_main.c b/SP/code/ui/ui_main.c
index d430649..cbe4262 100644
--- a/SP/code/ui/ui_main.c
+++ b/SP/code/ui/ui_main.c
@@ -3477,6 +3477,9 @@ void UI_ServersSort( int column, qboolean force ) {
 
uiInfo.serverStatus.sortKey = column;
qsort( [0], 
uiInfo.serverStatus.numDisplayServers, sizeof( int ), UI_ServersQsortCompare );
+
+   // update displayed levelshot
+   UI_FeederSelection( FEEDER_SERVERS, uiInfo.serverStatus.currentServer );
 }
 
 
@@ -5190,6 +5193,11 @@ static void UI_InsertServerIntoDisplayList( int num, int 
position ) {
uiInfo.serverStatus.displayServers[i] = 
uiInfo.serverStatus.displayServers[i - 1];
}
uiInfo.serverStatus.displayServers[position] = num;
+
+   // update displayed levelshot
+   if ( position == uiInfo.serverStatus.currentServer ) {
+   UI_FeederSelection( FEEDER_SERVERS, 
uiInfo.serverStatus.currentServer );
+   }
 }
 
 /*

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits