[openjk] branch debian/master updated (8916d4f -> ebabfc0)

[Simon McVittie]

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

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

  from  8916d4f   openjk-academy-server: depend on lsb-base as recommended 
by Lintian
   new  ebabfc0   0~20161025+dfsg1-1

The 1 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 01/01: 0~20161025+dfsg1-1

[Simon McVittie]

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

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

commit ebabfc02942f60cc190e0afafece9315399d5704
Author: Simon McVittie 
Date:   Fri Oct 28 12:10:40 2016 +0100

0~20161025+dfsg1-1
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd6e2f4..ddcf303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium
+openjk (0~20161025+dfsg1-1) experimental; urgency=medium
 
   * New upstream snapshot
 - 64-bit builds now have the same saved game format as 32-bit builds
@@ -21,7 +21,7 @@ openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium
 fix one more instance of the same issue
   * openjk-academy-server: depend on lsb-base as recommended by Lintian
 
- -- Simon McVittie   Fri, 28 Oct 2016 10:57:57 +0100
+ -- Simon McVittie   Fri, 28 Oct 2016 12:10:23 +0100
 
 openjk (0~20160911+dfsg1-2) experimental; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] annotated tag debian/0_20161025+dfsg1-1 created (now 24ef572)

[Simon McVittie]

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

smcv pushed a change to annotated tag debian/0_20161025+dfsg1-1
in repository openjk.

at  24ef572   (tag)
   tagging  ebabfc02942f60cc190e0afafece9315399d5704 (commit)
  replaces  upstream/0_20161025+dfsg1
 tagged by  Simon McVittie
on  Fri Oct 28 22:57:17 2016 +0100

- Log -
openjk Debian release 0~20161025+dfsg1-1
-BEGIN PGP SIGNATURE-

iQIcBAABCAAGBQJYE8m9AAoJEE3o/ypjx8yQrQwP/jqrET+7vXesZjxAYNE1cE6Y
RnL5IkAA3dvo4AWETxa/7BzYC9Z1JhWND6kHtK6rE/iO7ury6l0blrUKPoWS6b6r
nwj+8Du+cuu2DyPEI141toYIrhTimsuzSfGtXxS9HPBD2MDGRWlMlUlPNVL+Myae
XuT+TzIyrX6ZPVMOw9/j/s7TQ44aTIEj0xeVAR9p2qNFBqx01BuBaoGdy14OhGeN
Qs7js2Y1sbeX9naUeimbDxzODj8pVWXrrwty9WzpHSsZfmDLJLhxFZkxwbWx3Zc9
3ChR35EvcJZLL/PdcLdUqOzoFhJRuAGfLczLBxz8Eu4QyxTtRE3JdSPzTE3A/UkR
+qzIVdVnDFm0msV1YL2YoNQpvRQ4egkat0ell8DlvKnsWJLDe71o/TpFa/Fpt7wr
20+tiyhuvGfO996SfH0tvnguN03vsRBBeBveFFKxK7EDOBDh5t4fjb/TiQJ0BnWs
OM8rrb9Zhrq3A8J4Hmjoho6nAZ9Jf1mRH8Uw9dGhMnVqqWgAv6IZJPBH9/TkTfAv
QOvxbvTCL/7JgGa5FTCKj76/ztNmIKReQ6Rk3jGfMVNMj+SWHQSyxY+BeQCtFRbK
P1ZDiMXR58S3RQDFYF2weWhnsdI4/B6cKZdw1mjOy1zeURMFxraMkv0dspEg5Vqb
4ykW8y/FD9E5vdhtzmUU
=oB/n
-END PGP SIGNATURE-

Simon McVittie (136):
  Initial Debian packaging
  Build-depend on icns-utils to extract from Mac icons
  Add Debian menu entries
  Simplify SP menu item
  Use upstream's naming for executables and menu files
  Correctly depend on openjk-common
  control: improve wording
  openjk-common: suggest game-data-packager
  openjk-debug: move to correct section
  Parallel build
  experimental is on the master branch for now
  priority: no real reason why this needs to be extra
  Don't link to a bunch of unnecessary X11 libraries
  lintian says this should be a Depends
  Add init script and instanced systemd unit
  Add man pages
  Use NET_Sleep() (or Sys_Sleep() for SP) to avoid busy-waiting
  Update copyright file based on upstream feedback
  Merge tag 'upstream/0_20150103+ds1'
  New upstream snapshot; update patches
  fix incorrect syntax in copyright file
  Add patch fixing an uninitialized variable
  Improve .desktop files
  Merge tag 'upstream/0_20150104+ds1'
  New upstream snapshot fixing some regressions
  Don't run the systemd service as root!
  Redo init script and systemd units based on quake/12
  New upstream snapshot
  Merge tag 'upstream/0_20150204+ds1'
  unfuzz patches
  Change vcs-browser to cgit, and use https because we can
  No need to exclude 2 out of 3 copies of glext.h any more
  New upstream snapshot
  Remove SDL2 from orig tarballs
  Merge tag 'upstream/0_20150208+ds1'
  Refresh patches, squash some compiler warnings
  Adjust paths for updated game-data-packager
  update debian/copyright for current upstream code
  use ioquake3 copyright blurb as our sample GPL-2+ license declaration
  Merge tag 'upstream/0_20150318+ds1'
  New upstream snapshot
  Exclude icon and replace it with a placeholder while licensing is resolved
  Add patch to fix installation of game modules
  Revert "Exclude icon and replace it with a placeholder while licensing is 
resolved"
  New snapshot with source files for icons, and some licensing fixes
  Merge tag 'upstream/0_20150323+ds1'
  remove upstreamed patch
  The EAX DLL is in fact non-free
  New upstream snapshot. Exclude all of tools/ which is no longer needed
  Imported Upstream version 0~20150420+dfsg1
  new upstream
  Fix some fallout from commit 03235915
  Mark some unforwarded patches as such
  Adapt for new upstream installation layout with JediAcademy, JediOutcast 
dirs
  copyright: tweak syntax
  update patches
  Add patches for portability to non-x86 non-ARM architectures
  reword some commit messages
  add another portability patch, making JA work on PowerPC
  Having tested this on a PowerPC, I think we can claim it's portable
  Require game-data-packager 41 for the changed filesystem layout
  adjust patch wording
  Mark more patches as forwarded
  Merge tag 'upstream/0_20150430+dfsg1'
  New upstream snapshot; drop the corresponding patch
  Summarize the Debian patches
  debian/rules: omit openjk-outcast package for non-experimental builds
  release
  debian/copyright: use the copyright-format URL, not DEP-5
  debian/copyright: add Disclaimer explaining that this contrib package is 
not part of Debian (Policy §12.5)
  Correct ITP bug number in previous changelog entry
  Merge tag 'upstream/0_20150524+dfsg1'
  New upstream snapshot
  release
  Drop patch to avoid direct libX11 dependency, no longer needed with CMake 
3.2
  Merge tag 'upstream/0_20150731+dfsg1'
  New upstream snapshot
  debian/rules: add 

[minetest-mod-nether] annotated tag debian/2-2 created (now 79b3fb8)

[Mattia Rizzolo]

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

mattia pushed a change to annotated tag debian/2-2
in repository minetest-mod-nether.

at  79b3fb8   (tag)
   tagging  24a9d46c548ea0a6cb104bcf7ac2b07e779c95fe (commit)
  replaces  upstream/2
 tagged by  Mattia Rizzolo
on  Fri Oct 28 18:52:53 2016 +

- Log -
minetest-mod-nether Debian release 2-2
-BEGIN PGP SIGNATURE-

iQIcBAABCgAGBQJYE56FAAoJEAgWueGMdiut3tcP/jnOJSRAMrLk1dpUKUkWUo38
lRcACC1qzG47soxk+nythjZfyrvAR4MSkonKechC/Wl/4ZAG5lTiDWsJ5iyonI4P
V1nZpFPUgyFZUPnbf7wQRXXr6ZGGXxt/rAxguPPtA4sRNNEMNCykac8b3IBVb8jk
yo3kaAXOaahf5wMCxvp1eM4m5LUaGcjinb+flqXAVOlJ6ctedD9oz36cBblc5N3U
t183y5Iye66doPpuYvVPU5+wS5j41x/eXRTMHsgkTzPtsQly0WF0ldBgs3zOKu75
1fGax04xMuTHVrY16LNWkhVDPsPo0WSnEGDxEr3/z1s/lCKk+Zb+rYxfYpbFS6o1
vulxsmXVipcPDwv0rPZEPGSd3dy2rig2ZYefOcb5vYzJyqXgSM7zzoT7nFXh2Dx2
tQbMFrwtm+d/Z0/gAlA5kL7ml3BthYNgD+Sg1vg/uZp0UOT0uEwQYDjgdKWaLdua
lvo4G+dpaa+NVLY/pwEsq/0jxJ6MKbr1iPekoz3/TB5ogJSk707XLNHpWi4jDZnt
5V3aa6+8RNb9oyRoRKLjdaoXl8PX8AJPjiMbz0mps22EMwI6p9WL0RmXEbbUTACi
HiZ5+euQ3zNUZEw5TvEi3O1vgWBRCHKO1qxu395CL08t/nco3c1udK6dKcKHnUFH
I/NA+JMmgKf04866n3QK
=D6hg
-END PGP SIGNATURE-

Julien Puydt (10):
  Initial packaging
  Prepare for upload
  Fix Vcs-browser field (s/cgit/git)
  Moved copyright declarations above licenses' texts
  Merge tag 'upstream/2'
  New upstream release version 2
  Ship schematics too (Closes: #841010)
  Depend on a correct moreblocks package
  Prepare for upload
  Push dh compat to 10

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-nether.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

[minetest-mod-nether] 03/04: Prepare for upload

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-nether.

commit 3d750e832d6fb3ae21d4655f002a490b7ac76b48
Author: Julien Puydt 
Date:   Fri Oct 28 19:59:29 2016 +0200

Prepare for upload
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed4dcc8..30f23bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-minetest-mod-nether (2-2) UNRELEASED; urgency=medium
+minetest-mod-nether (2-2) unstable; urgency=medium
 
   * Ship schematics too (Closes: #841010)
   * Depend on a correct moreblocks package (Closes: #834596)
 
- -- Julien Puydt   Fri, 28 Oct 2016 07:29:20 +0200
+ -- Julien Puydt   Fri, 28 Oct 2016 19:59:18 +0200
 
 minetest-mod-nether (2-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-nether.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

[minetest-mod-nether] 04/04: Push dh compat to 10

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-nether.

commit 24a9d46c548ea0a6cb104bcf7ac2b07e779c95fe
Author: Julien Puydt 
Date:   Fri Oct 28 20:06:53 2016 +0200

Push dh compat to 10
---
 debian/changelog | 5 +++--
 debian/compat| 2 +-
 debian/control   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30f23bc..db4313f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 minetest-mod-nether (2-2) unstable; urgency=medium
 
-  * Ship schematics too (Closes: #841010)
-  * Depend on a correct moreblocks package (Closes: #834596)
+  * Ship schematics too. (Closes: #841010)
+  * Depend on a correct moreblocks package. (Closes: #834596)
+  * Push dh compat to 10.
 
  -- Julien Puydt   Fri, 28 Oct 2016 19:59:18 +0200
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 7a47684..89b7a87 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team 
 Uploaders: Julien Puydt 
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 10)
 Standards-Version: 3.9.8
 Homepage: https://github.com/PilzAdam/nether
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/minetest-mod-nether.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-nether.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

[minetest-mod-nether] branch master updated (5edb0b0 -> 24a9d46)

[Julien Puydt]

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

jpuydt-guest pushed a change to branch master
in repository minetest-mod-nether.

  from  5edb0b0   New upstream release version 2
   new  eef02b1   Ship schematics too (Closes: #841010)
   new  468a27b   Depend on a correct moreblocks package
   new  3d750e8   Prepare for upload
   new  24a9d46   Push dh compat to 10

The 4 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 | 8 
 debian/compat| 2 +-
 debian/control   | 4 ++--
 debian/install   | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-nether.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

[minetest-mod-nether] 02/04: Depend on a correct moreblocks package

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-nether.

commit 468a27b7a47513b2cf90b7be469c9b2eedc3b88c
Author: Julien Puydt <julien.pu...@laposte.net>
Date:   Fri Oct 28 19:59:12 2016 +0200

Depend on a correct moreblocks package
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 32d326b..ed4dcc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 minetest-mod-nether (2-2) UNRELEASED; urgency=medium
 
   * Ship schematics too (Closes: #841010)
+  * Depend on a correct moreblocks package (Closes: #834596)
 
  -- Julien Puydt <julien.pu...@laposte.net>  Fri, 28 Oct 2016 07:29:20 +0200
 
diff --git a/debian/control b/debian/control
index 22efed3..7a47684 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: 
https://anonscm.debian.org/git/pkg-games/minetest-mod-nether.git
 
 Package: minetest-mod-nether
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, minetest | minetest-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, minetest-mod-moreblocks (>= 
0~20161028), minetest | minetest-server
 Description: Minetest mod - Nether portals and materials
  This minetest extension adds a deep underground realm with different map
  generators.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-nether.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

[minetest-mod-nether] 01/04: Ship schematics too (Closes: #841010)

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-nether.

commit eef02b1497267ed9f7abb03ce9dadc48f2c9d46f
Author: Julien Puydt 
Date:   Fri Oct 28 07:30:03 2016 +0200

Ship schematics too (Closes: #841010)
---
 debian/changelog | 6 ++
 debian/install   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 486d00a..32d326b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+minetest-mod-nether (2-2) UNRELEASED; urgency=medium
+
+  * Ship schematics too (Closes: #841010)
+
+ -- Julien Puydt   Fri, 28 Oct 2016 07:29:20 +0200
+
 minetest-mod-nether (2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/install b/debian/install
index 2de88be..114ca35 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,5 @@
 depends.txt usr/share/games/minetest/mods/nether
+schematics usr/share/games/minetest/mods/nether
 textures usr/share/games/minetest/mods/nether
 init.lua usr/share/games/minetest/mods/nether
 mod.conf usr/share/games/minetest/mods/nether

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-nether.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

[minetest-mod-moreblocks] annotated tag debian/0_20161028+git7f06db22-1 created (now bcccfbd)

[Mattia Rizzolo]

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

mattia pushed a change to annotated tag debian/0_20161028+git7f06db22-1
in repository minetest-mod-moreblocks.

at  bcccfbd   (tag)
   tagging  04175cfd65ec1e1f5aa42904893ad65a8b60f33e (commit)
  replaces  debian/0_20130827+gitee1b3025cc-1
 tagged by  Mattia Rizzolo
on  Fri Oct 28 16:49:10 2016 +

- Log -
minetest-mod-moreblocks Debian release 0~20161028+git7f06db22-1
-BEGIN PGP SIGNATURE-

iQIcBAABCgAGBQJYE4GGAAoJEAgWueGMdiutl7cQAIrs+NYmMTn/xvgQ9lVFriQ1
LWTLTnEGLLJLxW2YcWeu9CE2cUUfYp3lsv6QITn/Wp4+Zv4LGTbJUWoL8uA8PiiC
gF2nGUgMwvTJ/vl+O2tjj1uCyOnx2WZBiZWec799DYh80rx/v3IPPfIiyU9EcmXM
SDwAbGPqTO1A3LNyUwsW7lP4oEnAM6cXmE35++gDisoxU2IrvaPZKAEMWfI6tWah
qozWdeevX2vRVNlTGerNR/CbBxXU6QBSi69YiqmccMgESuAYnGusouZ84y8/1P24
MrVrpcPA6wvzviIEYG/+o4VkyR1Bkj+U+ap1CgGu9L9Ti5ktS43ITqmKqH32LMF2
uN9kSca8DhV34M59rFeVrLbBiC28Ep9a36RV0vDjFXKDj1kHmGG8nan6lXhNtlOf
+eTKYB81pITlLHmUHQuOwPN4jt4i1Mzjq0BYqjIgAbdzmz9LqnWm6Q6FtEH/2ViH
iTunxjERPbrCzjc5HZFZWKzQhGCd9a/Vi87KmfPtF/QzGYKuq2CQq9tuV5PpH+8u
pBMpFkMKVxzHtW0uMohuPT1D9TuASoabtcVwYhr+p5jP/d87Bjxc7Emr0ehW/h5q
4/QXqVnH+KVv8uw5wXPahNR/69rb6eg1h7gbcF504/qUaZ5Y/dXzdmGYqwFximUW
u/baZB5nvsPj9wf2zREW
=c6xn
-END PGP SIGNATURE-

Dominik George (1):
  Moved under team maintenance.

Julien Puydt (13):
  Push dh compat to 10
  Push standards-version to 3.9.8
  Use https in Vcs-* fields
  Depend on minetest or minetest-server (Closes: #770606)
  Updating the changelog to document the last commits
  New upstream version 20161028+git7f06db22
  New upstream snapshot
  Updated copyright assignments
  Modified the "Team upload" declaration so lintian understands it
  Adapted installed files to what is in upstream
  Prepare for upload
  Added myself to uploaders and added a homepage
  Added back 0~ in the version in case upstream decides to do proper 
releases

Mattia Rizzolo (1):
  remove trailing whitespace

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] annotated tag upstream/0_20161028+git7f06db22 created (now 1c843b2)

[Mattia Rizzolo]

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

mattia pushed a change to annotated tag upstream/0_20161028+git7f06db22
in repository minetest-mod-moreblocks.

at  1c843b2   (tag)
   tagging  a4da2f471d4f302000b2c7acb0be05a7d4706e34 (commit)
  replaces  upstream/0_20130827+gitee1b3025cc
 tagged by  Julien Puydt
on  Fri Oct 28 16:41:06 2016 +0200

- Log -
Upstream version 20161028+git7f06db22
-BEGIN PGP SIGNATURE-

iQI2BAABCAAgBQJYE2OCGRxqdWxpZW4ucHV5ZHRAbGFwb3N0ZS5uZXQACgkQBMU7
1/4DBVEupg/+NBLxD1ykSgJdJHcNAxP6cLV2jnnRzll7BiQEn/0mw3DUMPZBsS7c
vz9TrynUANQ3pMTBenM4kAZjQolgcqhGcEGRwu+FPDe+tIC2hNea0VrnjpKPgNzl
3S6llzDt/07KS2vBld0UZTlY7nEq8aJs5684vO3iI7IoDfzha7n1dzp48Khr6qKO
B66eh62Y/HiAEw3btkRff0ZCZqcf2smC/im8BV0OVdEGCAWa0PjDIwGEcAcaO1D5
xwRJJzA3Cytd+NIb8vGi52zxBlJ1ShCdlXxBqgn6PWK+AokT2BnqtpUw4TJ/6Ut7
vKLxcVBk8tfSwSjRlOJZ57pLFEIm001js2QJg9GvJJEezRA+havc/aBvLWyf4bZJ
keu3hi9Lq4LwfO1oqlZOuQ91J3x1VEijIrg4Q2F5Y1Qel7MCMgXCe6S78+P9G1Fl
eTgUR/tzpk1rTH6o5oTBt41e4g/rwXWtW/AxS0ktfW4PNZ2R3i3/D5rHieRVYMEv
W1VreI2trm43q7tZOSgUuzp5qiRLSSXanfFSiolppeiFBYacnX5PjMUZv6N+Pz3c
TE2J6iEEKwJOIZwZo6OxANzRLaUPT6i/GX8TC+CP9wOwDo3+ENRIA6M8GH5D4kBq
nme498pylW3if+mShVtMciTd5JQ6gPBkrg3tBbqpuWur06+iSgg7DTI=
=kPbp
-END PGP SIGNATURE-

Julien Puydt (2):
  New upstream version 20161028+git7f06db22
  New upstream version 20161028+git7f06db22

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 01/01: Added back 0~ in the version in case upstream decides to do proper releases

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit 04175cfd65ec1e1f5aa42904893ad65a8b60f33e
Author: Julien Puydt <julien.pu...@laposte.net>
Date:   Fri Oct 28 18:41:29 2016 +0200

Added back 0~ in the version in case upstream decides to do proper releases
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3ab601e..95a304c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-minetest-mod-moreblocks (20161028+git7f06db22-1) unstable; urgency=low
+minetest-mod-moreblocks (0~20161028+git7f06db22-1) unstable; urgency=low
 
   * Team upload.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] branch master updated (1049dd6 -> 04175cf)

[Julien Puydt]

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

jpuydt-guest pushed a change to branch master
in repository minetest-mod-moreblocks.

  from  1049dd6   remove trailing whitespace
   new  04175cf   Added back 0~ in the version in case upstream decides to 
do proper releases

The 1 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] branch master updated (ae3cab1 -> 1049dd6)

[Mattia Rizzolo]

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

mattia pushed a change to branch master
in repository minetest-mod-moreblocks.

  from  ae3cab1   Added myself to uploaders and added a homepage
   new  1049dd6   remove trailing whitespace

The 1 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/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 01/01: remove trailing whitespace

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit 1049dd6c3644026c7da3e7aa639d2ca7d28b5a56
Author: Mattia Rizzolo 
Date:   Fri Oct 28 16:39:07 2016 +

remove trailing whitespace

Gbp-Dch: Ignore
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 4067ba0..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-   dh $@ 
+   dh $@

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 01/02: pristine-tar data for minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch pristine-tar
in repository minetest-mod-moreblocks.

commit f4e7be56cc8071d1d5ef3fd7fbffbfc3f39d22c1
Author: Julien Puydt 
Date:   Fri Oct 28 16:39:16 2016 +0200

pristine-tar data for 
minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz
---
 ...mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta | Bin 0 -> 3624 bytes
 ...st-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.id |   1 +
 2 files changed, 1 insertion(+)

diff --git a/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta 
b/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta
new file mode 100644
index 000..abb104f
Binary files /dev/null and 
b/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta differ
diff --git a/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.id 
b/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.id
new file mode 100644
index 000..82355a8
--- /dev/null
+++ b/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.id
@@ -0,0 +1 @@
+cb4419846ef58c0929dd9cc48914fb3950bc72ad

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 11/12: Prepare for upload

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit a212165a894c75baaa57442cb4076d516b4eb0e1
Author: Julien Puydt <julien.pu...@laposte.net>
Date:   Fri Oct 28 17:49:44 2016 +0200

Prepare for upload
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52d8a8e..3ab601e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-minetest-mod-moreblocks (20161028+git7f06db22-1) UNRELEASED; urgency=low
+minetest-mod-moreblocks (20161028+git7f06db22-1) unstable; urgency=low
 
   * Team upload.
 
@@ -16,7 +16,7 @@ minetest-mod-moreblocks (20161028+git7f06db22-1) UNRELEASED; 
urgency=low
   * New upstream snapshot.
   * Updated copyright assignments.
 
- -- Julien Puydt <julien.pu...@laposte.net>  Fri, 28 Oct 2016 16:41:37 +0200
+ -- Julien Puydt <julien.pu...@laposte.net>  Fri, 28 Oct 2016 17:49:35 +0200
 
 minetest-mod-moreblocks (0~20130827+gitee1b3025cc-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] branch upstream updated (6655979 -> a4da2f4)

[Julien Puydt]

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

jpuydt-guest pushed a change to branch upstream
in repository minetest-mod-moreblocks.

  from  6655979   Imported Upstream version 0~20130827+gitee1b3025cc
   new  bcf142e   New upstream version 20161028+git7f06db22
   new  a4da2f4   New upstream version 20161028+git7f06db22

The 2 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:
 LICENSE.txt => LICENSE.md  |   7 +-
 README.md  |  13 +
 README.txt |  22 -
 _config.txt|  11 -
 aliases.lua| 175 ++
 circular_saw.lua   | 647 +++--
 config.lua |  29 +
 crafting.lua   | 282 ++---
 depends.txt|   1 +
 description.txt|   1 +
 init.lua   | 391 ++---
 locale/de.txt  |  67 +++
 locale/fr.txt  |  50 +-
 locale/it.txt  |  70 +++
 locale/template.txt|  64 ++
 mod.conf   |   1 +
 models/moreblocks_slope.obj|  26 +
 models/moreblocks_slope_cut.obj|  33 ++
 models/moreblocks_slope_half.obj   |  28 +
 models/moreblocks_slope_half_raised.obj|  32 +
 models/moreblocks_slope_inner.obj  |  35 ++
 models/moreblocks_slope_inner_cut.obj  |  32 +
 models/moreblocks_slope_inner_cut_half.obj |  34 ++
 models/moreblocks_slope_inner_cut_half_raised.obj  |  35 ++
 models/moreblocks_slope_inner_half.obj |  35 ++
 models/moreblocks_slope_inner_half_raised.obj  |  38 ++
 models/moreblocks_slope_outer.obj  |  25 +
 models/moreblocks_slope_outer_cut.obj  |  23 +
 models/moreblocks_slope_outer_cut_half.obj |  24 +
 models/moreblocks_slope_outer_cut_half_raised.obj  |  28 +
 models/moreblocks_slope_outer_half.obj |  27 +
 models/moreblocks_slope_outer_half_raised.obj  |  34 ++
 nodes.lua  | 356 
 ownership.lua  |  41 ++
 redefinitions.lua  | 249 +---
 stairsplus.lua | 434 --
 stairsplus/API.md  |  24 +
 stairsplus/aliases.lua |  69 ++-
 .../conversion.lua |  88 +--
 stairsplus/init.lua|  91 +++
 stairsplus/microblocks.lua | 168 +-
 stairsplus/panels.lua  | 147 -
 stairsplus/registrations.lua   |  65 +++
 stairsplus/slabs.lua   | 321 ++
 stairsplus/slopes.lua  | 362 
 stairsplus/stairs.lua  | 331 +--
 textures/default_brick.png | Bin 0 -> 716 bytes
 textures/default_fence_overlay.png | Bin 0 -> 285 bytes
 textures/invisible.png | Bin 0 -> 68 bytes
 textures/moreblocks_cactus_brick.png   | Bin 735 -> 718 bytes
 textures/moreblocks_cactus_checker.png | Bin 826 -> 693 bytes
 textures/moreblocks_circle_stone_bricks.png| Bin 646 -> 448 bytes
 textures/moreblocks_circular_saw_bottom.png| Bin 699 -> 579 bytes
 textures/moreblocks_circular_saw_side.png  | Bin 587 -> 478 bytes
 textures/moreblocks_circular_saw_top.png   | Bin 667 -> 441 bytes
 textures/moreblocks_clean_glass.png| Bin 249 -> 177 bytes
 textures/moreblocks_clean_glass_detail.png | Bin 0 -> 96 bytes
 textures/moreblocks_coal_checker.png   | Bin 902 -> 744 bytes
 textures/moreblocks_coal_glass.png | Bin 245 -> 155 bytes
 textures/moreblocks_coal_glass_detail.png  | Bin 0 -> 159 bytes
 textures/moreblocks_coal_glass_stairsplus.png  | Bin 278 -> 166 bytes
 textures/moreblocks_coal_stone.png | Bin 545 -> 229 bytes
 textures/moreblocks_coal_stone_bricks.png  | Bin 0 -> 484 bytes
 textures/moreblocks_cobble_compressed.png  | Bin 0 -> 356 bytes
 textures/moreblocks_copperpatina.png   | Bin 0 -> 325 

[minetest-mod-moreblocks] 02/02: pristine-tar data for minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch pristine-tar
in repository minetest-mod-moreblocks.

commit 859e58036841531088644c94ed838274faa90252
Author: Julien Puydt 
Date:   Fri Oct 28 16:41:06 2016 +0200

pristine-tar data for 
minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz
---
 ...-moreblocks_20161028+git7f06db22.orig.tar.gz.delta | Bin 3624 -> 3608 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta 
b/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta
index abb104f..9d4c712 100644
Binary files a/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta 
and b/minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta differ

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 05/12: Updating the changelog to document the last commits

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit 46f0069485b504204a7b98d37fa2260cfa162aab
Author: Julien Puydt 
Date:   Fri Oct 28 16:39:01 2016 +0200

Updating the changelog to document the last commits
---
 debian/README.source |  3 +++
 debian/changelog | 10 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..5aed012
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,3 @@
+The source tarball is obtained by using a git clone of the upstream archive,
+checking out the commit given in debian/changelog's version, removing the .git
+directory, then packing the resulting directory.
diff --git a/debian/changelog b/debian/changelog
index da2efa2..afdb8cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-minetest-mod-moreblocks (0~20130827+gitee1b3025cc-2) unstable; urgency=low
+minetest-mod-moreblocks (0~20130827+gitee1b3025cc-2) UNRELEASED; urgency=low
 
+  [ Dominik George ]
   * Moved package under pkg-games maintenance.
   * Added myself to Uploaders.
   * Added Vcs-* fields.
   * Set priority to extra because of minetest dependency.
 
+  [ Julien Puydt ]
+  * Team upload.
+  * Pushed standards-version and dh compat to 3.9.8 and 10.
+  * Used https in Vcs-* fields.
+  * Added depend on minetest or minetest-server. (Closes: #770606)
+  * Added a README.source.
+
  -- Dominik George   Sat, 14 Sep 2013 18:56:08 +0200
 
 minetest-mod-moreblocks (0~20130827+gitee1b3025cc-1) unstable; urgency=low

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 07/12: New upstream snapshot

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit 9fbc3c9f5cc184a01d341aadb43767e0e777ff61
Author: Julien Puydt <julien.pu...@laposte.net>
Date:   Fri Oct 28 16:42:04 2016 +0200

New upstream snapshot
---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index afdb8cd..92be894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-minetest-mod-moreblocks (0~20130827+gitee1b3025cc-2) UNRELEASED; urgency=low
+minetest-mod-moreblocks (20161028+git7f06db22-1) UNRELEASED; urgency=low
 
   [ Dominik George ]
   * Moved package under pkg-games maintenance.
@@ -12,8 +12,9 @@ minetest-mod-moreblocks (0~20130827+gitee1b3025cc-2) 
UNRELEASED; urgency=low
   * Used https in Vcs-* fields.
   * Added depend on minetest or minetest-server. (Closes: #770606)
   * Added a README.source.
+  * New upstream snapshot.
 
- -- Dominik George <n...@naturalnet.de>  Sat, 14 Sep 2013 18:56:08 +0200
+ -- Julien Puydt <julien.pu...@laposte.net>  Fri, 28 Oct 2016 16:41:37 +0200
 
 minetest-mod-moreblocks (0~20130827+gitee1b3025cc-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 08/12: Updated copyright assignments

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit 022f9dbc490f1ccd280337a599aad3262ad5b280
Author: Julien Puydt <julien.pu...@laposte.net>
Date:   Fri Oct 28 16:51:03 2016 +0200

Updated copyright assignments
---
 debian/changelog |  1 +
 debian/copyright | 42 +++---
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92be894..a4d8b0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ minetest-mod-moreblocks (20161028+git7f06db22-1) UNRELEASED; 
urgency=low
   * Added depend on minetest or minetest-server. (Closes: #770606)
   * Added a README.source.
   * New upstream snapshot.
+  * Updated copyright assignments.
 
  -- Julien Puydt <julien.pu...@laposte.net>  Fri, 28 Oct 2016 16:41:37 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 87a78f3..6341d39 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: minetest-mod-pipeworks
-Source: 
https://github.com/Calinou/moreores/archive/0977bbc809151e507f78b176993339aa883308ca.zip
+Upstream-Name: moreblocks
+Source: https://github.com/minetest-mods/moreblocks
 
 Files: *
-Copyright: 2013 Calinou
+Copyright: 2011-2015 Calinou and contributors
 License: zlib/libpng
  This software is provided 'as-is', without any express or implied warranty. In
  no event will the authors be held liable for any damages arising from the use
@@ -358,8 +358,44 @@ License: CC-BY-SA-3.0
  included in the License; this License is not intended to restrict
  the license of any rights under applicable law.
 
+Files: textures/moreblocks_copperpatina.png
+Copyright: pithydon
+License: CC-0
+ creative commons Public Domain Dedication
+ .
+ Copyright-Only Dedication (based on United States law) or Public Domain 
+ Certification
+ .
+ The person or persons who have associated work with this document (the 
+ "Dedicator" or "Certifier") hereby either (a) certifies that, to the best 
+ of his knowledge, the work of authorship identified is in the public 
+ domain of the country from which the work is published, or (b) hereby 
+ dedicates whatever copyright the dedicators holds in the work of authorship 
+ identified below (the "Work") to the public domain. A certifier, moreover, 
+ dedicates any copyright interest he may have in the associated work, and 
+ for these purposes, is described as a "dedicator" below.
+ .
+ A certifier has taken reasonable steps to verify the copyright status of 
+ this work. Certifier recognizes that his good faith efforts may not shield 
+ him from liability if in fact the work certified is not in the public domain.
+ .
+ A dedicator makes this dedication for the benefit of the public at large and 
+ to the detriment of the Dedicator's heirs and successors. Dedicators intend 
+ this dedication to be an overt act of relinquishment in perpetuity of all 
+ present and future rights under copyright law, whether vested or contingent, 
+ in the Work. Dedicator understand that such relinquishment of all rights 
+ includes the relinquishment of all rights to enforce (by lawsuit or
+ otherwise)  those copyrights in the Work.
+ .
+ Dedicator recognizes that, once placed in the public domain, the Work may be 
+ freely reproduced, distributed, transmitted, used, modified, built upon, or 
+ otherwise exploited by anyone for any purpose, commercial or non-commercial, 
+ and in any way, including by methods that have not yet been invented or 
+ conceived.
+
 Files: debian/*
 Copyright: 2013 Dominik George <n...@naturalnet.de>
+  2016 Julien Puydt <julien.pu...@laposte.net>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 09/12: Modified the "Team upload" declaration so lintian understands it

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit 675f91b7ab0dbe72bd1cfe38d4eb60adb0f8f683
Author: Julien Puydt <julien.pu...@laposte.net>
Date:   Fri Oct 28 16:52:15 2016 +0200

Modified the "Team upload" declaration so lintian understands it
---
 debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a4d8b0b..52d8a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 minetest-mod-moreblocks (20161028+git7f06db22-1) UNRELEASED; urgency=low
 
+  * Team upload.
+
   [ Dominik George ]
   * Moved package under pkg-games maintenance.
   * Added myself to Uploaders.
@@ -7,7 +9,6 @@ minetest-mod-moreblocks (20161028+git7f06db22-1) UNRELEASED; 
urgency=low
   * Set priority to extra because of minetest dependency.
 
   [ Julien Puydt ]
-  * Team upload.
   * Pushed standards-version and dh compat to 3.9.8 and 10.
   * Used https in Vcs-* fields.
   * Added depend on minetest or minetest-server. (Closes: #770606)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 10/12: Adapted installed files to what is in upstream

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit 99b8ee3d4366a67b77b8d5ef1fba8ee0e3e30919
Author: Julien Puydt 
Date:   Fri Oct 28 17:05:54 2016 +0200

Adapted installed files to what is in upstream
---
 debian/docs| 2 +-
 debian/install | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/docs b/debian/docs
index 71dfd5b..b43bf86 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README.txt
+README.md
diff --git a/debian/install b/debian/install
index 4ecbb75..3548c0c 100644
--- a/debian/install
+++ b/debian/install
@@ -1,5 +1,7 @@
 depends.txt usr/share/games/minetest/mods/moreblocks
-_config.txt usr/share/games/minetest/mods/moreblocks
+mod.conf usr/share/games/minetest/mods/moreblocks
 *.lua usr/share/games/minetest/mods/moreblocks
+locale usr/share/games/minetest/mods/moreblocks
+models usr/share/games/minetest/mods/moreblocks
 textures usr/share/games/minetest/mods/moreblocks
 stairsplus usr/share/games/minetest/mods/moreblocks

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] branch pristine-tar updated (d79d3fc -> 859e580)

[Julien Puydt]

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

jpuydt-guest pushed a change to branch pristine-tar
in repository minetest-mod-moreblocks.

  from  d79d3fc   pristine-tar data for 
minetest-mod-moreblocks_0~20130827+gitee1b3025cc.orig.tar.gz
   new  f4e7be5   pristine-tar data for 
minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz
   new  859e580   pristine-tar data for 
minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz

The 2 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:
 ...mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta | Bin 0 -> 3608 bytes
 ...st-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.id |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 
minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.delta
 create mode 100644 minetest-mod-moreblocks_20161028+git7f06db22.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 02/02: New upstream version 20161028+git7f06db22

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch upstream
in repository minetest-mod-moreblocks.

commit a4da2f471d4f302000b2c7acb0be05a7d4706e34
Author: Julien Puydt <julien.pu...@laposte.net>
Date:   Fri Oct 28 16:41:06 2016 +0200

New upstream version 20161028+git7f06db22

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 03/12: Use https in Vcs-* fields

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit f23eb48ebf7dceba7bb34851389a03701c8ae6fe
Author: Julien Puydt 
Date:   Fri Oct 28 07:43:32 2016 +0200

Use https in Vcs-* fields
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 3feaffb..881e69c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders:
  Dominik George 
 Build-Depends: debhelper (>= 10)
 Standards-Version: 3.9.8
-Vcs-Git: git://git.debian.org/git/pkg-games/minetest-mod-moreblocks.git
-Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-games/minetest-mod-moreblocks.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-games/minetest-mod-moreblocks.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/minetest-mod-moreblocks.git
 
 Package: minetest-mod-moreblocks
 Architecture: all

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 12/12: Added myself to uploaders and added a homepage

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit ae3cab1360829020dc45ceb788602ae4a8835579
Author: Julien Puydt 
Date:   Fri Oct 28 17:55:32 2016 +0200

Added myself to uploaders and added a homepage
---
 debian/control | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 0a15d07..062dc3a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,11 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team 
 Uploaders:
- Dominik George 
+ Dominik George ,
+ Julien Puydt 
 Build-Depends: debhelper (>= 10)
 Standards-Version: 3.9.8
+Homepage: https://github.com/minetest-mods/moreblocks
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/minetest-mod-moreblocks.git
 Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/minetest-mod-moreblocks.git
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] annotated tag upstream/20161028+git7f06db22 created (now 1c843b2)

[Julien Puydt]

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

jpuydt-guest pushed a change to annotated tag upstream/20161028+git7f06db22
in repository minetest-mod-moreblocks.

at  1c843b2   (tag)
   tagging  a4da2f471d4f302000b2c7acb0be05a7d4706e34 (commit)
  replaces  upstream/0_20130827+gitee1b3025cc
 tagged by  Julien Puydt
on  Fri Oct 28 16:41:06 2016 +0200

- Log -
Upstream version 20161028+git7f06db22
-BEGIN PGP SIGNATURE-

iQI2BAABCAAgBQJYE2OCGRxqdWxpZW4ucHV5ZHRAbGFwb3N0ZS5uZXQACgkQBMU7
1/4DBVEupg/+NBLxD1ykSgJdJHcNAxP6cLV2jnnRzll7BiQEn/0mw3DUMPZBsS7c
vz9TrynUANQ3pMTBenM4kAZjQolgcqhGcEGRwu+FPDe+tIC2hNea0VrnjpKPgNzl
3S6llzDt/07KS2vBld0UZTlY7nEq8aJs5684vO3iI7IoDfzha7n1dzp48Khr6qKO
B66eh62Y/HiAEw3btkRff0ZCZqcf2smC/im8BV0OVdEGCAWa0PjDIwGEcAcaO1D5
xwRJJzA3Cytd+NIb8vGi52zxBlJ1ShCdlXxBqgn6PWK+AokT2BnqtpUw4TJ/6Ut7
vKLxcVBk8tfSwSjRlOJZ57pLFEIm001js2QJg9GvJJEezRA+havc/aBvLWyf4bZJ
keu3hi9Lq4LwfO1oqlZOuQ91J3x1VEijIrg4Q2F5Y1Qel7MCMgXCe6S78+P9G1Fl
eTgUR/tzpk1rTH6o5oTBt41e4g/rwXWtW/AxS0ktfW4PNZ2R3i3/D5rHieRVYMEv
W1VreI2trm43q7tZOSgUuzp5qiRLSSXanfFSiolppeiFBYacnX5PjMUZv6N+Pz3c
TE2J6iEEKwJOIZwZo6OxANzRLaUPT6i/GX8TC+CP9wOwDo3+ENRIA6M8GH5D4kBq
nme498pylW3if+mShVtMciTd5JQ6gPBkrg3tBbqpuWur06+iSgg7DTI=
=kPbp
-END PGP SIGNATURE-

Julien Puydt (2):
  New upstream version 20161028+git7f06db22
  New upstream version 20161028+git7f06db22

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 04/12: Depend on minetest or minetest-server (Closes: #770606)

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit 7236249decedded733b06f037eaaf951509c5fa2
Author: Julien Puydt 
Date:   Fri Oct 28 07:44:49 2016 +0200

Depend on minetest or minetest-server (Closes: #770606)
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 881e69c..0a15d07 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-games/minetest-mod-moreblocks.g
 
 Package: minetest-mod-moreblocks
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, minetest
+Depends: ${shlibs:Depends}, ${misc:Depends}, minetest | minetestserver
 Description: Minetest mod - More Blocks
  This mod adds some new blocks, most of them don't have a use other than
  decoration.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 02/12: Push standards-version to 3.9.8

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit 0c29e5a7e7905ad6bee8634d2a19676935ad35d0
Author: Julien Puydt 
Date:   Fri Oct 28 07:40:23 2016 +0200

Push standards-version to 3.9.8
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 10fa033..3feaffb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team 

 Uploaders:
  Dominik George 
 Build-Depends: debhelper (>= 10)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.8
 Vcs-Git: git://git.debian.org/git/pkg-games/minetest-mod-moreblocks.git
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-games/minetest-mod-moreblocks.git
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] 01/12: Push dh compat to 10

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-moreblocks.

commit b8edcc659fee2a353d13d7f9e5638366f88d2cc7
Author: Julien Puydt 
Date:   Fri Oct 28 07:40:02 2016 +0200

Push dh compat to 10
---
 debian/compat  | 2 +-
 debian/control | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index ea9133b..10fa033 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Games Team 
 Uploaders:
  Dominik George 
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 10)
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-games/minetest-mod-moreblocks.git
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-games/minetest-mod-moreblocks.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/minetest-mod-moreblocks.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

[minetest-mod-moreblocks] branch master updated (882dee5 -> ae3cab1)

[Julien Puydt]

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

jpuydt-guest pushed a change to branch master
in repository minetest-mod-moreblocks.

  from  882dee5   Moved under team maintenance.
   new  b8edcc6   Push dh compat to 10
   new  0c29e5a   Push standards-version to 3.9.8
   new  f23eb48   Use https in Vcs-* fields
   new  7236249   Depend on minetest or minetest-server (Closes: #770606)
   new  46f0069   Updating the changelog to document the last commits
   new  ba92f32   New upstream version 20161028+git7f06db22
   new  9fbc3c9   New upstream snapshot
   new  022f9db   Updated copyright assignments
   new  675f91b   Modified the "Team upload" declaration so lintian 
understands it
   new  99b8ee3   Adapted installed files to what is in upstream
   new  a212165   Prepare for upload
   new  ae3cab1   Added myself to uploaders and added a homepage

The 12 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:
 LICENSE.txt => LICENSE.md  |   7 +-
 README.md  |  13 +
 README.txt |  22 -
 _config.txt|  11 -
 aliases.lua| 175 ++
 circular_saw.lua   | 647 +++--
 config.lua |  29 +
 crafting.lua   | 282 ++---
 debian/README.source   |   3 +
 debian/changelog   |  15 +-
 debian/compat  |   2 +-
 debian/control |  14 +-
 debian/copyright   |  42 +-
 debian/docs|   2 +-
 debian/install |   4 +-
 depends.txt|   1 +
 description.txt|   1 +
 init.lua   | 391 ++---
 locale/de.txt  |  67 +++
 locale/fr.txt  |  50 +-
 locale/it.txt  |  70 +++
 locale/template.txt|  64 ++
 mod.conf   |   1 +
 models/moreblocks_slope.obj|  26 +
 models/moreblocks_slope_cut.obj|  33 ++
 models/moreblocks_slope_half.obj   |  28 +
 models/moreblocks_slope_half_raised.obj|  32 +
 models/moreblocks_slope_inner.obj  |  35 ++
 models/moreblocks_slope_inner_cut.obj  |  32 +
 models/moreblocks_slope_inner_cut_half.obj |  34 ++
 models/moreblocks_slope_inner_cut_half_raised.obj  |  35 ++
 models/moreblocks_slope_inner_half.obj |  35 ++
 models/moreblocks_slope_inner_half_raised.obj  |  38 ++
 models/moreblocks_slope_outer.obj  |  25 +
 models/moreblocks_slope_outer_cut.obj  |  23 +
 models/moreblocks_slope_outer_cut_half.obj |  24 +
 models/moreblocks_slope_outer_cut_half_raised.obj  |  28 +
 models/moreblocks_slope_outer_half.obj |  27 +
 models/moreblocks_slope_outer_half_raised.obj  |  34 ++
 nodes.lua  | 356 
 ownership.lua  |  41 ++
 redefinitions.lua  | 249 +---
 stairsplus.lua | 434 --
 stairsplus/API.md  |  24 +
 stairsplus/aliases.lua |  69 ++-
 .../conversion.lua |  88 +--
 stairsplus/init.lua|  91 +++
 stairsplus/microblocks.lua | 168 +-
 stairsplus/panels.lua  | 147 -
 stairsplus/registrations.lua   |  65 +++
 stairsplus/slabs.lua   | 321 ++
 stairsplus/slopes.lua  | 362 
 stairsplus/stairs.lua  | 331 +--
 textures/default_brick.png | Bin 0 -> 716 bytes
 textures/default_fence_overlay.png | Bin 0 -> 285 bytes
 textures/invisible.png | Bin 0 -> 68 bytes
 textures/moreblocks_cactus_brick.png   | Bin 735 -> 718 bytes
 textures/moreblocks_cactus_checker.png | Bin 826 -> 693 bytes
 textures/moreblocks_circle_stone_bricks.png| Bin 646 -> 448

[openjk] 129/130: Mark patches as forwarded

[Simon McVittie]

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

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

commit 12947d165920ceadf1e76b31d841af71ce095bde
Author: Simon McVittie 
Date:   Fri Oct 28 12:05:58 2016 +0100

Mark patches as forwarded
---
 debian/patches/Consistently-use-static-QINLINE-for-inline-C-code.patch  | 2 ++
 .../g_svcmds-fix-typo-in-avoiding-non-C-11-compliant-string-s.patch | 1 +
 .../savegames-bounds-check-some-string-lengths-to-prevent-buf.patch | 1 +
 3 files changed, 4 insertions(+)

diff --git 
a/debian/patches/Consistently-use-static-QINLINE-for-inline-C-code.patch 
b/debian/patches/Consistently-use-static-QINLINE-for-inline-C-code.patch
index 4a201ee..d85a4b5 100644
--- a/debian/patches/Consistently-use-static-QINLINE-for-inline-C-code.patch
+++ b/debian/patches/Consistently-use-static-QINLINE-for-inline-C-code.patch
@@ -21,6 +21,8 @@ There are a couple of uses of non-static QINLINE in C++ code; 
I've
 left those intact, since inline has different (more useful)
 semantics in C++, and as far as I'm aware all reasonable C++ compilers
 implement it correctly.
+
+Forwarded: https://github.com/JACoders/OpenJK/pull/884
 ---
  codemp/game/NPC_move.c  | 4 ++--
  codemp/game/bg_pmove.c  | 2 +-
diff --git 
a/debian/patches/g_svcmds-fix-typo-in-avoiding-non-C-11-compliant-string-s.patch
 
b/debian/patches/g_svcmds-fix-typo-in-avoiding-non-C-11-compliant-string-s.patch
index a6a4e71..b5191aa 100644
--- 
a/debian/patches/g_svcmds-fix-typo-in-avoiding-non-C-11-compliant-string-s.patch
+++ 
b/debian/patches/g_svcmds-fix-typo-in-avoiding-non-C-11-compliant-string-s.patch
@@ -2,6 +2,7 @@ From: Simon McVittie 
 Date: Fri, 28 Oct 2016 10:23:06 +0100
 Subject: g_svcmds: fix typo in avoiding non-C++11-compliant string syntax
 
+Forwarded: https://github.com/JACoders/OpenJK/pull/883
 ---
  code/game/g_svcmds.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 
a/debian/patches/savegames-bounds-check-some-string-lengths-to-prevent-buf.patch
 
b/debian/patches/savegames-bounds-check-some-string-lengths-to-prevent-buf.patch
index 54d6d3c..a1b04ae 100644
--- 
a/debian/patches/savegames-bounds-check-some-string-lengths-to-prevent-buf.patch
+++ 
b/debian/patches/savegames-bounds-check-some-string-lengths-to-prevent-buf.patch
@@ -3,6 +3,7 @@ Date: Fri, 28 Oct 2016 11:37:21 +0100
 Subject: savegames: bounds-check some string lengths to prevent buffer
  overflow
 
+Forwarded: https://github.com/JACoders/OpenJK/pull/881
 ---
  code/game/G_Timer.cpp| 17 -
  code/game/Q3_Interface.cpp   | 15 +++

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] branch upstream/latest updated (a4b301b -> 8b1d49d)

[Simon McVittie]

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

smcv pushed a change to branch upstream/latest
in repository openjk.

  from  a4b301b   New upstream version 0~20160911+dfsg1
   new  55526ff   Fix a typo in Siege mode: attemtping -> attempting
   new  6f7dbe3   Merge pull request #868 from smcv/attemtping
   new  dcc1260   Use same mechanism to say "no servers found" as to say 
how many we found
   new  b2097da   Merge pull request #870 from smcv/no-servers-underflow
   new  8ea096c   botlib: print long int correctly
   new  04a7a2c   Merge pull request #871 from smcv/print-long-int
   new  dfd7413   Suppress compiler warning for unused BufferToHexString
   new  2470310   Merge pull request #873 from smcv/unused-buffer-to-hex
   new  37ba2b6   Declare platform-independent byteswapping functions 
QINLINE
   new  96db877   Merge pull request #869 from smcv/byteswap-qinline
   new  47403da   MP: Retain localization of no servers with player name 
found.
   new  ffa7ab7   Shared: Move vector2D functions into q_math to avoid 
redundancy.
   new  abd4b52   MP: Make the shared common files appear in the visual 
studio projects for multiplayer client and dedicated server.
   new  4e6a765   Add wrappers for reading saved games
   new  7d1b1e7   Add wrappers for writing saved games
   new  8a647f2   Make forward declaration header
   new  86a2f9c   Remove original code of EnumerateFields
   new  bef68d7   Update function EnumerateFields
   new  0f492b1   Add saved game class for saberInfoRetail_t
   new  bdaa316   Remove dynamic allocation of strList
   new  ea9c36e   Add initial saved game archive class
   new  73b2f7f   Add method add_path
   new  587f856   Implement method open
   new  605bb4b   Implement close method
   new  a25382f   Remove get_max_path_count
   new  4f9f1ce   Revise method open
   new  83c056d   Implement method create
   new  92c27ac   Remove archive mode
   new  95c4ceb   Implement method remove
   new  6e49a95   Implement method rename
   new  5ce400a   Fix cast_io_buffer usage
   new  4c216f2   Remove code files from non-engine projects
   new  ae16dcf   Add RLE compression
   new  1911228   Add return value to read_chunk and write_chunk
   new  0ce58cb   Rename classes and remove sg namespace
   new  b84f29d   Fix header name
   new  3761dff   Implement method open
   new  b53bc1f   Implement write_chunk
   new  4ca3def   Move definitions of import and export methods to code file
   new  7cc517c   Add missing methods
   new  f839070   Add pointer to saved game object for game interface
   new  cc7cc6c   Implement reading and writing of two-dimension arrays
   new  9e6541d   Access fields or throw exceptions in templated members 
via methods only
   new  c912235   Split saved game class into the interface and the 
implementation
   new  a467c51   Make ctor & dtor inline Add methods from interface into 
implementation's namespace
   new  cb022b2   Replace reading wrappers
   new  0d15324   Replace writing wrappers
   new  4d284f2   Support C-array of pointers
   new  16c0d6d   Remove saved game wrappers
   new  6a7359c   Format saved game code
   new  1022a86   Implement handling of class type
   new  54412cd   Remove wrappers and original code leftovers
   new  43bcc08   Add method to control preview mode
   new  a1ef282   Remove wrappers and old save code leftovers
   new  0b8140c   Add method to advance the buffer offset
   new  33ca625   Fix pointer reading/writing
   new  41065ad   Move import/export code into the header files
   new  ef5c8b4   Make distinct name for clientPersistant_t to avoid 
strange behavior in Visual Studio
   new  178d0d5   Fix reading/writing gclient_s class and realted classes
   new  ebd58e7   Rename saved game affected classes
   new  62edd3c   Rename saved game affected classes
   new  bb3a1ca   Fix 'holes' inside saved game affected classes due 
alignment
   new  27bc43f   Check for chunk read error in EvaluateFields
   new  35a9781   Fix ICARUS data saving
   new  f3862ce   Add try_read method Revise SG_GetSaveGameComment and 
SG_ReadSavegame
   new  e286d0e   Rename saved game affected classes back
   new  501db34   JA: Restore loading of retail saved game
   new  3dcf239   Clean up saved game code leftovers
   new  61205f2   JO: Fix reading/writing saved game chunk
   new  a5185e2   JO: Disable JA structure fields
   new  a2a364d   JO: Undefine _G2_GORE
   new  fef5407   JO: Disable some JA-only stuff
   new  b48f21e   JO: Disable GHOUL2 gore and ragdoll
   new  4142bd9   JO: Fix loading/saving of GHOUL2 and timers
   new  08897b1   JO: Fix write_chunk
   new  149fcb9   Split ISavedGame into two classes
   new  fecff2e   Revise 

[openjk] 128/130: d/p/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch: fix one more instance of the same issue

[Simon McVittie]

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

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

commit 151415d8a20bed81dcdff5e112b56a1bb2a89c60
Author: Simon McVittie 
Date:   Fri Oct 28 11:52:34 2016 +0100

d/p/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch: fix 
one more instance of the same issue
---
 debian/changelog   |  2 ++
 ...arning-when-sscanf-writes-qboolean-throug.patch | 33 --
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02bf03b..eac2fd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium
 d/p/g_svcmds-fix-typo-in-avoiding-non-C-11-compliant-string-s.patch,
 d/p/savegames-bounds-check-some-string-lengths-to-prevent-buf.patch:
 more bugfix patches
+  * d/p/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch:
+fix one more instance of the same issue
 
  -- Simon McVittie   Fri, 28 Oct 2016 10:57:57 +0100
 
diff --git 
a/debian/patches/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch
 
b/debian/patches/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch
index 60fd760..532090a 100644
--- 
a/debian/patches/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch
+++ 
b/debian/patches/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch
@@ -6,9 +6,10 @@ Subject: Avoid compiler warning when sscanf writes qboolean 
through %i
 
 Forwarded: https://github.com/JACoders/OpenJK/pull/872
 ---
- code/game/g_client.cpp  | 36 
- code/game/g_session.cpp |  4 +++-
- 2 files changed, 23 insertions(+), 17 deletions(-)
+ code/game/g_client.cpp| 36 
+ code/game/g_session.cpp   |  4 +++-
+ codeJK2/game/g_client.cpp |  4 +++-
+ 3 files changed, 26 insertions(+), 18 deletions(-)
 
 diff --git a/code/game/g_client.cpp b/code/game/g_client.cpp
 index 278645f..9c05053 100644
@@ -102,3 +103,29 @@ index 09f6f60..6cde682 100644
  
var = va( "missionstats%i", client - level.clients );
gi.Cvar_VariableStringBuffer( var, s, sizeof(s) );
+diff --git a/codeJK2/game/g_client.cpp b/codeJK2/game/g_client.cpp
+index 3522f95..9367b33 100644
+--- a/codeJK2/game/g_client.cpp
 b/codeJK2/game/g_client.cpp
+@@ -696,6 +696,7 @@ void Player_RestoreFromPrevLevel(gentity_t *ent)
+   {
+   chars[MAX_STRING_CHARS];
+   const char  *var;
++  int saberActive;
+ 
+   gi.Cvar_VariableStringBuffer( sCVARNAME_PLAYERSAVE, s, 
sizeof(s) );
+ 
+@@ -714,11 +715,12 @@ void Player_RestoreFromPrevLevel(gentity_t *ent)
+   
>ps.viewangles[2],
+   
>ps.forcePowersKnown,
+   
>ps.forcePower,
+-  
>ps.saberActive,
++  ,
+   
>ps.saberAnimLevel,
+   
>ps.saberLockEnemy,
+   
>ps.saberLockTime
+   );
++  client->ps.saberActive = (saberActive ? qtrue : qfalse);
+   ent->health = client->ps.stats[STAT_HEALTH];
+ 
+ // slight issue with ths for the moment in that although it'll correctly 
restore angles it doesn't take into account

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 01/01: pristine-tar data for openjk_0~20161025+dfsg1.orig.tar.xz

[Simon McVittie]

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

smcv pushed a commit to branch pristine-tar
in repository openjk.

commit a6c1ca5f473c646a9463db4c583de11b0014d356
Author: Simon McVittie 
Date:   Fri Oct 28 10:57:02 2016 +0100

pristine-tar data for openjk_0~20161025+dfsg1.orig.tar.xz
---
 openjk_0~20161025+dfsg1.orig.tar.xz.delta | Bin 0 -> 49479 bytes
 openjk_0~20161025+dfsg1.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/openjk_0~20161025+dfsg1.orig.tar.xz.delta 
b/openjk_0~20161025+dfsg1.orig.tar.xz.delta
new file mode 100644
index 000..276f2a2
Binary files /dev/null and b/openjk_0~20161025+dfsg1.orig.tar.xz.delta differ
diff --git a/openjk_0~20161025+dfsg1.orig.tar.xz.id 
b/openjk_0~20161025+dfsg1.orig.tar.xz.id
new file mode 100644
index 000..f43f392
--- /dev/null
+++ b/openjk_0~20161025+dfsg1.orig.tar.xz.id
@@ -0,0 +1 @@
+65f8c0c950d6e76f6fe52cdbaa9e73400050b9fb

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] annotated tag upstream/0_20161025+dfsg1 created (now bc11050)

[Simon McVittie]

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

smcv pushed a change to annotated tag upstream/0_20161025+dfsg1
in repository openjk.

at  bc11050   (tag)
   tagging  8b1d49d8600b28eeed22e2ef720dc8caf2d2cc6e (commit)
  replaces  upstream/0_20160911+dfsg1
 tagged by  Simon McVittie
on  Fri Oct 28 10:57:02 2016 +0100

- Log -
Upstream version 0~20161025+dfsg1

Alex Lo (11):
  Merge pull request #868 from smcv/attemtping
  Merge pull request #870 from smcv/no-servers-underflow
  Merge pull request #871 from smcv/print-long-int
  Merge pull request #873 from smcv/unused-buffer-to-hex
  Merge pull request #869 from smcv/byteswap-qinline
  Merge pull request #848 from bibendovsky/fix_load_save_32_64
  Merge pull request #878 from bibendovsky/fix/saved_game_compiling_errors
  Refine the appveyor config a bit
  Don't specify CMAKE_BUILD_TYPE in a matrix
  Delete use of CMAKE_BUILD_TYPE from appveyor.yml
  Merge pull request #879 from xycaleth/remove-constexpr

Ensiform (12):
  MP: Retain localization of no servers with player name found.
  Shared: Move vector2D functions into q_math to avoid redundancy.
  MP: Make the shared common files appear in the visual studio projects
  SP: Cleanup g_svcmds.cpp a bit
  SP: Added WIP difficulty command
  SP: Don't try to open invalid file names in UI model loader
  JK2: Merge in improved g_svcmds.cpp specialized for JK2
  Shared: Fixed clang compile using invalid warning flag declarator
  SP: Stop using bsearch and use Q_LinearSearch in client side
  SP: Add tab completion for new commands
  JK2: Fix rendering of weapon icons
  Shared: Implement menu hacks to workaround buggy menus

Simon McVittie (6):
  Suppress compiler warning for unused BufferToHexString
  botlib: print long int correctly
  Declare platform-independent byteswapping functions QINLINE
  Fix a typo in Siege mode: attemtping -> attempting
  Use same mechanism to say "no servers found" as to say how many we found
  New upstream version 0~20161025+dfsg1

Xycaleth (2):
  SP: Fix crash when game API version doesn't match
  Remove constexpr usage

bibendovsky (91):
  Add wrappers for reading saved games
  Add wrappers for writing saved games
  Make forward declaration header
  Remove original code of EnumerateFields
  Update function EnumerateFields
  Add saved game class for saberInfoRetail_t
  Remove dynamic allocation of strList
  Add initial saved game archive class
  Add method add_path
  Implement method open
  Implement close method
  Remove get_max_path_count
  Revise method open
  Implement method create
  Remove archive mode
  Implement method remove
  Implement method rename
  Fix cast_io_buffer usage
  Remove code files from non-engine projects
  Add RLE compression
  Add return value to read_chunk and write_chunk
  Rename classes and remove sg namespace
  Fix header name
  Implement method open
  Implement write_chunk
  Move definitions of import and export methods to code file
  Add missing methods
  Add pointer to saved game object for game interface
  Implement reading and writing of two-dimension arrays
  Access fields or throw exceptions in templated members via methods only
  Split saved game class into the interface and the implementation
  Make ctor & dtor inline
  Replace reading wrappers
  Replace writing wrappers
  Support C-array of pointers
  Remove saved game wrappers
  Format saved game code
  Implement handling of class type
  Remove wrappers and original code leftovers
  Add method to control preview mode
  Remove wrappers and old save code leftovers
  Add method to advance the buffer offset
  Fix pointer reading/writing
  Move import/export code into the header files
  Make distinct name for clientPersistant_t to avoid strange behavior in 
Visual Studio
  Fix reading/writing gclient_s class and realted classes
  Rename saved game affected classes
  Rename saved game affected classes
  Fix 'holes' inside saved game affected classes due alignment
  Check for chunk read error in EvaluateFields
  Fix ICARUS data saving
  Add try_read method
  Rename saved game affected classes back
  JA: Restore loading of retail saved game
  Clean up saved game code leftovers
  JO: Fix reading/writing saved game chunk
  JO: Disable JA structure fields
  JO: Undefine _G2_GORE
  JO: Disable some JA-only stuff
  JO: Disable GHOUL2 gore and ragdoll
  JO: Fix loading/saving of GHOUL2 and timers
  JO: Fix write_chunk
  Split ISavedGame into two classes
  Revise saved game classes
  SG: Use new classes
  SG: Rename classes and 

[openjk] branch pristine-tar updated (2ae5c2b -> a6c1ca5)

[Simon McVittie]

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

smcv pushed a change to branch pristine-tar
in repository openjk.

  from  2ae5c2b   pristine-tar data for openjk_0~20160911+dfsg1.orig.tar.xz
   new  a6c1ca5   pristine-tar data for openjk_0~20161025+dfsg1.orig.tar.xz

The 1 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:
 openjk_0~20161025+dfsg1.orig.tar.xz.delta | Bin 0 -> 49479 bytes
 openjk_0~20161025+dfsg1.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 openjk_0~20161025+dfsg1.orig.tar.xz.delta
 create mode 100644 openjk_0~20161025+dfsg1.orig.tar.xz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 130/130: openjk-academy-server: depend on lsb-base as recommended by Lintian

[Simon McVittie]

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

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

commit 8916d4f1703c0fc1de0bd87720e3bd2e93de4bc8
Author: Simon McVittie 
Date:   Fri Oct 28 12:06:35 2016 +0100

openjk-academy-server: depend on lsb-base as recommended by Lintian
---
 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eac2fd7..bd6e2f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium
 more bugfix patches
   * d/p/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch:
 fix one more instance of the same issue
+  * openjk-academy-server: depend on lsb-base as recommended by Lintian
 
  -- Simon McVittie   Fri, 28 Oct 2016 10:57:57 +0100
 
diff --git a/debian/control b/debian/control
index 883ab91..7da200e 100644
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,7 @@ Depends:
  ${shlibs:Depends},
  adduser,
  jedi-academy-data (>= 1.01+41) | game-data-packager (>= 41),
+ lsb-base (>= 3.0-6),
  openjk-common (= ${binary:Version}),
 Description: Jedi Academy multiplayer game server
  Star Wars Jedi Knight: Jedi Academy is a first- and third-person

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 124/130: New upstream snapshot

[Simon McVittie]

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

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

commit 03b30d0a57d93d208b514d1a954476616440393b
Author: Simon McVittie 
Date:   Fri Oct 28 10:59:35 2016 +0100

New upstream snapshot

  - 64-bit builds now have the same saved game format as 32-bit builds
with the same endianness
  - compatibility break: 64-bit saved games made prior to this version
are no longer supported
---
 debian/changelog | 10 ++
 debian/rules |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04b6a44..d6d3ab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+- 64-bit builds now have the same saved game format as 32-bit builds
+  with the same endianness
+- compatibility break: 64-bit saved games made prior to this version
+  are no longer supported
+
+ -- Simon McVittie   Fri, 28 Oct 2016 10:57:57 +0100
+
 openjk (0~20160911+dfsg1-2) experimental; urgency=medium
 
   * Correct `date` invocation for $SOURCE_DATE_EPOCH
diff --git a/debian/rules b/debian/rules
index d78da1d..7e93419 100755
--- a/debian/rules
+++ b/debian/rules
@@ -161,10 +161,10 @@ ORIG_SOURCE = openjk
 ORIG_REPO ?= https://github.com/JACoders/OpenJK
 ORIG_REL =
 # Empty if it's a release
-ORIG_REV = 712627afab20aaa772d062a8fc8aeb5d3efa6152
+ORIG_REV = 93bffc438c501c386b889c755ab6beb29bdd4000
 # Use the date of the ORIG_REV, or 20130426.1 if you snapshot twice in a day,
 # or empty if ORIG_REV is
-ORIG_DATE = 20160911
+ORIG_DATE = 20161025
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 127/130: d/p/Consistently-use-static-QINLINE-for-inline-C-code.patch, d/p/g_svcmds-fix-typo-in-avoiding-non-C-11-compliant-string-s.patch, d/p/savegames-bounds-check-some-string-lengths-to-pr

[Simon McVittie]

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

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

commit ae0a53c508c46e9c8d4f73a288a9ef1103bcedf9
Author: Simon McVittie 
Date:   Fri Oct 28 11:51:49 2016 +0100

d/p/Consistently-use-static-QINLINE-for-inline-C-code.patch, 
d/p/g_svcmds-fix-typo-in-avoiding-non-C-11-compliant-string-s.patch, 
d/p/savegames-bounds-check-some-string-lengths-to-prevent-buf.patch: more 
bugfix patches
---
 debian/changelog   |   4 +
 ...ntly-use-static-QINLINE-for-inline-C-code.patch |  81 
 ...o-in-avoiding-non-C-11-compliant-string-s.patch |  21 +++
 ...-check-some-string-lengths-to-prevent-buf.patch | 207 +
 debian/patches/series  |   5 +-
 5 files changed, 317 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f184d99..02bf03b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium
 drop, applied upstream
   * d/p/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch:
 alter to define SOURCE_DATE in q_platform.h as requested upstream
+  * d/p/Consistently-use-static-QINLINE-for-inline-C-code.patch,
+d/p/g_svcmds-fix-typo-in-avoiding-non-C-11-compliant-string-s.patch,
+d/p/savegames-bounds-check-some-string-lengths-to-prevent-buf.patch:
+more bugfix patches
 
  -- Simon McVittie   Fri, 28 Oct 2016 10:57:57 +0100
 
diff --git 
a/debian/patches/Consistently-use-static-QINLINE-for-inline-C-code.patch 
b/debian/patches/Consistently-use-static-QINLINE-for-inline-C-code.patch
new file mode 100644
index 000..4a201ee
--- /dev/null
+++ b/debian/patches/Consistently-use-static-QINLINE-for-inline-C-code.patch
@@ -0,0 +1,81 @@
+From: Simon McVittie 
+Date: Sun, 25 Sep 2016 22:11:27 +0100
+Subject: Consistently use "static QINLINE" for inline C code
+
+The portable idiom for type-safe macro-like constructs in C is to use
+"static inline" where C99 inline is supported, or "static __inline"
+on compilers that implement that keyword as a compiler-specific
+extension (at least gcc, clang and MSVC do), falling back to just
+"static" as a last resort on terrible compilers from the distant past.
+
+Using "static QINLINE" everywhere means there is no point in defining
+QINLINE to "static inline" on clang, so stop doing that; QINLINE now
+consistently expands to Standard C/C++ inline, or __inline on MSVC,
+or to nothing if we don't know how to inline functions on this
+compiler.
+
+This silences warnings about redundant qualifiers (static static inline)
+for all the functions that were already inline.
+
+There are a couple of uses of non-static QINLINE in C++ code; I've
+left those intact, since inline has different (more useful)
+semantics in C++, and as far as I'm aware all reasonable C++ compilers
+implement it correctly.
+---
+ codemp/game/NPC_move.c  | 4 ++--
+ codemp/game/bg_pmove.c  | 2 +-
+ shared/qcommon/q_platform.h | 6 +-
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/codemp/game/NPC_move.c b/codemp/game/NPC_move.c
+index 7fe0842..5809909 100644
+--- a/codemp/game/NPC_move.c
 b/codemp/game/NPC_move.c
+@@ -95,7 +95,7 @@ NPC_CheckCombatMove
+ -
+ */
+ 
+-QINLINE qboolean NPC_CheckCombatMove( void )
++static QINLINE qboolean NPC_CheckCombatMove( void )
+ {
+   //return NPCInfo->combatMove;
+   if ( ( NPCS.NPCInfo->goalEntity && NPCS.NPC->enemy && 
NPCS.NPCInfo->goalEntity == NPCS.NPC->enemy ) || ( NPCS.NPCInfo->combatMove ) )
+@@ -143,7 +143,7 @@ NPC_GetMoveInformation
+ -
+ */
+ 
+-QINLINE qboolean NPC_GetMoveInformation( vec3_t dir, float *distance )
++static QINLINE qboolean NPC_GetMoveInformation( vec3_t dir, float *distance )
+ {
+   //NOTENOTE: Use path stacks!
+ 
+diff --git a/codemp/game/bg_pmove.c b/codemp/game/bg_pmove.c
+index 9b0b9ee..62ac9c8 100644
+--- a/codemp/game/bg_pmove.c
 b/codemp/game/bg_pmove.c
+@@ -259,7 +259,7 @@ qboolean BG_KnockDownable(playerState_t *ps)
+ }
+ 
+ //hacky assumption check, assume any client non-humanoid is a rocket trooper
+-qboolean QINLINE PM_IsRocketTrooper(void)
++static QINLINE qboolean PM_IsRocketTrooper(void)
+ {
+   /*
+   if (pm->ps->clientNum < MAX_CLIENTS &&
+diff --git a/shared/qcommon/q_platform.h b/shared/qcommon/q_platform.h
+index 9e1067a..4f9ee54 100644
+--- a/shared/qcommon/q_platform.h
 b/shared/qcommon/q_platform.h
+@@ -123,11 +123,7 @@ along with this program; if not, see 
.
+   #define OS_STRING "kFreeBSD"
+   #endif
+ 
+-  #ifdef __clang__
+-  #define QINLINE static inline
+-  #else
+-  #define QINLINE inline
+-  #endif
++  #define QINLINE inline
+ 
+   #define PATH_SEP '/'
+ 
diff --git 

[openjk] 125/130: d/p/Suppress-compiler-warning-for-unused-BufferToHexString.patch, d/p/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch, d/p/botlib-print-long-int-correctly.patch, d/p/

[Simon McVittie]

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

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

commit c29757becbdefd19b9b5c59b0fc1223ecbc5065d
Author: Simon McVittie 
Date:   Fri Oct 28 11:05:02 2016 +0100

d/p/Suppress-compiler-warning-for-unused-BufferToHexString.patch, 
d/p/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch, 
d/p/botlib-print-long-int-correctly.patch, 
d/p/Declare-platform-independent-byteswapping-functions-QINLI.patch, 
d/p/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch: drop, applied upstream
---
 debian/changelog   |  6 
 ...-independent-byteswapping-functions-QINLI.patch | 42 --
 ...-typo-in-Siege-mode-attemtping-attempting.patch | 22 
 ...iler-warning-for-unused-BufferToHexString.patch | 31 
 ...sm-to-say-no-servers-found-as-to-say-how-.patch | 28 ---
 .../patches/botlib-print-long-int-correctly.patch  | 35 --
 debian/patches/series  |  5 ---
 7 files changed, 6 insertions(+), 163 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6d3ab3..fcfd325 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium
   with the same endianness
 - compatibility break: 64-bit saved games made prior to this version
   are no longer supported
+  * d/p/Suppress-compiler-warning-for-unused-BufferToHexString.patch,
+d/p/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch,
+d/p/botlib-print-long-int-correctly.patch,
+d/p/Declare-platform-independent-byteswapping-functions-QINLI.patch,
+d/p/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch:
+drop, applied upstream
 
  -- Simon McVittie   Fri, 28 Oct 2016 10:57:57 +0100
 
diff --git 
a/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch
 
b/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch
deleted file mode 100644
index 9460ab6..000
--- 
a/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Simon McVittie 
-Date: Wed, 21 Sep 2016 12:59:58 +0100
-Subject: Declare platform-independent byteswapping functions QINLINE
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-In addition to enabling inlining for these very simple functions,
-this suppresses warnings from gcc 6:
-
-…/shared/qcommon/q_platform.h:302:13: warning: 'void CopyShortSwap(void*, 
const void*)' defined but not used [-Wunused-function]
-
-Forwarded: https://github.com/JACoders/OpenJK/pull/869

- shared/qcommon/q_platform.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/shared/qcommon/q_platform.h b/shared/qcommon/q_platform.h
-index 3ff6e9c..0d60290 100644
 a/shared/qcommon/q_platform.h
-+++ b/shared/qcommon/q_platform.h
-@@ -299,17 +299,17 @@ static inline uint32_t LongSwap(uint32_t v)
- }
- #endif
- 
--static void CopyShortSwap( void *dest, const void *src )
-+static QINLINE void CopyShortSwap( void *dest, const void *src )
- {
- *(uint16_t*)dest = ShortSwap(*(uint16_t*)src);
- }
- 
--static void CopyLongSwap( void *dest, const void *src )
-+static QINLINE void CopyLongSwap( void *dest, const void *src )
- {
- *(uint32_t*)dest = LongSwap(*(uint32_t*)src);
- }
- 
--static float FloatSwap(float f)
-+static QINLINE float FloatSwap(float f)
- {
- float out;
- CopyLongSwap(, );
diff --git 
a/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch 
b/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch
deleted file mode 100644
index 3790824..000
--- a/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Simon McVittie 
-Date: Sun, 20 Mar 2016 13:47:36 +
-Subject: Fix a typo in Siege mode: attemtping -> attempting
-
-Forwarded: https://github.com/JACoders/OpenJK/pull/868

- codemp/game/ai_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/codemp/game/ai_main.c b/codemp/game/ai_main.c
-index 24910a1..f068349 100644
 a/codemp/game/ai_main.c
-+++ b/codemp/game/ai_main.c
-@@ -131,7 +131,7 @@ char *ctfStateDescriptions[] = {
- 
- char *siegeStateDescriptions[] = {
-   "I'm not occupied",
--  "I'm attemtping to complete the current objective",
-+  "I'm attempting to complete the current objective",
-   "I'm preventing the enemy from completing their objective"
- };
- 
diff --git 
a/debian/patches/Suppress-compiler-warning-for-unused-BufferToHexString.patch 
b/debian/patches/Suppress-compiler-warning-for-unused-BufferToHexString.patch
deleted file mode 100644
index a22a930..000
--- 

[openjk] 122/130: New upstream version 0~20161025+dfsg1

[Simon McVittie]

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

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

commit 8b1d49d8600b28eeed22e2ef720dc8caf2d2cc6e
Merge: a4b301b 93bffc4
Author: Simon McVittie 
Date:   Fri Oct 28 10:56:38 2016 +0100

New upstream version 0~20161025+dfsg1

 CMakeLists.txt|3 +-
 appveyor.yml  |   21 +-
 code/CMakeLists.txt   |   12 +-
 code/cgame/FxPrimitives.cpp   |2 +-
 code/cgame/FxScheduler.cpp|   29 +-
 code/cgame/FxScheduler.h  |   25 +
 code/cgame/FxSystem.h |   20 -
 code/cgame/FxUtil.cpp |2 +-
 code/cgame/cg_consolecmds.cpp |4 +-
 code/cgame/cg_effects.cpp |8 +-
 code/cgame/cg_main.cpp|   31 +-
 code/cgame/cg_players.cpp |   14 +-
 code/cgame/cg_servercmds.cpp  |4 +-
 code/client/cl_input.cpp  |7 +
 code/client/cl_main.cpp   |4 +-
 code/game/CMakeLists.txt  |6 +-
 code/game/G_Timer.cpp |   49 +-
 code/game/NPC_spawn.cpp   |2 +-
 code/game/Q3_Interface.cpp|  121 ++-
 code/game/Q3_Interface.h  |4 +-
 code/game/ai.h|   75 +-
 code/game/b_public.h  |  303 ++-
 code/game/bg_public.h |   52 +-
 code/game/g_local.h   |  116 ++-
 code/game/g_main.cpp  |   41 +-
 code/game/g_objectives.cpp|   15 +-
 code/game/g_public.h  |   16 +-
 code/game/g_roff.cpp  |   42 +-
 code/game/g_savegame.cpp  |  514 ++-
 code/game/g_shared.h  |  881 +-
 code/game/g_svcmds.cpp|  634 ++---
 code/game/g_vehicles.h|  155 
 code/game/g_weapon.cpp|2 +-
 code/game/ghoul2_shared.h |  303 ++-
 code/icarus/IcarusImplementation.cpp  |   65 +-
 code/icarus/IcarusInterface.h |3 +-
 code/qcommon/cm_load.cpp  |   24 +-
 code/qcommon/md4.cpp  |4 +-
 code/qcommon/msg.cpp  |   11 +-
 code/qcommon/ojk_i_saved_game.h   |  106 +++
 code/qcommon/ojk_saved_game.cpp   |  972 
 code/qcommon/ojk_saved_game.h |  193 
 code/qcommon/ojk_saved_game_class_archivers.h |   51 ++
 code/qcommon/ojk_saved_game_helper.h  |  843 +
 code/qcommon/ojk_saved_game_helper_fwd.h  |  321 +++
 code/qcommon/ojk_scope_guard.h|   58 ++
 code/qcommon/q_shared.cpp |   23 +-
 code/qcommon/q_shared.h   |  914 ++-
 code/qcommon/qcommon.h|   12 +-
 code/rd-common/mdx_format.h   |   15 +
 code/rd-common/tr_common.h|2 +-
 code/rd-common/tr_image_jpg.cpp   |   16 +-
 code/rd-common/tr_public.h|6 +-
 code/rd-vanilla/CMakeLists.txt|6 +-
 code/rd-vanilla/G2_API.cpp|5 +-
 code/rd-vanilla/G2_bones.cpp  |1 -
 code/rd-vanilla/G2_misc.cpp   |  226 +++--
 code/rd-vanilla/tr_ghoul2.cpp |   32 +-
 code/rd-vanilla/tr_surface.cpp|   32 +-
 code/server/sv_game.cpp   |   22 +-
 code/server/sv_savegame.cpp   | 1207 ++---
 code/server/sv_snapshot.cpp   |6 +
 code/ui/ui_main.cpp   |   57 +-
 code/ui/ui_shared.cpp |  230 -
 code/ui/ui_shared.h   |8 +-
 codeJK2/cgame/FxPrimitives.cpp|2 +-
 codeJK2/cgame/FxSystem.h  |   20 -
 codeJK2/cgame/FxUtil.cpp  |2 +-
 codeJK2/cgame/cg_consolecmds.cpp  |4 +-
 codeJK2/cgame/cg_effects.cpp  |8 +-
 codeJK2/cgame/cg_main.cpp |   27 +-
 codeJK2/cgame/cg_players.cpp  |   12 +-
 codeJK2/cgame/cg_servercmds.cpp   |4 +-
 codeJK2/cgame/cg_weapons.cpp  |   14 +-
 codeJK2/game/CMakeLists.txt   |6 +-
 codeJK2/game/G_Timer.cpp  |   50 +-
 codeJK2/game/NPC_spawn.cpp|2 +-
 codeJK2/game/Q3_Interface.cpp |3 +-
 codeJK2/game/Q3_Registers.cpp |  112 ++-
 codeJK2/game/ai.h

[openjk] 121/130: Shared: Implement menu hacks to workaround buggy menus

[Simon McVittie]

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

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

commit 93bffc438c501c386b889c755ab6beb29bdd4000
Author: Ensiform 
Date:   Tue Oct 25 14:00:27 2016 -0500

Shared: Implement menu hacks to workaround buggy menus

All: Disable the EAX options on Non Windows 32-bit platforms.
All: Fix Sound Quality missing the "Very High" (s_khz 44) option.
SP: Fix subtitle missing "All voiceovers" (g_subtitles 1) option.
JK2SP: Fix anisotropic filtering being an ON/OFF switch instead of a
slider for range value.
MP: Extend favorite address IP field to IPv6 max length.
MP: Extend player name fields to at least MAX_NAME_LENGTH (32).
---
 code/ui/ui_shared.cpp | 230 +++---
 code/ui/ui_shared.h   |   8 +-
 codemp/ui/ui_main.c   |   4 +-
 codemp/ui/ui_shared.c | 135 +
 codemp/ui/ui_shared.h |   8 +-
 5 files changed, 295 insertions(+), 90 deletions(-)

diff --git a/code/ui/ui_shared.cpp b/code/ui/ui_shared.cpp
index 5aa60c6..00614b1 100644
--- a/code/ui/ui_shared.cpp
+++ b/code/ui/ui_shared.cpp
@@ -1027,25 +1027,131 @@ qboolean MenuParse_fadeCycle( itemDef_t *item)
return qtrue;
 }
 
+/*
+===
+Item_ApplyHacks
+Hacks to fix issues with Team Arena menu scripts
+===
+*/
+static void Item_ApplyHacks( itemDef_t *item ) {
+#if !defined(_WIN32) || ( defined(_WIN32) && defined(idx64) )
+   // Fix length of favorite address in createfavorite.menu
+   if ( item->type == ITEM_TYPE_MULTI && item->cvar && !Q_stricmp( 
item->cvar, "s_UseOpenAL" ) ) {
+   if( item->parent )
+   {
+   menuDef_t *parent = (menuDef_t *)item->parent;
+   VectorSet4( parent->disableColor, 0.5f, 0.5f, 0.5f, 
1.0f );
+   item->disabled = qtrue;
+   // Just in case it had focus
+   item->window.flags &= ~WINDOW_MOUSEOVER;
+   Com_Printf( "Disabling eax field because current 
platform does not support EAX.\n");
+   }
+   }
+   
+   if ( item->type == ITEM_TYPE_TEXT && item->window.name && !Q_stricmp( 
item->window.name, "eax_icon") && item->cvarTest && !Q_stricmp( item->cvarTest, 
"s_UseOpenAL" ) && item->enableCvar && item->cvarFlags & CVAR_HIDE ) {
+   if( item->parent )
+   {
+   menuDef_t *parent = (menuDef_t *)item->parent;
+   VectorSet4( parent->disableColor, 0.5f, 0.5f, 0.5f, 
1.0f );
+   item->disabled = item->disabledHidden = qtrue;
+   // Just in case it had focus
+   item->window.flags &= ~WINDOW_MOUSEOVER;
+   Com_Printf( "Hiding eax_icon object because current 
platform does not support EAX.\n");
+   }
+   }
+#endif
+
+   if ( item->type == ITEM_TYPE_MULTI && item->window.name && !Q_stricmp( 
item->window.name, "sound_quality") ) {
+   multiDef_t *multiPtr = (multiDef_t *)item->typeData;
+   int i;
+   qboolean found = qfalse;
+   for( i = 0; i < multiPtr->count; i++ )
+   {
+   if ( multiPtr->cvarValue[i] == 44 )
+   {
+   found = qtrue;
+   break;
+   }
+   }
+   if ( !found && multiPtr->count < MAX_MULTI_CVARS )
+   {
+#ifdef JK2_MODE
+   multiPtr->cvarList[multiPtr->count] = 
String_Alloc("@MENUS0_VERY_HIGH");
+#else
+   multiPtr->cvarList[multiPtr->count] = 
String_Alloc("@MENUS_VERY_HIGH");
+#endif
+   multiPtr->cvarValue[multiPtr->count] = 44;
+   multiPtr->count++;
+   Com_Printf( "Extended sound quality field to contain 
very high option.\n");
+   }
+   }
+   
+   if ( item->type == ITEM_TYPE_MULTI && item->window.name && !Q_stricmp( 
item->window.name, "voice") && item->cvar && !Q_stricmp( item->cvar, 
"g_subtitles" ) ) {
+   multiDef_t *multiPtr = (multiDef_t *)item->typeData;
+   int i;
+   qboolean found = qfalse;
+   for( i = 0; i < multiPtr->count; i++ )
+   {
+   if ( multiPtr->cvarValue[i] == 1 )
+   {
+   found = qtrue;
+   break;
+   }
+   }
+   if ( !found && multiPtr->count < MAX_MULTI_CVARS )
+   {
+#ifdef JK2_MODE
+   multiPtr->cvarList[multiPtr->count] = 
String_Alloc("@MENUS3_ALL_VOICEOVERS");
+#else
+   multiPtr->cvarList[multiPtr->count] = 

[openjk] 126/130: d/p/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch: alter to define SOURCE_DATE in q_platform.h as requested upstream

[Simon McVittie]

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

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

commit 41d946a8a04cc1b2355d790cf1eb520072abb2a0
Author: Simon McVittie 
Date:   Fri Oct 28 11:10:20 2016 +0100

d/p/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch: alter 
to define SOURCE_DATE in q_platform.h as requested upstream
---
 debian/changelog   |  2 +
 ...m-SOURCE_DATE_EPOCH-for-reproducible-buil.patch | 74 --
 2 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcfd325..f184d99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium
 d/p/Declare-platform-independent-byteswapping-functions-QINLI.patch,
 d/p/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch:
 drop, applied upstream
+  * d/p/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch:
+alter to define SOURCE_DATE in q_platform.h as requested upstream
 
  -- Simon McVittie   Fri, 28 Oct 2016 10:57:57 +0100
 
diff --git 
a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
 
b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
index 6dcb238..d79aec0 100644
--- 
a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+++ 
b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
@@ -1,5 +1,5 @@
 From: Simon McVittie 
-Date: Sun, 20 Mar 2016 16:27:52 +
+Date: Fri, 28 Oct 2016 11:09:16 +0100
 Subject: Pick up date from SOURCE_DATE_EPOCH, for reproducible builds
 
 The goal of reproducible builds is that a rebuild of the same source
@@ -19,22 +19,21 @@ Similar to .
 
 Forwarded: https://github.com/JACoders/OpenJK/pull/874
 ---
- CMakeLists.txt| 9 +
- code/game/g_main.cpp  | 4 ++--
- code/qcommon/common.cpp   | 4 ++--
- code/qcommon/q_shared.h   | 4 
- codeJK2/game/g_main.cpp   | 4 ++--
- codemp/game/g_main.c  | 2 +-
- codemp/game/g_xcvar.h | 2 +-
- codemp/qcommon/common.cpp | 4 ++--
- codemp/qcommon/q_shared.h | 4 
- 9 files changed, 27 insertions(+), 10 deletions(-)
+ CMakeLists.txt  | 9 +
+ code/game/g_main.cpp| 4 ++--
+ code/qcommon/common.cpp | 4 ++--
+ codeJK2/game/g_main.cpp | 4 ++--
+ codemp/game/g_main.c| 2 +-
+ codemp/game/g_xcvar.h   | 2 +-
+ codemp/qcommon/common.cpp   | 4 ++--
+ shared/qcommon/q_platform.h | 5 +
+ 8 files changed, 24 insertions(+), 10 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d6130ba..a6c03bf 100644
+index 7a17d4d..e393e4b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -301,6 +301,15 @@ if(BuildPortableVersion)
+@@ -302,6 +302,15 @@ if(BuildPortableVersion)
set(SharedDefines ${SharedDefines} "_PORTABLE_VERSION")
  endif()
  
@@ -51,10 +50,10 @@ index d6130ba..a6c03bf 100644
  
  
 diff --git a/code/game/g_main.cpp b/code/game/g_main.cpp
-index edc43e8..384c26a 100644
+index 8ae2c6d..6b385af 100644
 --- a/code/game/g_main.cpp
 +++ b/code/game/g_main.cpp
-@@ -604,7 +604,7 @@ void G_InitCvars( void ) {
+@@ -617,7 +617,7 @@ void G_InitCvars( void ) {
  
// noset vars
gi.cvar( "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM );
@@ -63,7 +62,7 @@ index edc43e8..384c26a 100644
g_skippingcin = gi.cvar ("skippingCinematic", "0", CVAR_ROM);
  
// latched vars
-@@ -721,7 +721,7 @@ void InitGame(  const char *mapname, const char 
*spawntarget, int checkSum, cons
+@@ -734,7 +734,7 @@ void InitGame(  const char *mapname, const char 
*spawntarget, int checkSum, cons
  
gi.Printf ("--- Game Initialization ---\n");
gi.Printf ("gamename: %s\n", GAMEVERSION);
@@ -94,26 +93,11 @@ index a1e73e4..031e2b3 100644
com_version = Cvar_Get ("version", s, CVAR_ROM | 
CVAR_SERVERINFO );
  
  #ifdef JK2_MODE
-diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
-index 69f13ae..a0ed458 100644
 a/code/qcommon/q_shared.h
-+++ b/code/qcommon/q_shared.h
-@@ -80,6 +80,10 @@ along with this program; if not, see 
.
- #define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
- #endif
- 
-+#ifndef SOURCE_DATE
-+#define SOURCE_DATE __DATE__
-+#endif
-+
- #define   BASEGAME "base"
- #define OPENJKGAME "OpenJK"
- 
 diff --git a/codeJK2/game/g_main.cpp b/codeJK2/game/g_main.cpp
-index 47edd14..6738e61 100644
+index ef78173..3dba32d 100644
 --- a/codeJK2/game/g_main.cpp
 +++ b/codeJK2/game/g_main.cpp
-@@ -546,7 +546,7 @@ void G_InitCvars( void ) {
+@@ -558,7 +558,7 @@ void G_InitCvars( void ) {
  
// noset vars
gi.cvar( "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM );
@@ -122,7 +106,7 @@ index 47edd14..6738e61 100644
g_skippingcin = 

[openjk] 110/130: SP: Cleanup g_svcmds.cpp a bit

[Simon McVittie]

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

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

commit f4ddf75fe9f3221eefde31f49affc23bc6a8a455
Author: Ensiform 
Date:   Thu Oct 20 20:00:29 2016 -0500

SP: Cleanup g_svcmds.cpp a bit

Made this file more C++11 compliant.
Added linear search list for commands to cleanup the clusterfuck of
ConsoleCommand Function.
SetForceAll will only give all saberstyles if you specify an argument.
playerTeam command now tells you your current team when no arguments are
specified.
Added `secrets` command to tell the player how many secrets have been
found out of the total.
Added stub `difficulty` command with different cvar options between each
difficulty listed in comments.
Added possibility to check for if player is alive but none currently use
this feature.
---
 code/cgame/cg_servercmds.cpp |   2 +-
 code/game/g_svcmds.cpp   | 628 ++-
 code/qcommon/q_shared.cpp|  24 ++
 code/qcommon/q_shared.h  |   9 +
 4 files changed, 297 insertions(+), 366 deletions(-)

diff --git a/code/cgame/cg_servercmds.cpp b/code/cgame/cg_servercmds.cpp
index 30d19eb..9875caf 100644
--- a/code/cgame/cg_servercmds.cpp
+++ b/code/cgame/cg_servercmds.cpp
@@ -203,7 +203,7 @@ typedef struct serverCommand_s {
void(*func)(void);
 } serverCommand_t;
 
-int svcmdcmp( const void *a, const void *b ) {
+static int svcmdcmp( const void *a, const void *b ) {
return Q_stricmp( (const char *)a, ((serverCommand_t*)b)->cmd );
 }
 
diff --git a/code/game/g_svcmds.cpp b/code/game/g_svcmds.cpp
index 9473d17..475701d 100644
--- a/code/game/g_svcmds.cpp
+++ b/code/game/g_svcmds.cpp
@@ -557,31 +557,31 @@ void Svcmd_SaberAttackCycle_f( void )
switch ( saberAnimLevel )
{
case SS_FAST:
-   gi.Printf( S_COLOR_BLUE"Lightsaber Combat Style: Fast\n" );
+   gi.Printf( S_COLOR_BLUE "Lightsaber Combat Style: Fast\n" );
//LIGHTSABERCOMBATSTYLE_FAST
break;
case SS_MEDIUM:
-   gi.Printf( S_COLOR_YELLOW"Lightsaber Combat Style: Medium\n" );
+   gi.Printf( S_COLOR_YELLOW "Lightsaber Combat Style: Medium\n" );
//LIGHTSABERCOMBATSTYLE_MEDIUM
break;
case SS_STRONG:
-   gi.Printf( S_COLOR_RED"Lightsaber Combat Style: Strong\n" );
+   gi.Printf( S_COLOR_RED "Lightsaber Combat Style: Strong\n" );
//LIGHTSABERCOMBATSTYLE_STRONG
break;
case SS_DESANN:
-   gi.Printf( S_COLOR_CYAN"Lightsaber Combat Style: Desann\n" );
+   gi.Printf( S_COLOR_CYAN "Lightsaber Combat Style: Desann\n" );
//LIGHTSABERCOMBATSTYLE_DESANN
break;
case SS_TAVION:
-   gi.Printf( S_COLOR_MAGENTA"Lightsaber Combat Style: Tavion\n" );
+   gi.Printf( S_COLOR_MAGENTA "Lightsaber Combat Style: Tavion\n" 
);
//LIGHTSABERCOMBATSTYLE_TAVION
break;
case SS_DUAL:
-   gi.Printf( S_COLOR_MAGENTA"Lightsaber Combat Style: Dual\n" );
+   gi.Printf( S_COLOR_MAGENTA "Lightsaber Combat Style: Dual\n" );
//LIGHTSABERCOMBATSTYLE_TAVION
break;
case SS_STAFF:
-   gi.Printf( S_COLOR_MAGENTA"Lightsaber Combat Style: Staff\n" );
+   gi.Printf( S_COLOR_MAGENTA" Lightsaber Combat Style: Staff\n" );
//LIGHTSABERCOMBATSTYLE_TAVION
break;
}
@@ -622,437 +622,335 @@ void G_GrabEntity( gentity_t *grabber, const char 
*target )
}
 }
 
-/*
-=
-ConsoleCommand
-=
-*/
-qboolean   ConsoleCommand( void ) {
-   const char  *cmd;
+static void Svcmd_ICARUS_f( void )
+{
+   Quake3Game()->Svcmd();
+}
 
-   cmd = gi.argv(0);
+template 
+static void Svcmd_ForceSetLevel_f(void)
+{
+   Svcmd_ForceSetLevel_f(power);
+}
 
-   if ( Q_stricmp (cmd, "entitylist") == 0 )
+static void Svcmd_SetForceAll_f(void)
+{
+   for ( int i = FP_HEAL; i < NUM_FORCE_POWERS; i++ )
{
-   Svcmd_EntityList_f();
-   return qtrue;
+   Svcmd_ForceSetLevel_f( i );
}
 
-   if (Q_stricmp (cmd, "game_memory") == 0) {
-   Svcmd_GameMem_f();
-   return qtrue;
-   }
-
-   if (Q_stricmp (cmd, "nav") == 0)
+   if( gi.argc() > 1 )
{
-   if ( !g_cheats->integer )
+   for ( int i = SS_NONE+1; i < SS_NUM_SABER_STYLES; i++ )
{
-   gi.SendServerCommand( 0, "print \"Cheats are not 
enabled on this server.\n\"");
-   return qtrue;
+   g_entities[0].client->ps.saberStylesKnown |= (1<

[openjk] 118/130: SP: Stop using bsearch and use Q_LinearSearch in client side

[Simon McVittie]

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

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

commit 4eb26a88b6178df1b3cbb66b5430bae1a8f628fc
Author: Ensiform 
Date:   Mon Oct 24 21:33:35 2016 -0500

SP: Stop using bsearch and use Q_LinearSearch in client side

This was already done in g_svcmds.cpp and already finished in MP but
hadn't been merged to the SP codebases yet.
---
 code/cgame/cg_consolecmds.cpp| 2 +-
 code/cgame/cg_servercmds.cpp | 2 +-
 codeJK2/cgame/cg_consolecmds.cpp | 2 +-
 codeJK2/cgame/cg_servercmds.cpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/cgame/cg_consolecmds.cpp b/code/cgame/cg_consolecmds.cpp
index 454ffbf..2644832 100644
--- a/code/cgame/cg_consolecmds.cpp
+++ b/code/cgame/cg_consolecmds.cpp
@@ -269,7 +269,7 @@ Cmd_Argc() / Cmd_Argv()
 qboolean CG_ConsoleCommand( void ) {
consoleCommand_t*command = NULL;
 
-   command = (consoleCommand_t *)bsearch( CG_Argv( 0 ), commands, 
numCommands, sizeof( commands[0] ), cmdcmp );
+   command = (consoleCommand_t *)Q_LinearSearch( CG_Argv( 0 ), commands, 
numCommands, sizeof( commands[0] ), cmdcmp );
 
if ( !command )
return qfalse;
diff --git a/code/cgame/cg_servercmds.cpp b/code/cgame/cg_servercmds.cpp
index 9875caf..390fe61 100644
--- a/code/cgame/cg_servercmds.cpp
+++ b/code/cgame/cg_servercmds.cpp
@@ -239,7 +239,7 @@ static void CG_ServerCommand( void ) {
return;
}
 
-   command = (serverCommand_t *)bsearch( cmd, commands, numCommands, 
sizeof( commands[0] ), svcmdcmp );
+   command = (serverCommand_t *)Q_LinearSearch( cmd, commands, 
numCommands, sizeof( commands[0] ), svcmdcmp );
 
if ( command ) {
command->func();
diff --git a/codeJK2/cgame/cg_consolecmds.cpp b/codeJK2/cgame/cg_consolecmds.cpp
index 9fbe14c..3a408b0 100644
--- a/codeJK2/cgame/cg_consolecmds.cpp
+++ b/codeJK2/cgame/cg_consolecmds.cpp
@@ -254,7 +254,7 @@ Cmd_Argc() / Cmd_Argv()
 qboolean CG_ConsoleCommand( void ) {
consoleCommand_t*command = NULL;
 
-   command = (consoleCommand_t *)bsearch( CG_Argv( 0 ), commands, 
numCommands, sizeof( commands[0] ), cmdcmp );
+   command = (consoleCommand_t *)Q_LinearSearch( CG_Argv( 0 ), commands, 
numCommands, sizeof( commands[0] ), cmdcmp );
 
if ( !command )
return qfalse;
diff --git a/codeJK2/cgame/cg_servercmds.cpp b/codeJK2/cgame/cg_servercmds.cpp
index d4ddc0e..b5c4d32 100644
--- a/codeJK2/cgame/cg_servercmds.cpp
+++ b/codeJK2/cgame/cg_servercmds.cpp
@@ -292,7 +292,7 @@ static void CG_ServerCommand( void ) {
return;
}
 
-   command = (serverCommand_t *)bsearch( cmd, commands, numCommands, 
sizeof( commands[0] ), svcmdcmp );
+   command = (serverCommand_t *)Q_LinearSearch( cmd, commands, 
numCommands, sizeof( commands[0] ), svcmdcmp );
 
if ( command ) {
command->func();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 111/130: SP: Added WIP difficulty command

[Simon McVittie]

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

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

commit d31b847861217cc2d7fa00a73dca21917270c719
Author: Ensiform 
Date:   Thu Oct 20 20:58:02 2016 -0500

SP: Added WIP difficulty command

Currently only displays current difficulty.
Ability to set the difficulty from this command will come later.
---
 code/game/g_svcmds.cpp | 38 --
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/code/game/g_svcmds.cpp b/code/game/g_svcmds.cpp
index 475701d..1ef8388 100644
--- a/code/game/g_svcmds.cpp
+++ b/code/game/g_svcmds.cpp
@@ -843,12 +843,46 @@ static void Svcmd_Secrets_f(void)
 
 // PADAWAN - g_spskill 0 + cg_crosshairForceHint 1 + handicap 100
 // JEDI - g_spskill 1 + cg_crosshairForceHint 1 + handicap 100
-// JEDI KNIGHT - g_spskill 2 + cg_crosshairForceHint 0 + handicapp 100
+// JEDI KNIGHT - g_spskill 2 + cg_crosshairForceHint 0 + handicap 100
 // JEDI MASTER - g_spskill 2 + cg_crosshairForceHint 0 + handicap 50
 
+extern cvar_t *g_spskill;
 static void Svcmd_Difficulty_f(void)
 {
-   gi.Printf( S_COLOR_RED "This command is not yet implemented!" 
S_COLOR_WHITE "\n" );
+   if(gi.argc() == 1)
+   {
+   if(g_spskill->integer == 0)
+   {
+   gi.Printf( S_COLOR_GREEN "Current Difficulty: Padawan" 
S_COLOR_WHITE "\n" );
+   }
+   else if(g_spskill->integer == 1)
+   {
+   gi.Printf( S_COLOR_GREEN "Current Difficulty: Jedi" 
S_COLOR_WHITE "\n" );
+   }
+   else if(g_spskill->integer == 2)
+   {
+   int crosshairHint = 
gi.Cvar_VariableIntegerValue("cg_crosshairForceHint");
+   int handicap = gi.Cvar_VariableIntegerValue("handicap");
+   if(handicap == 100 && crosshairHint == 0)
+   {
+   gi.Printf( S_COLOR_GREEN "Current Difficulty: 
Jedi Knight" S_COLOR_WHITE "\n" );
+   }
+   else if(handicap == 50 && crosshairHint == 0)
+   {
+   gi.Printf( S_COLOR_GREEN "Current Difficulty: 
Jedi Master" S_COLOR_WHITE "\n" );
+   }
+   else
+   {
+   gi.Printf( S_COLOR_GREEN "Current Difficulty: 
Jedi Knight (Custom)" S_COLOR_WHITE "\n" );
+   gi.Printf( S_COLOR_GREEN "Crosshair Force Hint: 
%i" S_COLOR_WHITE "\n", crosshairHint != 0 ? 1 : 0 );
+   gi.Printf( S_COLOR_GREEN "Handicap: %i" 
S_COLOR_WHITE "\n", handicap );
+   }
+   }
+   else
+   {
+   gi.Printf( S_COLOR_RED "Invalid difficulty cvar set! 
g_spskill (%i) [0-2] is valid range only" S_COLOR_WHITE "\n", 
g_spskill->integer );
+   }
+   }
 }
 
 #define CMD_NONE   (0xu)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 123/130: Merge tag 'upstream/0_20161025+dfsg1' into debian/master

[Simon McVittie]

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

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

commit ee44072e39ebd36af40e994471f1fdb224a9548a
Merge: 6b25efe 8b1d49d
Author: Simon McVittie 
Date:   Fri Oct 28 10:57:03 2016 +0100

Merge tag 'upstream/0_20161025+dfsg1' into debian/master

Upstream version 0~20161025+dfsg1

 CMakeLists.txt|3 +-
 appveyor.yml  |   21 +-
 code/CMakeLists.txt   |   12 +-
 code/cgame/FxPrimitives.cpp   |2 +-
 code/cgame/FxScheduler.cpp|   29 +-
 code/cgame/FxScheduler.h  |   25 +
 code/cgame/FxSystem.h |   20 -
 code/cgame/FxUtil.cpp |2 +-
 code/cgame/cg_consolecmds.cpp |4 +-
 code/cgame/cg_effects.cpp |8 +-
 code/cgame/cg_main.cpp|   31 +-
 code/cgame/cg_players.cpp |   14 +-
 code/cgame/cg_servercmds.cpp  |4 +-
 code/client/cl_input.cpp  |7 +
 code/client/cl_main.cpp   |4 +-
 code/game/CMakeLists.txt  |6 +-
 code/game/G_Timer.cpp |   49 +-
 code/game/NPC_spawn.cpp   |2 +-
 code/game/Q3_Interface.cpp|  121 ++-
 code/game/Q3_Interface.h  |4 +-
 code/game/ai.h|   75 +-
 code/game/b_public.h  |  303 ++-
 code/game/bg_public.h |   52 +-
 code/game/g_local.h   |  116 ++-
 code/game/g_main.cpp  |   41 +-
 code/game/g_objectives.cpp|   15 +-
 code/game/g_public.h  |   16 +-
 code/game/g_roff.cpp  |   42 +-
 code/game/g_savegame.cpp  |  514 ++-
 code/game/g_shared.h  |  881 +-
 code/game/g_svcmds.cpp|  634 ++---
 code/game/g_vehicles.h|  155 
 code/game/g_weapon.cpp|2 +-
 code/game/ghoul2_shared.h |  303 ++-
 code/icarus/IcarusImplementation.cpp  |   65 +-
 code/icarus/IcarusInterface.h |3 +-
 code/qcommon/cm_load.cpp  |   24 +-
 code/qcommon/md4.cpp  |4 +-
 code/qcommon/msg.cpp  |   11 +-
 code/qcommon/ojk_i_saved_game.h   |  106 +++
 code/qcommon/ojk_saved_game.cpp   |  972 
 code/qcommon/ojk_saved_game.h |  193 
 code/qcommon/ojk_saved_game_class_archivers.h |   51 ++
 code/qcommon/ojk_saved_game_helper.h  |  843 +
 code/qcommon/ojk_saved_game_helper_fwd.h  |  321 +++
 code/qcommon/ojk_scope_guard.h|   58 ++
 code/qcommon/q_shared.cpp |   23 +-
 code/qcommon/q_shared.h   |  914 ++-
 code/qcommon/qcommon.h|   12 +-
 code/rd-common/mdx_format.h   |   15 +
 code/rd-common/tr_common.h|2 +-
 code/rd-common/tr_image_jpg.cpp   |   16 +-
 code/rd-common/tr_public.h|6 +-
 code/rd-vanilla/CMakeLists.txt|6 +-
 code/rd-vanilla/G2_API.cpp|5 +-
 code/rd-vanilla/G2_bones.cpp  |1 -
 code/rd-vanilla/G2_misc.cpp   |  226 +++--
 code/rd-vanilla/tr_ghoul2.cpp |   32 +-
 code/rd-vanilla/tr_surface.cpp|   32 +-
 code/server/sv_game.cpp   |   22 +-
 code/server/sv_savegame.cpp   | 1207 ++---
 code/server/sv_snapshot.cpp   |6 +
 code/ui/ui_main.cpp   |   57 +-
 code/ui/ui_shared.cpp |  230 -
 code/ui/ui_shared.h   |8 +-
 codeJK2/cgame/FxPrimitives.cpp|2 +-
 codeJK2/cgame/FxSystem.h  |   20 -
 codeJK2/cgame/FxUtil.cpp  |2 +-
 codeJK2/cgame/cg_consolecmds.cpp  |4 +-
 codeJK2/cgame/cg_effects.cpp  |8 +-
 codeJK2/cgame/cg_main.cpp |   27 +-
 codeJK2/cgame/cg_players.cpp  |   12 +-
 codeJK2/cgame/cg_servercmds.cpp   |4 +-
 codeJK2/cgame/cg_weapons.cpp  |   14 +-
 codeJK2/game/CMakeLists.txt   |6 +-
 codeJK2/game/G_Timer.cpp  |   50 +-
 codeJK2/game/NPC_spawn.cpp|2 +-
 codeJK2/game/Q3_Interface.cpp |3 +-
 

[openjk] 109/130: Delete use of CMAKE_BUILD_TYPE from appveyor.yml

[Simon McVittie]

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

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

commit c0f6ba665f2466d1a29b475e423134a03a5659d6
Author: Alex Lo 
Date:   Wed Oct 19 19:37:08 2016 +0100

Delete use of CMAKE_BUILD_TYPE from appveyor.yml
---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4b48b96..62a112e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -48,12 +48,12 @@ before_build:
   - cmd: cd %APPVEYOR_BUILD_FOLDER%
   #- set #debug: view all environment variables
   - cmd: if "%Platform%"=="x64" set "CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64"
-  - cmd: echo "Generator='%CMAKE_GENERATOR%', 
CMAKE_BUILD_TYPE='%CMAKE_BUILD_TYPE%'"
+  - cmd: echo "Generator='%CMAKE_GENERATOR%'"
   - cmd: echo "Platform='%Platform%'"
   - cmd: if exist build rmdir /q /s build #remove build dir
   - mkdir build
   - cmd: cd build
-  - cmd: cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" 
"%APPVEYOR_BUILD_FOLDER%"
+  - cmd: cmake -G "%CMAKE_GENERATOR%" "%APPVEYOR_BUILD_FOLDER%"
   - cmd: ls
 
 build:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 107/130: Refine the appveyor config a bit

[Simon McVittie]

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

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

commit 7d52f7d16ec4a0e19fc78b16829ca7bc9848d087
Author: Alex Lo 
Date:   Wed Oct 19 19:32:27 2016 +0100

Refine the appveyor config a bit
---
 appveyor.yml | 14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a0e95b7..8b39d12 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,11 +10,11 @@ shallow_clone: true #GitHub specific (ignores clone_depth)
 #do not build on tags
 skip_tags: true
 
-os: Visual Studio 2015 #  Windows Server 2012
+os: Visual Studio 2013
 
 environment:
-  VisualStudioVersion: "14.0"
-  CMAKE_GENERATOR: "Visual Studio 14 2015"
+  VisualStudioVersion: "12.0"
+  CMAKE_GENERATOR: "Visual Studio 12 2013"
   matrix:
 - CMAKE_BUILD_TYPE: "Debug"
 - CMAKE_BUILD_TYPE: "Release"
@@ -27,7 +27,7 @@ platform:
   - x64
 
 configuration:
-  #- Debug
+  - Debug
   - Release
 
 #scripts that are called at very beginning, before repo cloning
@@ -58,15 +58,11 @@ before_build:
   - cmd: cd build
   - cmd: cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" 
"%APPVEYOR_BUILD_FOLDER%"
   - cmd: ls
-  #- mkdir ..\nmakebuild
-  #- cd ..\nmakebuild
-  #- cmd:  cmake -G "NMake Makefiles" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" 
"%APPVEYOR_BUILD_FOLDER%"
-  #- cmd: ls
 
 build:
   parallel: true
   project: C:\projects\OpenJK\build\OpenJK.sln
-  verbosity: minimal #quiet|minimal|normal|detailed
+  verbosity: normal
 
 #scripts to run after build
 after_build:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 113/130: Remove constexpr usage

[Simon McVittie]

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

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

commit c9f44bdd7a7393f851a2d55d21e04cdd99de4c86
Author: Xycaleth 
Date:   Fri Oct 21 22:33:03 2016 +0100

Remove constexpr usage

VS2013 does not support the constexpr keyword so it has been removed.
---
 code/game/g_savegame.cpp  |  8 +++
 code/qcommon/ojk_saved_game.cpp   |  4 ++--
 code/qcommon/ojk_saved_game.h |  2 +-
 code/qcommon/ojk_saved_game_class_archivers.h |  5 +
 code/qcommon/ojk_saved_game_helper.h  | 32 +--
 code/qcommon/ojk_saved_game_helper_fwd.h  |  7 ++
 6 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/code/game/g_savegame.cpp b/code/game/g_savegame.cpp
index ca27583..0b3d0db 100644
--- a/code/game/g_savegame.cpp
+++ b/code/game/g_savegame.cpp
@@ -768,10 +768,10 @@ static void copy_retail_gclient_to_current(
const RetailGClient& src,
gclient_t& dst)
 {
-   constexpr size_t src_pre_size = offsetof(RetailGClient, ps.saber[0]);
-   constexpr size_t src_post_offset = offsetof(RetailGClient, 
ps.dualSabers);
-   constexpr size_t src_post_size = sizeof(RetailGClient) - 
src_post_offset;
-   constexpr size_t dst_post_offset = offsetof(gclient_t, ps.dualSabers);
+   const size_t src_pre_size = offsetof(RetailGClient, ps.saber[0]);
+   const size_t src_post_offset = offsetof(RetailGClient, ps.dualSabers);
+   const size_t src_post_size = sizeof(RetailGClient) - src_post_offset;
+   const size_t dst_post_offset = offsetof(gclient_t, ps.dualSabers);
 
::memcpy(
reinterpret_cast(),
diff --git a/code/qcommon/ojk_saved_game.cpp b/code/qcommon/ojk_saved_game.cpp
index bd27599..9d479f1 100644
--- a/code/qcommon/ojk_saved_game.cpp
+++ b/code/qcommon/ojk_saved_game.cpp
@@ -138,7 +138,7 @@ bool SavedGame::create(
 
is_writable_ = true;
 
-   constexpr int sg_version = iSAVEGAME_VERSION;
+   const int sg_version = iSAVEGAME_VERSION;
 
SavedGameHelper sgsh(this);
 
@@ -963,7 +963,7 @@ void SavedGame::reset_buffer_offset()
io_buffer_offset_ = 0;
 }
 
-constexpr uint32_t SavedGame::get_jo_magic_value()
+const uint32_t SavedGame::get_jo_magic_value()
 {
return 0x1234ABCD;
 }
diff --git a/code/qcommon/ojk_saved_game.h b/code/qcommon/ojk_saved_game.h
index 543a8a5..ea9f88b 100644
--- a/code/qcommon/ojk_saved_game.h
+++ b/code/qcommon/ojk_saved_game.h
@@ -183,7 +183,7 @@ private:
static std::string get_chunk_id_string(
uint32_t chunk_id);
 
-   static constexpr uint32_t get_jo_magic_value();
+   static const uint32_t get_jo_magic_value();
 }; // SavedGame
 
 
diff --git a/code/qcommon/ojk_saved_game_class_archivers.h 
b/code/qcommon/ojk_saved_game_class_archivers.h
index 70a5da9..cfd4743 100644
--- a/code/qcommon/ojk_saved_game_class_archivers.h
+++ b/code/qcommon/ojk_saved_game_class_archivers.h
@@ -19,10 +19,7 @@ template<>
 class SavedGameClassArchiver
 {
 public:
-   static constexpr bool is_implemented()
-   {
-   return true;
-   }
+   enum { is_implemented = true };
 
static void sg_export(
SavedGameHelper& saved_game,
diff --git a/code/qcommon/ojk_saved_game_helper.h 
b/code/qcommon/ojk_saved_game_helper.h
index 280cd0e..750dde4 100644
--- a/code/qcommon/ojk_saved_game_helper.h
+++ b/code/qcommon/ojk_saved_game_helper.h
@@ -334,7 +334,7 @@ bool SavedGameHelper::try_read(
TDst& dst_value,
NumericTag)
 {
-   constexpr int src_size = static_cast(sizeof(TSrc));
+   const int src_size = static_cast(sizeof(TSrc));
 
TSrc src_value;
 
@@ -393,7 +393,7 @@ bool SavedGameHelper::try_read(
"Unsupported types.");
 
using Tag = typename std::conditional<
-   SavedGameClassArchiver::is_implemented(),
+   SavedGameClassArchiver::is_implemented,
ExternalTag,
InternalTag
>::type;
@@ -474,26 +474,26 @@ bool SavedGameHelper::try_read(
TSrc
>::type;
 
-   constexpr bool is_src_pure_numeric =
+   const bool is_src_pure_numeric =
std::is_arithmetic::value &&
(!std::is_same::value) &&
(!std::is_enum::value);
 
-   constexpr bool is_dst_pure_numeric =
+   const bool is_dst_pure_numeric =
std::is_arithmetic::value &&
(!std::is_same::value) &&
(!std::is_enum::value);
 
-   constexpr bool is_src_float_point =
+   const bool is_src_float_point =
std::is_floating_point::value;
 
-   constexpr bool is_dst_float_point =
+   const bool is_dst_float_point =
std::is_floating_point::value;
 
-   constexpr bool has_same_size =
+   const bool 

[openjk] 115/130: JK2: Merge in improved g_svcmds.cpp specialized for JK2

[Simon McVittie]

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

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

commit 3df77749b0ca5c354d952103a6161182bd237f2b
Author: Ensiform 
Date:   Sun Oct 23 19:04:32 2016 -0500

JK2: Merge in improved g_svcmds.cpp specialized for JK2

Some changes were made to accomodate for JK2 version of these commands
which is different of course.
---
 codeJK2/cgame/cg_servercmds.cpp |   2 +-
 codeJK2/game/g_ICARUS.cpp   |   2 +-
 codeJK2/game/g_svcmds.cpp   | 451 
 3 files changed, 225 insertions(+), 230 deletions(-)

diff --git a/codeJK2/cgame/cg_servercmds.cpp b/codeJK2/cgame/cg_servercmds.cpp
index 9a85982..d4ddc0e 100644
--- a/codeJK2/cgame/cg_servercmds.cpp
+++ b/codeJK2/cgame/cg_servercmds.cpp
@@ -256,7 +256,7 @@ typedef struct serverCommand_s {
void( *func )(void);
 } serverCommand_t;
 
-int svcmdcmp( const void *a, const void *b ) {
+static int svcmdcmp( const void *a, const void *b ) {
return Q_stricmp( (const char *)a, ((serverCommand_t*)b)->cmd );
 }
 
diff --git a/codeJK2/game/g_ICARUS.cpp b/codeJK2/game/g_ICARUS.cpp
index 6adf2e0..e89ff76 100644
--- a/codeJK2/game/g_ICARUS.cpp
+++ b/codeJK2/game/g_ICARUS.cpp
@@ -638,7 +638,7 @@ Svcmd_ICARUS_f
 
 void Svcmd_ICARUS_f( void )
 {
-   char*cmd = gi.argv( 1 );
+   const char *cmd = gi.argv( 1 );
 
if ( Q_stricmp( cmd, "log" ) == 0 )
{
diff --git a/codeJK2/game/g_svcmds.cpp b/codeJK2/game/g_svcmds.cpp
index 83b28a2..40d4580 100644
--- a/codeJK2/game/g_svcmds.cpp
+++ b/codeJK2/game/g_svcmds.cpp
@@ -49,25 +49,46 @@ voidSvcmd_EntityList_f (void) {
gi.Printf("%3i:", e);
switch ( check->s.eType ) {
case ET_GENERAL:
-   gi.Printf("ET_GENERAL ");
+   gi.Printf( "ET_GENERAL  " );
break;
case ET_PLAYER:
-   gi.Printf("ET_PLAYER  ");
+   gi.Printf( "ET_PLAYER   " );
break;
case ET_ITEM:
-   gi.Printf("ET_ITEM");
+   gi.Printf( "ET_ITEM " );
break;
case ET_MISSILE:
-   gi.Printf("ET_MISSILE ");
+   gi.Printf( "ET_MISSILE  " );
break;
case ET_MOVER:
-   gi.Printf("ET_MOVER   ");
+   gi.Printf( "ET_MOVER" );
break;
case ET_BEAM:
-   gi.Printf("ET_BEAM");
+   gi.Printf( "ET_BEAM " );
+   break;
+   case ET_PORTAL:
+   gi.Printf( "ET_PORTAL   " );
+   break;
+   case ET_SPEAKER:
+   gi.Printf( "ET_SPEAKER  " );
+   break;
+   case ET_PUSH_TRIGGER:
+   gi.Printf( "ET_PUSH_TRIGGER " );
+   break;
+   case ET_TELEPORT_TRIGGER:
+   gi.Printf( "ET_TELEPORT_TRIGGER " );
+   break;
+   case ET_INVISIBLE:
+   gi.Printf( "ET_INVISIBLE" );
+   break;
+   case ET_THINKER:
+   gi.Printf( "ET_THINKER  " );
+   break;
+   case ET_CLOUD:
+   gi.Printf( "ET_CLOUD" );
break;
default:
-   gi.Printf("#%i", check->s.eType);
+   gi.Printf( "%-3i", check->s.eType );
break;
}
 
@@ -328,306 +349,280 @@ void Svcmd_SaberAttackCycle_f( void )
switch ( saberAnimLevel )
{
case FORCE_LEVEL_1:
-   gi.Printf( S_COLOR_BLUE"Lightsaber Combat Style: Fast\n" );
+   gi.Printf( S_COLOR_BLUE "Lightsaber Combat Style: Fast\n" );
//LIGHTSABERCOMBATSTYLE_FAST
break;
case FORCE_LEVEL_2:
-   gi.Printf( S_COLOR_YELLOW"Lightsaber Combat Style: Medium\n" );
+   gi.Printf( S_COLOR_YELLOW "Lightsaber Combat Style: Medium\n" );
//LIGHTSABERCOMBATSTYLE_MEDIUM
break;
case FORCE_LEVEL_3:
-   gi.Printf( S_COLOR_RED"Lightsaber Combat Style: Strong\n" );
+   gi.Printf( S_COLOR_RED "Lightsaber Combat Style: Strong\n" );
//LIGHTSABERCOMBATSTYLE_STRONG
break;
case FORCE_LEVEL_4:
-   gi.Printf( S_COLOR_CYAN"Lightsaber Combat Style: Desann\n" );
+   gi.Printf( S_COLOR_CYAN "Lightsaber Combat Style: Desann\n" );

[openjk] 112/130: SP: Fix crash when game API version doesn't match

[Simon McVittie]

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

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

commit c80a08ba4ff0694a93d1dff3fd3c7bb9ceeaff7e
Author: Xycaleth 
Date:   Sat Aug 27 19:53:50 2016 +0100

SP: Fix crash when game API version doesn't match

Can't access 'ge' fields once the DLL has unloaded since it points to
memory owned by the DLL (which has now been unloaded).
---
 code/server/sv_game.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/server/sv_game.cpp b/code/server/sv_game.cpp
index b78146c..8cd596f 100644
--- a/code/server/sv_game.cpp
+++ b/code/server/sv_game.cpp
@@ -1068,8 +1068,9 @@ void SV_InitGameProgs (void) {
 
if (ge->apiversion != GAME_API_VERSION)
{
+   int apiVersion = ge->apiversion;
Sys_UnloadDll( gameLibrary );
-   Com_Error (ERR_DROP, "game is version %i, not %i", 
ge->apiversion, GAME_API_VERSION);
+   Com_Error (ERR_DROP, "game is version %i, not %i", apiVersion, 
GAME_API_VERSION);
}
 
//hook up the client while we're here

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 117/130: Shared: Fixed clang compile using invalid warning flag declarator

[Simon McVittie]

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

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

commit 761654897b42a7754a4808f4d0dd4d46372c2a25
Author: Ensiform 
Date:   Mon Oct 24 12:04:14 2016 -0500

Shared: Fixed clang compile using invalid warning flag declarator
---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6130ba..7a17d4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,7 +272,8 @@ elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR 
("${CMAKE_C_COMPILER_ID}" S
endif()
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
-Wno-deprecated-writable-strings")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
+   #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
-Wno-deprecated-writable-strings")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-comment")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof")
endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 108/130: Don't specify CMAKE_BUILD_TYPE in a matrix

[Simon McVittie]

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

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

commit f9f8dfaec22965c21052c4e71b02de28d90ab069
Author: Alex Lo 
Date:   Wed Oct 19 19:35:28 2016 +0100

Don't specify CMAKE_BUILD_TYPE in a matrix

CMAKE_BUILD_TYPE is unused for multi-configuration MSVC project files.
---
 appveyor.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8b39d12..4b48b96 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,9 +15,6 @@ os: Visual Studio 2013
 environment:
   VisualStudioVersion: "12.0"
   CMAKE_GENERATOR: "Visual Studio 12 2013"
-  matrix:
-- CMAKE_BUILD_TYPE: "Debug"
-- CMAKE_BUILD_TYPE: "Release"
 
 matrix:
   fast_finish: false #finish build once one of the jobs fails

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 114/130: SP: Don't try to open invalid file names in UI model loader

[Simon McVittie]

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

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

commit f832cf69ff74c800c1f7f45b20107cbb98bccc2d
Author: Ensiform 
Date:   Sat Oct 22 14:31:57 2016 -0500

SP: Don't try to open invalid file names in UI model loader

Previously `models/players//PlayerChoice.txt` was attempting to be
loaded.  This difference was already in the MP codebase so it appears to
be a slight oversight in the codebases.
---
 code/ui/ui_main.cpp | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/ui/ui_main.cpp b/code/ui/ui_main.cpp
index 19e3554..2fd0aae 100644
--- a/code/ui/ui_main.cpp
+++ b/code/ui/ui_main.cpp
@@ -2422,7 +2422,15 @@ static void UI_BuildPlayerModel_List( qboolean 
inGameLoad )
 
dirlen = strlen(dirptr);
 
-   if (dirlen && dirptr[dirlen-1]=='/') dirptr[dirlen-1]='\0';
+   if (dirlen)
+   {
+   if (dirptr[dirlen-1]=='/')
+   dirptr[dirlen-1]='\0';
+   }
+   else
+   {
+   continue;
+   }
 
if (!strcmp(dirptr,".") || !strcmp(dirptr,".."))
continue;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 119/130: SP: Add tab completion for new commands

[Simon McVittie]

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

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

commit b376600ab9ac09af59b32961c66965c5ab59a92d
Author: Ensiform 
Date:   Mon Oct 24 21:34:37 2016 -0500

SP: Add tab completion for new commands

Adds `difficult`y and `secrets` to tab completion.
---
 code/cgame/cg_consolecmds.cpp| 2 ++
 codeJK2/cgame/cg_consolecmds.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/code/cgame/cg_consolecmds.cpp b/code/cgame/cg_consolecmds.cpp
index 2644832..a990b79 100644
--- a/code/cgame/cg_consolecmds.cpp
+++ b/code/cgame/cg_consolecmds.cpp
@@ -281,6 +281,7 @@ qboolean CG_ConsoleCommand( void ) {
 static const char *gcmds[] = {
"bow",
"entitylist",
+   "difficulty",
"flourish",
"force_absorb",
"force_distract",
@@ -310,6 +311,7 @@ static const char *gcmds[] = {
"saberAttackCycle",
"saberColor",
"saberblade",
+   "secrets",
"setForceAll",
"setSaberAll",
"setobjective",
diff --git a/codeJK2/cgame/cg_consolecmds.cpp b/codeJK2/cgame/cg_consolecmds.cpp
index 3a408b0..6a67a67 100644
--- a/codeJK2/cgame/cg_consolecmds.cpp
+++ b/codeJK2/cgame/cg_consolecmds.cpp
@@ -265,6 +265,7 @@ qboolean CG_ConsoleCommand( void ) {
 
 static const char *gcmds[] = {
"entitylist",
+   "difficulty",
"force_distract",
"force_grip",
"force_heal",
@@ -283,6 +284,7 @@ static const char *gcmds[] = {
"runscript",
"saberAttackCycle",
"saberColor",
+   "secrets",
"setForceAll",
"setSaberAll",
"setobjective",

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 120/130: JK2: Fix rendering of weapon icons

[Simon McVittie]

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

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

commit c97a368aa7f8e3846431101ef9845d5ae2d25a2f
Author: Ensiform 
Date:   Mon Oct 24 23:05:28 2016 -0500

JK2: Fix rendering of weapon icons

Fixed rendering of weapon icons in datapad and scroll wheel.

Previously, Raven neglected to actually check the player's ammo counts.
---
 codeJK2/cgame/cg_weapons.cpp | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/codeJK2/cgame/cg_weapons.cpp b/codeJK2/cgame/cg_weapons.cpp
index 4b5366b..6bfbbd5 100644
--- a/codeJK2/cgame/cg_weapons.cpp
+++ b/codeJK2/cgame/cg_weapons.cpp
@@ -1267,7 +1267,7 @@ int CG_WeaponCheck( int weaponIndex )
 {
int value;
 
-   if ( weaponIndex == WP_SABER)
+   if ( weaponIndex == WP_SABER || weaponIndex == WP_STUN_BATON )
{
return qtrue;
}
@@ -1276,14 +1276,20 @@ int CG_WeaponCheck( int weaponIndex )
? 
weaponData[weaponIndex].energyPerShot
: 
weaponData[weaponIndex].altEnergyPerShot;
 
-   if (value > 0)
+   if( !cg.snap )
{
-   value = qtrue;
+   return qfalse;
}
-   else
+
+   // check how much energy(ammo) it takes to fire this weapon against how 
much ammo we have
+   if ( value > cg.snap->ps.ammo[weaponData[weaponIndex].ammoIndex] )
{
value = qfalse;
}
+   else
+   {
+   value = qtrue;
+   }
 
return value;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 116/130: Merge pull request #879 from xycaleth/remove-constexpr

[Simon McVittie]

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

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

commit 0794f8d192d410335fe7000411542924f56d496f
Merge: 3df7774 c9f44bd
Author: Alex Lo 
Date:   Mon Oct 24 13:34:10 2016 +0100

Merge pull request #879 from xycaleth/remove-constexpr

Remove constexpr usage

 code/game/g_savegame.cpp  |  8 +++
 code/qcommon/ojk_saved_game.cpp   |  4 ++--
 code/qcommon/ojk_saved_game.h |  2 +-
 code/qcommon/ojk_saved_game_class_archivers.h |  5 +
 code/qcommon/ojk_saved_game_helper.h  | 32 +--
 code/qcommon/ojk_saved_game_helper_fwd.h  |  7 ++
 6 files changed, 26 insertions(+), 32 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 105/130: SG: Fix compiling warnings

[Simon McVittie]

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

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

commit 0a268e7d9f65bf3ce21aa7639ffbfbddad8f594d
Author: bibendovsky 
Date:   Sun Oct 9 17:41:17 2016 +0300

SG: Fix compiling warnings
---
 code/server/sv_savegame.cpp | 2 +-
 codeJK2/icarus/Sequence.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/server/sv_savegame.cpp b/code/server/sv_savegame.cpp
index 1f49def..f9191e2 100644
--- a/code/server/sv_savegame.cpp
+++ b/code/server/sv_savegame.cpp
@@ -453,7 +453,7 @@ static void WriteGame(qboolean autosave)
 
 static qboolean ReadGame (void)
 {
-   qboolean qbAutoSave;
+   qboolean qbAutoSave = qfalse;
 
ojk::SavedGameHelper saved_game(
::SavedGame::get_instance());
diff --git a/codeJK2/icarus/Sequence.cpp b/codeJK2/icarus/Sequence.cpp
index 325984e..f2ab750 100644
--- a/codeJK2/icarus/Sequence.cpp
+++ b/codeJK2/icarus/Sequence.cpp
@@ -534,7 +534,7 @@ int CSequence::Load( void )
INT_ID('S', 'I', 'T', 'R'),
m_iterations);
 
-   int numCommands;
+   int numCommands = 0;
 
//Get the number of commands
saved_game.read_chunk(

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 104/130: SG: Fix compiling errors and warnings

[Simon McVittie]

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

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

commit 91bcc2897ee08dab0f250520d03c0594b8a2d4bb
Author: bibendovsky 
Date:   Sun Oct 9 13:04:48 2016 +0300

SG: Fix compiling errors and warnings
---
 code/game/G_Timer.cpp|  4 ++--
 code/game/Q3_Interface.cpp   | 10 +-
 code/game/g_roff.cpp |  4 ++--
 code/game/g_savegame.cpp |  4 ++--
 code/game/g_vehicles.h   |  4 ++--
 code/icarus/IcarusImplementation.cpp |  2 +-
 code/qcommon/ojk_saved_game.cpp  |  2 +-
 code/qcommon/ojk_saved_game_helper.h |  2 --
 code/qcommon/ojk_saved_game_helper_fwd.h |  4 ++--
 code/rd-vanilla/G2_misc.cpp  |  5 +
 code/server/sv_savegame.cpp  |  6 +++---
 codeJK2/game/G_Timer.cpp |  4 ++--
 codeJK2/game/Q3_Registers.cpp| 10 +-
 codeJK2/game/g_roff.cpp  |  2 +-
 codeJK2/game/g_savegame.cpp  |  4 ++--
 codeJK2/icarus/Instance.cpp  | 10 +-
 codeJK2/icarus/Sequence.cpp  | 12 +---
 codeJK2/icarus/Sequencer.cpp |  4 ++--
 codeJK2/icarus/TaskManager.cpp   | 14 +++---
 shared/sys/sys_win32.cpp |  2 +-
 20 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/code/game/G_Timer.cpp b/code/game/G_Timer.cpp
index 90f2e87..d72f525 100644
--- a/code/game/G_Timer.cpp
+++ b/code/game/G_Timer.cpp
@@ -222,7 +222,7 @@ void TIMER_Load( void )
 
for ( j = 0, ent = _entities[0]; j < MAX_GENTITIES; j++, ent++ )
{
-   unsigned char numTimers;
+   unsigned char numTimers = 0;
 
saved_game.read_chunk(
INT_ID('T', 'I', 'M', 'E'),
@@ -231,7 +231,7 @@ void TIMER_Load( void )
//Read back all entries
for ( int i = 0; i < numTimers; i++ )
{
-   int time;
+   int time = 0;
chartempBuffer[1024];   // Still ugly. Setting 
ourselves up for 007 AUF all over again. =)
 
assert (sizeof(g_timers[0]->time) == sizeof(time) 
);//make sure we're reading the same size as we wrote
diff --git a/code/game/Q3_Interface.cpp b/code/game/Q3_Interface.cpp
index d589472..56feeeb 100644
--- a/code/game/Q3_Interface.cpp
+++ b/code/game/Q3_Interface.cpp
@@ -7308,7 +7308,7 @@ VariableLoadFloats
 
 void CQuake3GameInterface::VariableLoadFloats( varFloat_m  )
 {
-   int numFloats;
+   int numFloats = 0;
chartempBuffer[1024];
 
ojk::SavedGameHelper saved_game(
@@ -7320,7 +7320,7 @@ void CQuake3GameInterface::VariableLoadFloats( varFloat_m 
 )
 
for ( int i = 0; i < numFloats; i++ )
{
-   int idSize;
+   int idSize = 0;
 
saved_game.read_chunk(
INT_ID('F', 'I', 'D', 'L'),
@@ -7333,7 +7333,7 @@ void CQuake3GameInterface::VariableLoadFloats( varFloat_m 
 )
 
tempBuffer[ idSize ] = 0;
 
-   float   val;
+   float   val = 0.0F;
 
saved_game.read_chunk(
INT_ID('F', 'V', 'A', 'L'),
@@ -7352,7 +7352,7 @@ VariableLoadStrings
 
 void CQuake3GameInterface::VariableLoadStrings( int type, varString_m  )
 {
-   int numFloats;
+   int numFloats = 0;
chartempBuffer[1024];
chartempBuffer2[1024];
 
@@ -7365,7 +7365,7 @@ void CQuake3GameInterface::VariableLoadStrings( int type, 
varString_m  )
 
for ( int i = 0; i < numFloats; i++ )
{
-   int idSize;
+   int idSize = 0;
 
saved_game.read_chunk(
INT_ID('S', 'I', 'D', 'L'),
diff --git a/code/game/g_roff.cpp b/code/game/g_roff.cpp
index 84e2599..fe1f79f 100644
--- a/code/game/g_roff.cpp
+++ b/code/game/g_roff.cpp
@@ -649,7 +649,7 @@ void G_Roff( gentity_t *ent )
 
 void G_SaveCachedRoffs()
 {
-   int i, len;
+   int i, len = 0;
 
ojk::SavedGameHelper saved_game(
::gi.saved_game);
@@ -685,7 +685,7 @@ void G_SaveCachedRoffs()
 
 void G_LoadCachedRoffs()
 {
-   int i, count, len;
+   int i, count = 0, len = 0;
charbuffer[MAX_QPATH];
 
ojk::SavedGameHelper saved_game(
diff --git a/code/game/g_savegame.cpp b/code/game/g_savegame.cpp
index 24b5d78..ca27583 100644
--- a/code/game/g_savegame.cpp
+++ b/code/game/g_savegame.cpp
@@ -989,7 +989,7 @@ static void WriteGEntities(qboolean qbAutosave)
 
 static void ReadGEntities(qboolean qbAutosave)
 {
-   int iCount;
+   int iCount = 0;
int i;
 
ojk::SavedGameHelper saved_game(
@@ -1002,7 +1002,7 @@ 

[openjk] 103/130: Merge pull request #848 from bibendovsky/fix_load_save_32_64

[Simon McVittie]

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

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

commit b40ab00561ab66bf7ae551dfdbe8499a001e4760
Merge: abd4b52 0e3c1e6
Author: Alex Lo 
Date:   Sat Oct 8 17:02:14 2016 +0100

Merge pull request #848 from bibendovsky/fix_load_save_32_64

Fix loading/saving saved games for 64-bit mode

 code/CMakeLists.txt   |   12 +-
 code/cgame/FxScheduler.cpp|   29 +-
 code/cgame/FxScheduler.h  |   25 +
 code/cgame/cg_main.cpp|   31 +-
 code/cgame/cg_players.cpp |6 +-
 code/client/cl_input.cpp  |7 +
 code/client/cl_main.cpp   |4 +-
 code/game/CMakeLists.txt  |6 +-
 code/game/G_Timer.cpp |   45 +-
 code/game/NPC_spawn.cpp   |2 +-
 code/game/Q3_Interface.cpp|  111 ++-
 code/game/Q3_Interface.h  |4 +-
 code/game/ai.h|   75 +-
 code/game/b_public.h  |  303 ++-
 code/game/bg_public.h |   52 +-
 code/game/g_local.h   |  116 ++-
 code/game/g_main.cpp  |   41 +-
 code/game/g_objectives.cpp|   15 +-
 code/game/g_public.h  |   16 +-
 code/game/g_roff.cpp  |   38 +-
 code/game/g_savegame.cpp  |  510 +--
 code/game/g_shared.h  |  881 +-
 code/game/g_vehicles.h|  155 
 code/game/g_weapon.cpp|2 +-
 code/game/ghoul2_shared.h |  303 ++-
 code/icarus/IcarusImplementation.cpp  |   63 +-
 code/icarus/IcarusInterface.h |3 +-
 code/qcommon/cm_load.cpp  |   24 +-
 code/qcommon/md4.cpp  |4 +-
 code/qcommon/msg.cpp  |   11 +-
 code/qcommon/ojk_i_saved_game.h   |  106 +++
 code/qcommon/ojk_saved_game.cpp   |  972 
 code/qcommon/ojk_saved_game.h |  193 
 code/qcommon/ojk_saved_game_class_archivers.h |   54 ++
 code/qcommon/ojk_saved_game_helper.h  |  845 +
 code/qcommon/ojk_saved_game_helper_fwd.h  |  324 +++
 code/qcommon/ojk_scope_guard.h|   58 ++
 code/qcommon/q_shared.cpp |3 -
 code/qcommon/q_shared.h   |  905 ++-
 code/qcommon/qcommon.h|   12 +-
 code/rd-common/mdx_format.h   |   15 +
 code/rd-common/tr_common.h|2 +-
 code/rd-common/tr_image_jpg.cpp   |   16 +-
 code/rd-common/tr_public.h|6 +-
 code/rd-vanilla/CMakeLists.txt|6 +-
 code/rd-vanilla/G2_API.cpp|5 +-
 code/rd-vanilla/G2_bones.cpp  |1 -
 code/rd-vanilla/G2_misc.cpp   |  221 +++--
 code/rd-vanilla/tr_ghoul2.cpp |   32 +-
 code/server/sv_game.cpp   |   19 +-
 code/server/sv_savegame.cpp   | 1201 ++---
 code/server/sv_snapshot.cpp   |6 +
 code/ui/ui_main.cpp   |   47 +-
 codeJK2/cgame/cg_main.cpp |   27 +-
 codeJK2/cgame/cg_players.cpp  |4 +-
 codeJK2/game/CMakeLists.txt   |6 +-
 codeJK2/game/G_Timer.cpp  |   46 +-
 codeJK2/game/NPC_spawn.cpp|2 +-
 codeJK2/game/Q3_Interface.cpp |3 +-
 codeJK2/game/Q3_Registers.cpp |  102 ++-
 codeJK2/game/ai.h |   74 +-
 codeJK2/game/anims.h  |   26 +-
 codeJK2/game/b_public.h   |  269 +-
 codeJK2/game/bg_public.h  |   48 +-
 codeJK2/game/g_ICARUS.cpp |2 +-
 codeJK2/game/g_local.h|   84 +-
 codeJK2/game/g_main.cpp   |   36 +-
 codeJK2/game/g_objectives.cpp |   15 +-
 codeJK2/game/g_public.h   |9 +-
 codeJK2/game/g_roff.cpp   |   38 +-
 codeJK2/game/g_savegame.cpp   |  212 +++--
 codeJK2/game/g_shared.h   |  868 +-
 codeJK2/game/ghoul2_shared.h  |8 +-
 codeJK2/icarus/Instance.cpp   |   97 +-
 codeJK2/icarus/Sequence.cpp   |  132 ++-
 codeJK2/icarus/Sequencer.cpp  |   84 +-
 codeJK2/icarus/TaskManager.cpp|  211 -
 codeJK2/icarus/interface.h|3 +-
 

[openjk] 102/130: MP: Make the shared common files appear in the visual studio projects for multiplayer client and dedicated server.

[Simon McVittie]

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

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

commit abd4b5263a4dc404057ab00afcdd991f188828bc
Author: Ensiform 
Date:   Sun Oct 2 22:14:16 2016 -0500

MP: Make the shared common files appear in the visual studio projects
for multiplayer client and dedicated server.
---
 codemp/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt
index df471fa..2bd4aa4 100644
--- a/codemp/CMakeLists.txt
+++ b/codemp/CMakeLists.txt
@@ -255,6 +255,8 @@ if(BuildMPEngine OR BuildMPDed)
"${MPDir}/qcommon/timing.h"
"${MPDir}/qcommon/vm.cpp"
"${MPDir}/qcommon/z_memman_pc.cpp"
+
+   ${SharedCommonFiles}
)
if(WIN32)
set(MPEngineAndDedCommonFiles ${MPEngineAndDedCommonFiles})

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 106/130: Merge pull request #878 from bibendovsky/fix/saved_game_compiling_errors

[Simon McVittie]

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

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

commit bb0b2f0a541117aba77fc7b59ee51defda99a5b6
Merge: b40ab00 0a268e7
Author: Alex Lo 
Date:   Tue Oct 11 08:03:09 2016 +0100

Merge pull request #878 from bibendovsky/fix/saved_game_compiling_errors

PR 848 fix

 code/game/G_Timer.cpp|  4 ++--
 code/game/Q3_Interface.cpp   | 10 +-
 code/game/g_roff.cpp |  4 ++--
 code/game/g_savegame.cpp |  4 ++--
 code/game/g_vehicles.h   |  4 ++--
 code/icarus/IcarusImplementation.cpp |  2 +-
 code/qcommon/ojk_saved_game.cpp  |  2 +-
 code/qcommon/ojk_saved_game_helper.h |  2 --
 code/qcommon/ojk_saved_game_helper_fwd.h |  4 ++--
 code/rd-vanilla/G2_misc.cpp  |  5 +
 code/server/sv_savegame.cpp  |  8 
 codeJK2/game/G_Timer.cpp |  4 ++--
 codeJK2/game/Q3_Registers.cpp| 10 +-
 codeJK2/game/g_roff.cpp  |  2 +-
 codeJK2/game/g_savegame.cpp  |  4 ++--
 codeJK2/icarus/Instance.cpp  | 10 +-
 codeJK2/icarus/Sequence.cpp  | 14 ++
 codeJK2/icarus/Sequencer.cpp |  4 ++--
 codeJK2/icarus/TaskManager.cpp   | 14 +++---
 shared/sys/sys_win32.cpp |  2 +-
 20 files changed, 61 insertions(+), 52 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 98/130: Merge pull request #873 from smcv/unused-buffer-to-hex

[Simon McVittie]

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

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

commit 2470310d5abcf2d6fe7548741d2ad2f3f41ce5a5
Merge: 04a7a2c dfd7413
Author: Alex Lo 
Date:   Sun Sep 25 17:58:28 2016 +0100

Merge pull request #873 from smcv/unused-buffer-to-hex

Suppress compiler warning for unused BufferToHexString

 codemp/server/sv_challenge.cpp | 2 ++
 1 file changed, 2 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 101/130: Shared: Move vector2D functions into q_math to avoid redundancy.

[Simon McVittie]

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

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

commit ffa7ab7825ed1c841a536f9d5e06cfe71381aa02
Author: Ensiform 
Date:   Sat Oct 1 22:52:28 2016 -0500

Shared: Move vector2D functions into q_math to avoid redundancy.
---
 code/cgame/FxPrimitives.cpp|  2 +-
 code/cgame/FxSystem.h  | 20 --
 code/cgame/FxUtil.cpp  |  2 +-
 code/cgame/cg_effects.cpp  |  8 +++
 code/cgame/cg_players.cpp  |  8 +++
 code/rd-vanilla/tr_surface.cpp | 32 +---
 codeJK2/cgame/FxPrimitives.cpp |  2 +-
 codeJK2/cgame/FxSystem.h   | 20 --
 codeJK2/cgame/FxUtil.cpp   |  2 +-
 codeJK2/cgame/cg_effects.cpp   |  8 +++
 codeJK2/cgame/cg_players.cpp   |  8 +++
 codemp/cgame/cg_effects.c  | 14 
 codemp/client/FxPrimitives.cpp |  2 +-
 codemp/client/FxScheduler.cpp  |  2 +-
 codemp/client/FxSystem.cpp |  2 +-
 codemp/client/FxSystem.h   | 32 +---
 codemp/client/FxUtil.cpp   |  2 +-
 shared/qcommon/q_math.c| 48 ++
 shared/qcommon/q_math.h| 25 ++
 19 files changed, 112 insertions(+), 127 deletions(-)

diff --git a/code/cgame/FxPrimitives.cpp b/code/cgame/FxPrimitives.cpp
index f902da0..74dc874 100644
--- a/code/cgame/FxPrimitives.cpp
+++ b/code/cgame/FxPrimitives.cpp
@@ -1893,7 +1893,7 @@ void CPoly::Draw()
verts[i].modulate[k] = mRefEnt.shaderRGBA[k];
 
// Copy the ST coords
-   Vector2Copy( mST[i], verts[i].st );
+   VectorCopy2( mST[i], verts[i].st );
}
 
// Add this poly
diff --git a/code/cgame/FxSystem.h b/code/cgame/FxSystem.h
index 0b65d72..3a81749 100644
--- a/code/cgame/FxSystem.h
+++ b/code/cgame/FxSystem.h
@@ -36,28 +36,8 @@ along with this program; if not, see 
.
 extern vmCvar_tfx_debug;
 extern vmCvar_tfx_freeze;
 
-inline void Vector2Clear(vec2_t a)
-{
-   a[0] = 0.0f;
-   a[1] = 0.0f;
-}
-
-inline void Vector2Set(vec2_t a,float b,float c)
-{
-   a[0] = b;
-   a[1] = c;
-}
-
-inline void Vector2Copy(vec2_t src,vec2_t dst)
-{
-   dst[0] = src[0];
-   dst[1] = src[1];
-}
-
-
 extern voidCG_CalcEntityLerpPositions( centity_t * );
 
-
 struct SFxHelper
 {
int mTime;
diff --git a/code/cgame/FxUtil.cpp b/code/cgame/FxUtil.cpp
index 8bb9c87..499dad0 100644
--- a/code/cgame/FxUtil.cpp
+++ b/code/cgame/FxUtil.cpp
@@ -1137,7 +1137,7 @@ CPoly *FX_AddPoly( vec3_t *verts, vec2_t *st, int 
numVerts,
for ( int i = 0; i < numVerts; i++ )
{
VectorCopy( verts[i], fx->mOrg[i] );
-   Vector2Copy( st[i], fx->mST[i] );
+   VectorCopy2( st[i], fx->mST[i] );
}
 
fx->SetVel( vel );
diff --git a/code/cgame/cg_effects.cpp b/code/cgame/cg_effects.cpp
index 8c6afc4..bd58dc4 100644
--- a/code/cgame/cg_effects.cpp
+++ b/code/cgame/cg_effects.cpp
@@ -874,7 +874,7 @@ void CG_DoGlass( vec3_t verts[4], vec3_t normal, vec3_t 
dmgPt, vec3_t dmgDir, fl
zz = z;
}
 
-   Vector2Set( biPoints[0], xx, zz );
+   VectorSet2( biPoints[0], xx, zz );
 
if ( t + 1 > 0 && t + 1 < mxWidth )
{
@@ -894,7 +894,7 @@ void CG_DoGlass( vec3_t verts[4], vec3_t normal, vec3_t 
dmgPt, vec3_t dmgDir, fl
zz = z;
}
 
-   Vector2Set( biPoints[1], xx + stepWidth, zz );
+   VectorSet2( biPoints[1], xx + stepWidth, zz );
 
if ( t + 1 > 0 && t + 1 < mxWidth )
{
@@ -914,7 +914,7 @@ void CG_DoGlass( vec3_t verts[4], vec3_t normal, vec3_t 
dmgPt, vec3_t dmgDir, fl
zz = z;
}
 
-   Vector2Set( biPoints[2], xx + stepWidth, zz + 
stepHeight);
+   VectorSet2( biPoints[2], xx + stepWidth, zz + 
stepHeight);
 
if ( t > 0 && t < mxWidth )
{
@@ -934,7 +934,7 @@ void CG_DoGlass( vec3_t verts[4], vec3_t normal, vec3_t 
dmgPt, vec3_t dmgDir, fl
zz = z;
}
 
-   Vector2Set( biPoints[3], xx, zz + stepHeight );
+   VectorSet2( biPoints[3], xx, zz + stepHeight );
 
CG_CalcBiLerp( verts, subVerts, biPoints );
 
diff --git a/code/cgame/cg_players.cpp b/code/cgame/cg_players.cpp
index c0fa06c..fb0b663 100644
--- a/code/cgame/cg_players.cpp
+++ b/code/cgame/cg_players.cpp
@@ -4862,10 +4862,10 @@ void CG_AddRefEntityWithPowerups( refEntity_t 

[openjk] 100/130: MP: Retain localization of no servers with player name found.

[Simon McVittie]

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

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

commit 47403da163017f45a535ae1a0641846fe5ab8f9a
Author: Ensiform 
Date:   Mon Sep 26 14:55:24 2016 -0500

MP: Retain localization of no servers with player name found.
---
 codemp/ui/ui_main.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/codemp/ui/ui_main.c b/codemp/ui/ui_main.c
index 1f17346..40fa5de 100644
--- a/codemp/ui/ui_main.c
+++ b/codemp/ui/ui_main.c
@@ -7827,14 +7827,17 @@ static void UI_BuildFindPlayerList(qboolean force) {
uiInfo.nextFindPlayerRefresh = uiInfo.uiDC.realTime + 25;
}
else {
+   trap->SE_GetStringTextString("MENUS_SERVERS_FOUNDWITH", 
holdSPString, sizeof(holdSPString));
// add a line that shows the number of servers found
if (!uiInfo.numFoundPlayerServers)
{
-   trap->Cvar_Set( "ui_playerServersFound", "no servers 
found" );
+   trap->Cvar_Set( "ui_playerServersFound", va(
holdSPString,
+   
0,
+   
"s",
+   
uiInfo.findPlayerName) );
}
else
{
-   trap->SE_GetStringTextString("MENUS_SERVERS_FOUNDWITH", 
holdSPString, sizeof(holdSPString));
trap->Cvar_Set( "ui_playerServersFound", va(
holdSPString,

uiInfo.numFoundPlayerServers-1,

uiInfo.numFoundPlayerServers == 2 ? "":"s",

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 94/130: Use same mechanism to say "no servers found" as to say how many we found

[Simon McVittie]

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

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

commit dcc12603bd9afa3788ff1559bdc5cdc6ce2e68f4
Author: Simon McVittie 
Date:   Thu Sep 22 08:40:39 2016 +0100

Use same mechanism to say "no servers found" as to say how many we found

This avoids an array underflow: if no servers were found, we would
write to foundPlayerServerNames[-1], which is undefined behaviour, but
with a reasonable assumption of the stack layout is likely to result
in a write to foundPlayerServerAddresses[MAX - 1].
---
 codemp/ui/ui_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codemp/ui/ui_main.c b/codemp/ui/ui_main.c
index 862da52..1f17346 100644
--- a/codemp/ui/ui_main.c
+++ b/codemp/ui/ui_main.c
@@ -7830,7 +7830,7 @@ static void UI_BuildFindPlayerList(qboolean force) {
// add a line that shows the number of servers found
if (!uiInfo.numFoundPlayerServers)
{
-   
Com_sprintf(uiInfo.foundPlayerServerNames[uiInfo.numFoundPlayerServers-1], 
sizeof(uiInfo.foundPlayerServerAddresses[0]), "no servers found");
+   trap->Cvar_Set( "ui_playerServersFound", "no servers 
found" );
}
else
{

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 96/130: Merge pull request #870 from smcv/no-servers-underflow

[Simon McVittie]

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

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

commit b2097da665c2ce0a75cb6dd01d3a650a0909898f
Merge: 6f7dbe3 dcc1260
Author: Alex Lo 
Date:   Sun Sep 25 17:57:33 2016 +0100

Merge pull request #870 from smcv/no-servers-underflow

Use same mechanism to say "no servers found" as to say how many we found

 codemp/ui/ui_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 97/130: Merge pull request #871 from smcv/print-long-int

[Simon McVittie]

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

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

commit 04a7a2caeac07c958eeffd202a3adb4d5e6aa58c
Merge: b2097da 8ea096c
Author: Alex Lo 
Date:   Sun Sep 25 17:58:05 2016 +0100

Merge pull request #871 from smcv/print-long-int

botlib: print long int correctly

 codemp/botlib/l_precomp.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 99/130: Merge pull request #869 from smcv/byteswap-qinline

[Simon McVittie]

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

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

commit 96db877049ad6ebcefd1df5aa68acf91ffd6fb25
Merge: 2470310 37ba2b6
Author: Alex Lo 
Date:   Sun Sep 25 18:04:58 2016 +0100

Merge pull request #869 from smcv/byteswap-qinline

Declare platform-independent byteswapping functions QINLINE

 shared/qcommon/q_platform.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 95/130: Merge pull request #868 from smcv/attemtping

[Simon McVittie]

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

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

commit 6f7dbe3331a2746574f5e26cef4487425d7323f9
Merge: 712627a 55526ff
Author: Alex Lo 
Date:   Sun Sep 25 17:56:46 2016 +0100

Merge pull request #868 from smcv/attemtping

Fix a typo in Siege mode: attemtping -> attempting

 codemp/game/ai_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 87/130: Fix merge

[Simon McVittie]

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

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

commit 66683dd7d2fb3846015086441e2a4153d60d6c39
Author: bibendovsky 
Date:   Tue Aug 30 20:56:08 2016 +0300

Fix merge
---
 code/game/g_savegame.cpp   |  2 +-
 code/server/sv_savegame.cpp| 14 +++---
 shared/qcommon/ojk_saved_game.cpp  |  2 +-
 shared/qcommon/ojk_saved_game_helper.h | 16 
 shared/qcommon/q_math.h| 27 +++
 5 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/code/game/g_savegame.cpp b/code/game/g_savegame.cpp
index c1e0224..24b5d78 100644
--- a/code/game/g_savegame.cpp
+++ b/code/game/g_savegame.cpp
@@ -680,7 +680,7 @@ void saberInfoRetail_t::sg_export(
 {
::WP_SaberSetDefaults(
,
-   false);
+   qfalse);
 
if (!activeBlocking)
{
diff --git a/code/server/sv_savegame.cpp b/code/server/sv_savegame.cpp
index 2fe4cd1..053196d 100644
--- a/code/server/sv_savegame.cpp
+++ b/code/server/sv_savegame.cpp
@@ -907,7 +907,7 @@ static bool SG_ReadScreenshot(
jpeg_data = static_cast(::Z_Malloc(
static_cast(screenshot_length + 4096),
TAG_TEMP_WORKSPACE,
-   false));
+   qfalse));
}
 
//
@@ -984,14 +984,14 @@ qboolean SG_GetSaveImage(
 {
if (!base_name)
{
-   return false;
+   return qfalse;
}
 
ojk::SavedGame& saved_game = ojk::SavedGame::get_instance();
 
if (!saved_game.open(base_name))
{
-   return false;
+   return qfalse;
}
 
bool is_succeed = true;
@@ -1017,7 +1017,7 @@ qboolean SG_GetSaveImage(
 
saved_game.close();
 
-   return is_succeed;
+   return is_succeed ? qtrue : qfalse;
 }
 
 
@@ -1297,7 +1297,7 @@ qboolean SG_ReadSavegame(
::SG_ReadCvars();
 
// read game state
-   const int qbAutosave = ::ReadGame();
+   const qboolean qbAutosave = ::ReadGame();
 
::eSavedGameJustLoaded = (qbAutosave ? eAUTO : eFULL);
 
@@ -1305,7 +1305,7 @@ qboolean SG_ReadSavegame(
::SV_SpawnServer(
sMapCmd,
eForceReload_NOTHING,
-   (::eSavedGameJustLoaded != eFULL));
+   (::eSavedGameJustLoaded != eFULL ? qtrue : qfalse));
 
// read in all the level data...
//
@@ -1328,7 +1328,7 @@ qboolean SG_ReadSavegame(
qbAutosave,
qbLoadTransition);
 
-   return true;
+   return qtrue;
 }
 
 void SG_TestSave(void)
diff --git a/shared/qcommon/ojk_saved_game.cpp 
b/shared/qcommon/ojk_saved_game.cpp
index ae62998..79704a0 100644
--- a/shared/qcommon/ojk_saved_game.cpp
+++ b/shared/qcommon/ojk_saved_game.cpp
@@ -47,7 +47,7 @@ bool SavedGame::open(
static_cast(::FS_FOpenFileRead(
file_path.c_str(),
_handle_,
-   true));
+   qtrue));
 
if (file_handle_ == 0)
{
diff --git a/shared/qcommon/ojk_saved_game_helper.h 
b/shared/qcommon/ojk_saved_game_helper.h
index 00a7997..0cf8426 100644
--- a/shared/qcommon/ojk_saved_game_helper.h
+++ b/shared/qcommon/ojk_saved_game_helper.h
@@ -432,9 +432,8 @@ bool SavedGameHelper::try_read(
int dst_count)
 {
static_assert(
-   (std::is_arithmetic::value &&
-   !std::is_same::value &&
-   !std::is_enum::value) ||
+   std::is_arithmetic::value ||
+   std::is_enum::value ||
std::is_pointer::value ||
std::is_class::value,
"Unsupported types.");
@@ -531,7 +530,8 @@ bool SavedGameHelper::try_read(
CastTag)
 {
using Tag = typename std::conditional<
-   std::is_arithmetic::value,
+   std::is_arithmetic::value ||
+   std::is_enum::value,
NumericTag,
typename std::conditional<
std::is_pointer::value,
@@ -680,9 +680,8 @@ void SavedGameHelper::write(
int src_count)
 {
static_assert(
-   (std::is_arithmetic::value &&
-   !std::is_same::value &&
-   !std::is_enum::value) ||
+   std::is_arithmetic::value ||
+   std::is_enum::value ||
std::is_pointer::value ||
std::is_class::value,
"Unsupported types.");
@@ -753,7 +752,8 @@ void SavedGameHelper::write(
CastTag)
 {
using Tag = typename std::conditional<
-   std::is_arithmetic::value,
+   std::is_arithmetic::value ||
+   std::is_enum::value,

[openjk] 84/130: SG: Increase renderer API version

[Simon McVittie]

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

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

commit f60b8e928930f13105c36081ec6e05b49b9deab0
Author: bibendovsky 
Date:   Mon Aug 29 20:54:12 2016 +0300

SG: Increase renderer API version
---
 code/rd-common/tr_public.h | 2 +-
 codeJK2/game/g_public.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/rd-common/tr_public.h b/code/rd-common/tr_public.h
index a978d7d..a1553f4 100644
--- a/code/rd-common/tr_public.h
+++ b/code/rd-common/tr_public.h
@@ -30,7 +30,7 @@ along with this program; if not, see 
.
 #include "../ghoul2/G2.h"
 #include "../ghoul2/ghoul2_gore.h"
 
-#defineREF_API_VERSION 16
+#defineREF_API_VERSION 17
 
 typedef struct {
void(QDECL *Printf) 
( int printLevel, const char *fmt, ...) __attribute__ ((format 
(printf, 2, 3)));
diff --git a/codeJK2/game/g_public.h b/codeJK2/game/g_public.h
index b4384b6..e9660e6 100644
--- a/codeJK2/game/g_public.h
+++ b/codeJK2/game/g_public.h
@@ -25,7 +25,7 @@ along with this program; if not, see 
.
 #define __G_PUBLIC_H__
 // g_public.h -- game module information visible to server
 
-#defineGAME_API_VERSION10  // 
Bumped up to 8, since we support JA's engine now --eez
+#defineGAME_API_VERSION10
 
 // entity->svFlags
 // the server does not know how to interpret most of the values

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 83/130: SG: Remove renderer header in CMake script

[Simon McVittie]

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

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

commit d500e0912e77be468d07f9e85df16acc7746ff34
Author: bibendovsky 
Date:   Mon Aug 29 20:47:06 2016 +0300

SG: Remove renderer header in CMake script
---
 code/game/CMakeLists.txt| 1 -
 codeJK2/game/CMakeLists.txt | 1 -
 2 files changed, 2 deletions(-)

diff --git a/code/game/CMakeLists.txt b/code/game/CMakeLists.txt
index 8000d20..989e462 100644
--- a/code/game/CMakeLists.txt
+++ b/code/game/CMakeLists.txt
@@ -260,7 +260,6 @@ set(SPGameCommonFiles
"${SPDir}/qcommon/q_math.cpp"
"${SPDir}/qcommon/q_shared.cpp"
"${SPDir}/qcommon/q_shared.h"
-   "${SPDir}/rd-common/mdx_format.h"
"${SharedDir}/qcommon/ojk_i_saved_game.h"
"${SharedDir}/qcommon/ojk_saved_game_helper.h"
"${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
diff --git a/codeJK2/game/CMakeLists.txt b/codeJK2/game/CMakeLists.txt
index c56ca0f..e610d7e 100644
--- a/codeJK2/game/CMakeLists.txt
+++ b/codeJK2/game/CMakeLists.txt
@@ -232,7 +232,6 @@ set(JK2SPGameCommonFiles
"${SPDir}/qcommon/q_shared.cpp"
"${SPDir}/qcommon/q_shared.h"
"${SPDir}/qcommon/strippublic.h"
-   "${SPDir}/rd-common/mdx_format.h"
"${SharedDir}/qcommon/ojk_i_saved_game.h"
"${SharedDir}/qcommon/ojk_saved_game_helper.h"
"${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 90/130: Suppress compiler warning for unused BufferToHexString

[Simon McVittie]

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

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

commit dfd7413b7e7613adcea63b0cd3b908e4418d8551
Author: Simon McVittie 
Date:   Thu Sep 22 08:43:34 2016 +0100

Suppress compiler warning for unused BufferToHexString

This function is only called when debugging challenges.
---
 codemp/server/sv_challenge.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/codemp/server/sv_challenge.cpp b/codemp/server/sv_challenge.cpp
index 3bca98b..1331af8 100644
--- a/codemp/server/sv_challenge.cpp
+++ b/codemp/server/sv_challenge.cpp
@@ -30,6 +30,7 @@ static const size_t SECRET_KEY_LENGTH = MD5_DIGEST_SIZE; // 
Key length equal to
 static qboolean challengerInitialized = qfalse;
 static hmacMD5Context_t challenger;
 
+#ifdef DEBUG_SV_CHALLENGE
 /*
 
 BufferToHexString
@@ -52,6 +53,7 @@ static const char *BufferToHexString(byte *buffer, size_t 
bufferLen)
hexString[bufferLen * 2] = '\0';
return hexString;
 }
+#endif
 
 /*
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 85/130: SG: Uncomment ragdoll code

[Simon McVittie]

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

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

commit d490600467755b56bf8a91d22daa1fd0449f7192
Author: bibendovsky 
Date:   Mon Aug 29 21:46:51 2016 +0300

SG: Uncomment ragdoll code
---
 code/rd-vanilla/G2_API.cpp | 84 --
 1 file changed, 84 deletions(-)

diff --git a/code/rd-vanilla/G2_API.cpp b/code/rd-vanilla/G2_API.cpp
index 5e4a63b..f6ae767 100644
--- a/code/rd-vanilla/G2_API.cpp
+++ b/code/rd-vanilla/G2_API.cpp
@@ -41,11 +41,9 @@ along with this program; if not, see 
.
#endif
 #endif
 
-#ifndef JK2_MODE
 //rww - RAGDOLL_BEGIN
 #include "../ghoul2/ghoul2_gore.h"
 //rww - RAGDOLL_END
-#endif // !JK2_MODE
 
 extern mdxaBone_t  worldMatrix;
 extern mdxaBone_t  worldMatrixInv;
@@ -974,12 +972,10 @@ qboolean G2API_RemoveGhoul2Model(CGhoul2Info_v , 
const int modelIndex)
return qtrue;
 }
 
-#ifndef JK2_MODE
 //rww - RAGDOLL_BEGIN
 #defineGHOUL2_RAG_STARTED  
0x0010
 #defineGHOUL2_RAG_FORCESOLVE   
0x1000  //api-override, determine if ragdoll should be forced to 
continue solving even if it thinks it is settled
 //rww - RAGDOLL_END
-#endif // !JK2_MODE
 
 int G2API_GetAnimIndex(CGhoul2Info *ghlInfo)
 {
@@ -1022,14 +1018,12 @@ qboolean G2API_SetAnimIndex(CGhoul2Info *ghlInfo, const 
int index)
 
 qboolean G2API_SetBoneAnimIndex(CGhoul2Info *ghlInfo, const int index, const 
int startFrame, const int endFrame, const int flags, const float animSpeed, 
const int AcurrentTime, const float setFrame, const int blendTime)
 {
-#ifndef JK2_MODE
//rww - RAGDOLL_BEGIN
if (ghlInfo && (ghlInfo->mFlags & GHOUL2_RAG_STARTED))
{
return qfalse;
}
//rww - RAGDOLL_END
-#endif // !JK2_MODE
 
qboolean ret=qfalse;
if (G2_SetupModelPointers(ghlInfo))
@@ -1076,14 +1070,12 @@ qboolean G2API_SetBoneAnimIndex(CGhoul2Info *ghlInfo, 
const int index, const int
 
 qboolean G2API_SetBoneAnim(CGhoul2Info *ghlInfo, const char *boneName, const 
int startFrame, const int endFrame, const int flags, const float animSpeed, 
const int AcurrentTime, const float setFrame, const int blendTime)
 {
-#ifndef JK2_MODE
//rww - RAGDOLL_BEGIN
if (ghlInfo && ghlInfo->mFlags & GHOUL2_RAG_STARTED)
{
return qfalse;
}
//rww - RAGDOLL_END
-#endif // !JK2_MODE
 
qboolean ret=qfalse;
G2ERROR(boneName,"NULL boneName");
@@ -1296,14 +1288,12 @@ qboolean G2API_SetBoneAnglesIndex(CGhoul2Info *ghlInfo, 
const int index, const v
 const Eorientations 
yaw, const Eorientations pitch, const Eorientations roll,
 qhandle_t *, int 
blendTime, int AcurrentTime)
 {
-#ifndef JK2_MODE
//rww - RAGDOLL_BEGIN
if (ghlInfo && ghlInfo->mFlags & GHOUL2_RAG_STARTED)
{
return qfalse;
}
//rww - RAGDOLL_END
-#endif // !JK2_MODE
 
qboolean ret=qfalse;
if (G2_SetupModelPointers(ghlInfo))
@@ -1325,14 +1315,12 @@ qboolean G2API_SetBoneAngles(CGhoul2Info *ghlInfo, 
const char *boneName, const v
 const Eorientations 
up, const Eorientations left, const Eorientations forward,
 qhandle_t *, int 
blendTime, int AcurrentTime )
 {
-#ifndef JK2_MODE
//rww - RAGDOLL_BEGIN
if (ghlInfo && ghlInfo->mFlags & GHOUL2_RAG_STARTED)
{
return qfalse;
}
//rww - RAGDOLL_END
-#endif // !JK2_MODE
 
qboolean ret=qfalse;
G2ERROR(boneName,"NULL boneName");
@@ -1437,22 +1425,15 @@ qboolean G2API_RemoveBone(CGhoul2Info *ghlInfo, const 
char *boneName)
return ret;
 }
 
-#ifndef JK2_MODE
 //rww - RAGDOLL_BEGIN
 #ifdef _DEBUG
 extern int ragTraceTime;
 extern int ragSSCount;
 extern int ragTraceCount;
 #endif
-#endif // !JK2_MODE
 
 void G2API_AnimateG2Models(CGhoul2Info_v , int 
AcurrentTime,CRagDollUpdateParams *params)
 {
-#ifdef JK2_MODE
-   static_cast(ghoul2);
-   static_cast(AcurrentTime);
-   static_cast(params);
-#else
int model;
int currentTime=G2API_GetTime(AcurrentTime);
 
@@ -1476,11 +1457,9 @@ void G2API_AnimateG2Models(CGhoul2Info_v , int 
AcurrentTime,CRagDollUpdat
 // assert(ragTraceTime < 15);
//assert(ragTraceCount < 600);
 #endif
-#endif // JK2_MODE
 }
 //rww - RAGDOLL_END
 
-#ifndef JK2_MODE
 int G2_Find_Bone_Rag(CGhoul2Info *ghlInfo, boneInfo_v , const char 
*boneName);
 #define RAG_PCJ(0x1)
 #define RAG_EFFECTOR   (0x00100)
@@ 

[openjk] 88/130: SG: Move cplane_t's archive methods into separate header

[Simon McVittie]

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

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

commit 8f2c8d9ab551ab596c46b246b2f52327a93e9182
Author: bibendovsky 
Date:   Wed Aug 31 21:03:02 2016 +0300

SG: Move cplane_t's archive methods into separate header
---
 code/game/CMakeLists.txt|  1 +
 code/rd-vanilla/CMakeLists.txt  |  1 +
 codeJK2/game/CMakeLists.txt |  1 +
 shared/qcommon/ojk_saved_game_class_archivers.h | 54 ++
 shared/qcommon/ojk_saved_game_helper.h  | 61 +
 shared/qcommon/ojk_saved_game_helper_fwd.h  | 57 +++
 shared/qcommon/q_math.h | 26 ---
 7 files changed, 175 insertions(+), 26 deletions(-)

diff --git a/code/game/CMakeLists.txt b/code/game/CMakeLists.txt
index c54a67f..c86eb42 100644
--- a/code/game/CMakeLists.txt
+++ b/code/game/CMakeLists.txt
@@ -260,6 +260,7 @@ set(SPGameCommonFiles
"${SPDir}/qcommon/q_shared.cpp"
"${SPDir}/qcommon/q_shared.h"
"${SharedDir}/qcommon/ojk_i_saved_game.h"
+   "${SharedDir}/qcommon/ojk_saved_game_class_archivers.h"
"${SharedDir}/qcommon/ojk_saved_game_helper.h"
"${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
"${SharedDir}/qcommon/ojk_scope_guard.h"
diff --git a/code/rd-vanilla/CMakeLists.txt b/code/rd-vanilla/CMakeLists.txt
index 1dc0b57..e25c389 100644
--- a/code/rd-vanilla/CMakeLists.txt
+++ b/code/rd-vanilla/CMakeLists.txt
@@ -78,6 +78,7 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
"${SPDir}/qcommon/q_shared.cpp"
"${SPDir}/qcommon/q_shared.h"
"${SharedDir}/qcommon/ojk_i_saved_game.h"
+   "${SharedDir}/qcommon/ojk_saved_game_class_archivers.h"
"${SharedDir}/qcommon/ojk_saved_game_helper.h"
"${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
"${SharedDir}/qcommon/ojk_scope_guard.h"
diff --git a/codeJK2/game/CMakeLists.txt b/codeJK2/game/CMakeLists.txt
index a757e29..782071a 100644
--- a/codeJK2/game/CMakeLists.txt
+++ b/codeJK2/game/CMakeLists.txt
@@ -232,6 +232,7 @@ set(JK2SPGameCommonFiles
"${SPDir}/qcommon/q_shared.h"
"${SPDir}/qcommon/strippublic.h"
"${SharedDir}/qcommon/ojk_i_saved_game.h"
+   "${SharedDir}/qcommon/ojk_saved_game_class_archivers.h"
"${SharedDir}/qcommon/ojk_saved_game_helper.h"
"${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
"${SharedDir}/qcommon/ojk_scope_guard.h"
diff --git a/shared/qcommon/ojk_saved_game_class_archivers.h 
b/shared/qcommon/ojk_saved_game_class_archivers.h
new file mode 100644
index 000..8f4f8ce
--- /dev/null
+++ b/shared/qcommon/ojk_saved_game_class_archivers.h
@@ -0,0 +1,54 @@
+//
+// Saved game specialized archivers
+//
+
+
+#ifndef OJK_SAVED_GAME_CLASS_ARCHIVERS_INCLUDED
+#define OJK_SAVED_GAME_CLASS_ARCHIVERS_INCLUDED
+
+
+#include "q_math.h"
+#include "ojk_saved_game_helper_fwd.h"
+
+
+namespace ojk
+{
+
+
+template<>
+class SavedGameClassArchiver
+{
+public:
+   static constexpr bool is_implemented()
+   {
+   return true;
+   }
+
+   static void sg_export(
+   SavedGameHelper& saved_game,
+   const cplane_t& instance)
+   {
+   saved_game.write(instance.normal);
+   saved_game.write(instance.dist);
+   saved_game.write(instance.type);
+   saved_game.write(instance.signbits);
+   saved_game.write(instance.pad);
+   }
+
+   static void sg_import(
+   SavedGameHelper& saved_game,
+   cplane_t& instance)
+   {
+   saved_game.read(instance.normal);
+   saved_game.read(instance.dist);
+   saved_game.read(instance.type);
+   saved_game.read(instance.signbits);
+   saved_game.read(instance.pad);
+   }
+};
+
+
+} // ojk
+
+
+#endif // OJK_SAVED_GAME_CLASS_ARCHIVERS_INCLUDED
diff --git a/shared/qcommon/ojk_saved_game_helper.h 
b/shared/qcommon/ojk_saved_game_helper.h
index 0cf8426..bab0227 100644
--- a/shared/qcommon/ojk_saved_game_helper.h
+++ b/shared/qcommon/ojk_saved_game_helper.h
@@ -11,6 +11,7 @@
 #include 
 #include "ojk_saved_game_helper_fwd.h"
 #include "ojk_scope_guard.h"
+#include "ojk_saved_game_class_archivers.h"
 
 
 namespace ojk
@@ -393,12 +394,43 @@ bool SavedGameHelper::try_read(
std::is_same::value,
"Unsupported types.");
 
+   using Tag = typename std::conditional<
+   SavedGameClassArchiver::is_implemented(),
+   ExternalTag,
+   InternalTag
+   >::type;
+
+   return try_read(
+   dst_value,
+   ClassTag(),
+   Tag());
+}
+
+template
+bool SavedGameHelper::try_read(
+   TDst& dst_value,
+   

[openjk] 93/130: Fix a typo in Siege mode: attemtping -> attempting

[Simon McVittie]

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

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

commit 55526ff8b3ec0df46a820d90a0925b40f4407113
Author: Simon McVittie 
Date:   Sun Mar 20 13:47:36 2016 +

Fix a typo in Siege mode: attemtping -> attempting
---
 codemp/game/ai_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codemp/game/ai_main.c b/codemp/game/ai_main.c
index 24910a1..f068349 100644
--- a/codemp/game/ai_main.c
+++ b/codemp/game/ai_main.c
@@ -131,7 +131,7 @@ char *ctfStateDescriptions[] = {
 
 char *siegeStateDescriptions[] = {
"I'm not occupied",
-   "I'm attemtping to complete the current objective",
+   "I'm attempting to complete the current objective",
"I'm preventing the enemy from completing their objective"
 };
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 91/130: botlib: print long int correctly

[Simon McVittie]

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

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

commit 8ea096c529c525db3bd2babe3c1a9cc0e230e58d
Author: Simon McVittie 
Date:   Thu Sep 22 08:32:54 2016 +0100

botlib: print long int correctly

value has type long, or equivalently signed long int. In C,
abs(some_long) returns int (to get a long result you would have to use
labs(some_long) due to lack of overloading), but in C++ it returns long.
---
 codemp/botlib/l_precomp.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codemp/botlib/l_precomp.cpp b/codemp/botlib/l_precomp.cpp
index 9560f97..34c094f 100644
--- a/codemp/botlib/l_precomp.cpp
+++ b/codemp/botlib/l_precomp.cpp
@@ -2510,7 +2510,7 @@ int PC_Directive_eval(source_t *source)
token.whitespace_p = source->scriptstack->script_p;
token.endwhitespace_p = source->scriptstack->script_p;
token.linescrossed = 0;
-   sprintf(token.string, "%d", abs(value));
+   sprintf(token.string, "%ld", abs(value));
token.type = TT_NUMBER;
token.subtype = TT_INTEGER|TT_LONG|TT_DECIMAL;
PC_UnreadSourceToken(source, );
@@ -2615,7 +2615,7 @@ int PC_DollarDirective_evalint(source_t *source)
token.whitespace_p = source->scriptstack->script_p;
token.endwhitespace_p = source->scriptstack->script_p;
token.linescrossed = 0;
-   sprintf(token.string, "%d", abs(value));
+   sprintf(token.string, "%ld", abs(value));
token.type = TT_NUMBER;
token.subtype = TT_INTEGER|TT_LONG|TT_DECIMAL;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 92/130: Declare platform-independent byteswapping functions QINLINE

[Simon McVittie]

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

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

commit 37ba2b6b09f5d594665bb887ce39444a63ae18d1
Author: Simon McVittie 
Date:   Wed Sep 21 12:59:58 2016 +0100

Declare platform-independent byteswapping functions QINLINE

In addition to enabling inlining for these very simple functions,
this suppresses warnings from gcc 6:

…/shared/qcommon/q_platform.h:302:13: warning: 'void CopyShortSwap(void*, 
const void*)' defined but not used [-Wunused-function]
---
 shared/qcommon/q_platform.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared/qcommon/q_platform.h b/shared/qcommon/q_platform.h
index 3ff6e9c..0d60290 100644
--- a/shared/qcommon/q_platform.h
+++ b/shared/qcommon/q_platform.h
@@ -299,17 +299,17 @@ static inline uint32_t LongSwap(uint32_t v)
 }
 #endif
 
-static void CopyShortSwap( void *dest, const void *src )
+static QINLINE void CopyShortSwap( void *dest, const void *src )
 {
 *(uint16_t*)dest = ShortSwap(*(uint16_t*)src);
 }
 
-static void CopyLongSwap( void *dest, const void *src )
+static QINLINE void CopyLongSwap( void *dest, const void *src )
 {
 *(uint32_t*)dest = LongSwap(*(uint32_t*)src);
 }
 
-static float FloatSwap(float f)
+static QINLINE float FloatSwap(float f)
 {
 float out;
 CopyLongSwap(, );

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 89/130: SG: Move source code into SP common dir

[Simon McVittie]

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

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

commit 0e3c1e651a5ae00c0ff06f54119d4c20d49ffbcc
Author: bibendovsky 
Date:   Thu Sep 1 11:12:52 2016 +0300

SG: Move source code into SP common dir
---
 code/CMakeLists.txt   | 12 ++--
 code/game/CMakeLists.txt  | 10 +-
 {shared => code}/qcommon/ojk_i_saved_game.h   |  0
 {shared => code}/qcommon/ojk_saved_game.cpp   |  0
 {shared => code}/qcommon/ojk_saved_game.h |  0
 {shared => code}/qcommon/ojk_saved_game_class_archivers.h |  2 +-
 {shared => code}/qcommon/ojk_saved_game_helper.h  |  0
 {shared => code}/qcommon/ojk_saved_game_helper_fwd.h  |  0
 {shared => code}/qcommon/ojk_scope_guard.h|  0
 code/qcommon/q_shared.h   |  2 +-
 code/rd-vanilla/CMakeLists.txt| 10 +-
 codeJK2/cgame/cg_main.cpp |  2 +-
 codeJK2/game/CMakeLists.txt   | 10 +-
 codeJK2/game/G_Timer.cpp  |  2 +-
 codeJK2/game/Q3_Registers.cpp |  2 +-
 codeJK2/game/g_main.cpp   |  2 +-
 codeJK2/game/g_objectives.cpp |  2 +-
 codeJK2/game/g_roff.cpp   |  2 +-
 codeJK2/game/g_savegame.cpp   |  2 +-
 codeJK2/icarus/Instance.cpp   |  2 +-
 codeJK2/icarus/Sequence.cpp   |  2 +-
 codeJK2/icarus/Sequencer.cpp  |  2 +-
 codeJK2/icarus/TaskManager.cpp|  2 +-
 23 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index b3d3339..34525c4 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -173,12 +173,12 @@ if(BuildSPEngine OR BuildJK2SPEngine)
"${SPDir}/qcommon/timing.h"
"${SPDir}/qcommon/MiniHeap.h"
 
-   "${SharedDir}/qcommon/ojk_i_saved_game.h"
-   "${SharedDir}/qcommon/ojk_saved_game.h"
-   "${SharedDir}/qcommon/ojk_saved_game.cpp"
-   "${SharedDir}/qcommon/ojk_saved_game_helper.h"
-   "${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
-   "${SharedDir}/qcommon/ojk_scope_guard.h"
+   "${SPDir}/qcommon/ojk_i_saved_game.h"
+   "${SPDir}/qcommon/ojk_saved_game.h"
+   "${SPDir}/qcommon/ojk_saved_game.cpp"
+   "${SPDir}/qcommon/ojk_saved_game_helper.h"
+   "${SPDir}/qcommon/ojk_saved_game_helper_fwd.h"
+   "${SPDir}/qcommon/ojk_scope_guard.h"
 
${SharedCommonFiles}
)
diff --git a/code/game/CMakeLists.txt b/code/game/CMakeLists.txt
index c86eb42..4c0a81c 100644
--- a/code/game/CMakeLists.txt
+++ b/code/game/CMakeLists.txt
@@ -259,11 +259,11 @@ set(SPGameCommonFiles
"${SPDir}/qcommon/timing.h"
"${SPDir}/qcommon/q_shared.cpp"
"${SPDir}/qcommon/q_shared.h"
-   "${SharedDir}/qcommon/ojk_i_saved_game.h"
-   "${SharedDir}/qcommon/ojk_saved_game_class_archivers.h"
-   "${SharedDir}/qcommon/ojk_saved_game_helper.h"
-   "${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
-   "${SharedDir}/qcommon/ojk_scope_guard.h"
+   "${SPDir}/qcommon/ojk_i_saved_game.h"
+   "${SPDir}/qcommon/ojk_saved_game_class_archivers.h"
+   "${SPDir}/qcommon/ojk_saved_game_helper.h"
+   "${SPDir}/qcommon/ojk_saved_game_helper_fwd.h"
+   "${SPDir}/qcommon/ojk_scope_guard.h"
${SharedCommonFiles}
)
 source_group("common" FILES ${SPGameCommonFiles})
diff --git a/shared/qcommon/ojk_i_saved_game.h b/code/qcommon/ojk_i_saved_game.h
similarity index 100%
rename from shared/qcommon/ojk_i_saved_game.h
rename to code/qcommon/ojk_i_saved_game.h
diff --git a/shared/qcommon/ojk_saved_game.cpp b/code/qcommon/ojk_saved_game.cpp
similarity index 100%
rename from shared/qcommon/ojk_saved_game.cpp
rename to code/qcommon/ojk_saved_game.cpp
diff --git a/shared/qcommon/ojk_saved_game.h b/code/qcommon/ojk_saved_game.h
similarity index 100%
rename from shared/qcommon/ojk_saved_game.h
rename to code/qcommon/ojk_saved_game.h
diff --git a/shared/qcommon/ojk_saved_game_class_archivers.h 
b/code/qcommon/ojk_saved_game_class_archivers.h
similarity index 97%
rename from shared/qcommon/ojk_saved_game_class_archivers.h
rename to code/qcommon/ojk_saved_game_class_archivers.h
index 8f4f8ce..70a5da9 100644
--- a/shared/qcommon/ojk_saved_game_class_archivers.h
+++ b/code/qcommon/ojk_saved_game_class_archivers.h
@@ -7,7 +7,7 @@
 #define OJK_SAVED_GAME_CLASS_ARCHIVERS_INCLUDED
 
 
-#include "q_math.h"
+#include "qcommon/q_math.h"
 #include 

[openjk] 86/130: Merge in the latest master

[Simon McVittie]

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

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

commit 1cb254e926cfa093ab2ca08cf6d64159916bd112
Merge: d490600 dfd512e
Author: bibendovsky 
Date:   Tue Aug 30 19:58:27 2016 +0300

Merge in the latest master

 CMakeLists.txt  |6 +
 CreateVisualStudio2010Projects.bat  |   18 -
 CreateVisualStudio2012Projects.bat  |   18 -
 code/CMakeLists.txt |1 -
 code/cgame/FxPrimitives.cpp |   22 +-
 code/cgame/FxScheduler.cpp  |   16 +-
 code/cgame/cg_camera.cpp|   16 +-
 code/cgame/cg_credits.cpp   |8 +-
 code/cgame/cg_draw.cpp  |   16 +-
 code/cgame/cg_effects.cpp   |   58 +-
 code/cgame/cg_ents.cpp  |4 +-
 code/cgame/cg_main.cpp  |2 +-
 code/cgame/cg_players.cpp   |   87 +-
 code/cgame/cg_predict.cpp   |4 +-
 code/cgame/cg_syscalls.cpp  |   14 +-
 code/cgame/cg_text.cpp  |4 +-
 code/cgame/cg_view.cpp  |   11 +-
 code/cgame/cg_weapons.cpp   |   12 +-
 code/client/cl_cgame.cpp|   10 +-
 code/client/cl_cin.cpp  |   22 +-
 code/client/cl_keys.cpp |   12 +-
 code/client/cl_mp3.cpp  |6 +-
 code/client/cl_mp3.h|2 +-
 code/client/cl_ui.cpp   |2 +-
 code/client/snd_dma.cpp |   36 +-
 code/client/snd_mem.cpp |6 +-
 code/client/snd_music.cpp   |   20 +-
 code/game/AI_BobaFett.cpp   |8 +-
 code/game/AI_Default.cpp|   17 +-
 code/game/AI_Droid.cpp  |6 +-
 code/game/AI_GalakMech.cpp  |2 +-
 code/game/AI_HazardTrooper.cpp  |4 +-
 code/game/AI_Howler.cpp |4 +-
 code/game/AI_ImperialProbe.cpp  |4 +-
 code/game/AI_Interrogator.cpp   |2 +-
 code/game/AI_Jedi.cpp   |4 +-
 code/game/AI_MineMonster.cpp|   12 +-
 code/game/AI_Rancor.cpp |8 +-
 code/game/AI_Remote.cpp |2 +-
 code/game/AI_RocketTrooper.cpp  |   10 +-
 code/game/AI_Seeker.cpp |   14 +-
 code/game/AI_Sentry.cpp |2 +-
 code/game/AI_Stormtrooper.cpp   |6 +-
 code/game/AI_Tusken.cpp |8 +-
 code/game/AI_Utils.cpp  |2 +-
 code/game/AI_Wampa.cpp  |   10 +-
 code/game/CMakeLists.txt|1 -
 code/game/FighterNPC.cpp|6 +-
 code/game/G_Timer.cpp   |4 +-
 code/game/NPC_behavior.cpp  |   10 +-
 code/game/NPC_combat.cpp|   10 +-
 code/game/NPC_goal.cpp  |2 +-
 code/game/NPC_move.cpp  |4 +-
 code/game/NPC_reactions.cpp |6 +-
 code/game/NPC_senses.cpp|6 +-
 code/game/NPC_spawn.cpp |2 +-
 code/game/NPC_stats.cpp |   38 +-
 code/game/NPC_utils.cpp |4 +-
 code/game/Q3_Interface.cpp  |   30 +-
 code/game/b_local.h |4 +-
 code/game/bg_panimate.cpp   |4 +-
 code/game/bg_pmove.cpp  |2 +-
 code/game/bg_slidemove.cpp  |2 +-
 code/game/g_active.cpp  |   10 +-
 code/game/g_breakable.cpp   |4 +-
 code/game/g_client.cpp  |4 +-
 code/game/g_cmds.cpp|2 +-
 code/game/g_combat.cpp  |   43 +-
 code/game/g_emplaced.cpp|4 +-
 code/game/g_fx.cpp  |2 +-
 code/game/g_inventory.cpp   |2 +-
 code/game/g_items.cpp   |   10 +-
 code/game/g_main.cpp|4 +-
 code/game/g_misc.cpp|6 +-
 code/game/g_misc_model.cpp  |   34 +-
 code/game/g_missile.cpp |6 +-
 code/game/g_mover.cpp   |4 +-
 code/game/g_navigator.cpp   |6 +-
 code/game/g_navnew.cpp  |4 +-
 code/game/g_object.cpp  |2 +-
 code/game/g_roff.cpp|2 +-
 code/game/g_savegame.cpp|4 +-
 code/game/g_session.cpp |2 +-
 code/game/g_svcmds.cpp  |4 +-
 code/game/g_target.cpp  |4 +-
 code/game/g_trigger.cpp |6 +-
 code/game/g_turret.cpp  |   26 +-
 code/game/g_vehicles.cpp|2 +-
 code/game/g_weapon.cpp  |4 +-
 code/game/wp_blaster_pistol.cpp |8 +-
 code/game/wp_blaster_rifle.cpp  |   12 +-
 code/game/wp_bowcaster.cpp  |8 +-
 code/game/wp_concussion.cpp |   10 +-
 code/game/wp_det_pack.cpp   |2 +-
 code/game/wp_flechette.cpp  |   10 +-
 code/game/wp_noghri_stick.cpp   |4 +-
 code/game/wp_repeater.cpp   |8 +-
 code/game/wp_rocket_launcher.cpp|4 +-
 code/game/wp_saber.cpp  |   10 +-
 code/game/wp_saber.h 

[openjk] 81/130: SG: Fix variable name

[Simon McVittie]

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

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

commit 0a70a1022479c841e501ce9e4275fcf0c813fe9e
Author: bibendovsky 
Date:   Mon Aug 29 20:42:06 2016 +0300

SG: Fix variable name
---
 shared/qcommon/ojk_saved_game.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared/qcommon/ojk_saved_game.cpp 
b/shared/qcommon/ojk_saved_game.cpp
index 8215a5e..ae62998 100644
--- a/shared/qcommon/ojk_saved_game.cpp
+++ b/shared/qcommon/ojk_saved_game.cpp
@@ -337,7 +337,7 @@ bool SavedGame::read_chunk(
(is_compressed ? compressed_size : io_buffer_.size());
 
 #ifdef JK2_MODE
-   ref_chunk_size += sizeof(uiLoadedMagic);
+   ref_chunk_size += sizeof(loaded_magic_value);
 #endif
 
if (loaded_chunk_size != ref_chunk_size)
@@ -521,8 +521,8 @@ bool SavedGame::write_chunk(
 
 #ifdef JK2_MODE
saved_chunk_size += ::FS_Write(
-   ,
-   static_cast(sizeof(uiMagic)),
+   _value,
+   static_cast(sizeof(magic_value)),
file_handle_);
 #else
saved_chunk_size += ::FS_Write(

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 71/130: JO: Fix saved game and regular screenshots

[Simon McVittie]

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

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

commit 87b551f97685254b58fb22aadad32810d455bfee
Author: bibendovsky 
Date:   Thu Aug 11 22:14:42 2016 +0300

JO: Fix saved game and regular screenshots
---
 code/rd-common/tr_common.h  |  2 +-
 code/rd-common/tr_image_jpg.cpp | 16 
 code/rd-common/tr_public.h  |  2 +-
 code/server/sv_savegame.cpp |  9 -
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/code/rd-common/tr_common.h b/code/rd-common/tr_common.h
index becdf10..4d70883 100644
--- a/code/rd-common/tr_common.h
+++ b/code/rd-common/tr_common.h
@@ -79,7 +79,7 @@ void LoadJPGFromBuffer( byte *inputBuffer, size_t len, byte 
**pic, int *width, i
 

 */
 // Convert raw image data to JPEG format and store in buffer.
-size_t RE_SaveJPGToBuffer( byte *buffer, size_t bufSize, int quality, int 
image_width, int image_height, byte *image_buffer, int padding );
+size_t RE_SaveJPGToBuffer( byte *buffer, size_t bufSize, int quality, int 
image_width, int image_height, byte *image_buffer, int padding, bool 
flip_vertical );
 
 // Save raw image data as JPEG image file.
 void RE_SaveJPG( const char * filename, int quality, int image_width, int 
image_height, byte *image_buffer, int padding );
diff --git a/code/rd-common/tr_image_jpg.cpp b/code/rd-common/tr_image_jpg.cpp
index 4bc19ed..a3ddb84 100644
--- a/code/rd-common/tr_image_jpg.cpp
+++ b/code/rd-common/tr_image_jpg.cpp
@@ -339,7 +339,7 @@ void LoadJPGFromBuffer( byte *inputBuffer, size_t len, 
unsigned char **pic, int
 * Here the array is only one element long, but you could ask 
for
 * more than one scanline at a time if that's more convenient.
 */
-   buf = ((out+(row_stride*cinfo.output_scanline)));
+   buf = ((out+(row_stride*(cinfo.output_height - 
cinfo.output_scanline - 1;
buffer = 
(void) jpeg_read_scanlines(, buffer, 1);
}
@@ -492,7 +492,7 @@ Expects RGB input data
 =
 */
 size_t RE_SaveJPGToBuffer(byte *buffer, size_t bufSize, int quality,
-   int image_width, int image_height, byte *image_buffer, int padding)
+   int image_width, int image_height, byte *image_buffer, int padding, 
bool flip_vertical)
 {
struct jpeg_compress_struct cinfo;
struct jpeg_error_mgr jerr;
@@ -543,7 +543,15 @@ size_t RE_SaveJPGToBuffer(byte *buffer, size_t bufSize, 
int quality,
* Here the array is only one element long, but you could pass
* more than one scanline at a time if that's more convenient.
*/
-   row_pointer[0] = 
_buffer[((cinfo.image_height-1)*row_stride)-cinfo.next_scanline * 
row_stride];
+
+   int row_index = cinfo.next_scanline;
+
+   if (!flip_vertical)
+   {
+   row_index = cinfo.image_height - cinfo.next_scanline - 
1;
+   }
+
+   row_pointer[0] = _buffer[row_index * row_stride];
(void) jpeg_write_scanlines(, row_pointer, 1);
}
 
@@ -569,7 +577,7 @@ void RE_SaveJPG(const char * filename, int quality, int 
image_width, int image_h
bufSize = image_width * image_height * 3;
out = (byte *) R_Malloc( bufSize, TAG_TEMP_WORKSPACE, qfalse );
 
-   bufSize = RE_SaveJPGToBuffer(out, bufSize, quality, image_width, 
image_height, image_buffer, padding);
+   bufSize = RE_SaveJPGToBuffer(out, bufSize, quality, image_width, 
image_height, image_buffer, padding, false);
ri.FS_WriteFile(filename, out, bufSize);
 
R_Free(out);
diff --git a/code/rd-common/tr_public.h b/code/rd-common/tr_public.h
index 73e96aa..850a68f 100644
--- a/code/rd-common/tr_public.h
+++ b/code/rd-common/tr_public.h
@@ -209,7 +209,7 @@ typedef struct {
void(*GetScreenShot)(byte *data, int w, int h);
 
 #ifdef JK2_MODE
-   size_t  (*SaveJPGToBuffer)(byte *buffer, size_t bufSize, int quality, 
int image_width, int image_height, byte *image_buffer, int padding );
+   size_t  (*SaveJPGToBuffer)(byte *buffer, size_t bufSize, int quality, 
int image_width, int image_height, byte *image_buffer, int padding, bool 
flip_vertical );
void(*LoadJPGFromBuffer)( byte *inputBuffer, size_t len, byte 
**pic, int *width, int *height );
 #endif
 
diff --git a/code/server/sv_savegame.cpp b/code/server/sv_savegame.cpp
index 0711779..d3c4635 100644
--- a/code/server/sv_savegame.cpp
+++ b/code/server/sv_savegame.cpp
@@ -977,7 +977,14 @@ static void SG_WriteScreenshot(qboolean qbAutosave, const 
char *psMapName)
size_t iJPGDataSize = 0;
size_t bufSize = SG_SCR_WIDTH * SG_SCR_HEIGHT * 3;
byte *pJPGData = (byte *)Z_Malloc( static_cast(bufSize), 
TAG_TEMP_WORKSPACE, qfalse, 4 

[openjk] 75/130: Merge with latest master

[Simon McVittie]

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

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

commit 1d4db1ce726a9bb0bfa4e48e7fd5852c0ac3d720
Merge: dd26951 83d3b79
Author: bibendovsky 
Date:   Sat Aug 13 18:35:46 2016 +0300

Merge with latest master

 CMakeLists.txt |   5 +-
 code/cgame/cg_ents.cpp |   2 +
 code/client/cl_input.cpp   |   5 --
 code/client/cl_main.cpp|   2 +-
 code/client/snd_music.cpp  |  33 
 code/game/g_client.cpp |   7 +-
 code/game/genericparser2.h |   1 -
 code/game/wp_melee.cpp |   4 +
 code/qcommon/cm_load.cpp   |  40 +++--
 code/qcommon/cm_local.h|   4 +-
 code/qcommon/common.cpp|   2 +
 code/qcommon/q_shared.cpp  | 123 
 code/qcommon/q_shared.h|  18 -
 code/qcommon/sstring.h |  11 +++
 code/rd-common/tr_public.h |   2 +-
 code/rd-common/tr_types.h  |   2 +
 code/rd-vanilla/tr_backend.cpp |   7 +-
 code/rd-vanilla/tr_shade.cpp   |  17 
 code/ui/ui_main.cpp|   8 +-
 code/ui/ui_shared.cpp  |   5 +-
 code/ui/ui_shared.h|   7 +-
 codemp/CMakeLists.txt  |   2 +
 codemp/botlib/l_memory.cpp |  11 +--
 codemp/cgame/cg_draw.c |   4 +-
 codemp/client/cl_main.cpp  |   2 +-
 codemp/game/bg_panimate.c  |   5 --
 codemp/game/g_cmds.c   |  16 
 codemp/qcommon/common.cpp  |   2 +
 codemp/qcommon/files.cpp   |  81 +--
 codemp/qcommon/md5.cpp | 136 ---
 codemp/qcommon/md5.h   |  54 +
 codemp/qcommon/net_ip.cpp  |  82 +--
 codemp/qcommon/q_shared.c  | 151 --
 codemp/qcommon/q_shared.h  |  19 -
 codemp/qcommon/vm.cpp  |   2 -
 codemp/server/server.h |  31 ++-
 codemp/server/sv_challenge.cpp | 180 +
 codemp/server/sv_client.cpp| 123 +++-
 codemp/server/sv_init.cpp  |   2 +
 codemp/ui/ui_shared.c  |   9 +--
 codemp/ui/ui_shared.h  |   6 +-
 shared/qcommon/q_platform.h|  88 ++--
 shared/qcommon/safe/files.cpp  |   2 +-
 shared/qcommon/safe/files.h|   4 +-
 shared/qcommon/safe/string.cpp |  14 +++-
 shared/qcommon/safe/string.h   |   3 +
 shared/sdl/sdl_sound.cpp   |   3 +
 shared/sys/sys_main.cpp|   3 -
 shared/sys/sys_public.h|   4 +-
 tests/safe/string.cpp  |   9 +++
 tools/builds/make.bat  |   2 +-
 51 files changed, 641 insertions(+), 714 deletions(-)

diff --cc code/qcommon/q_shared.h
index 80ca063,a7e3899..47c1427
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@@ -156,14 -153,8 +156,10 @@@ along with this program; if not, see http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[openjk] 80/130: SG: Reduce further usage of 'auto' keyword

[Simon McVittie]

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

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

commit aa4a48e0503f509ea76d4af23fab9cc02335fede
Author: bibendovsky 
Date:   Mon Aug 29 20:03:39 2016 +0300

SG: Reduce further usage of 'auto' keyword
---
 code/server/sv_savegame.cpp | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/server/sv_savegame.cpp b/code/server/sv_savegame.cpp
index a92af6f..7901014 100644
--- a/code/server/sv_savegame.cpp
+++ b/code/server/sv_savegame.cpp
@@ -120,7 +120,7 @@ void SG_WipeSavegame(
 //
 void SG_Shutdown()
 {
-   auto& saved_game = ojk::SavedGame::get_instance();
+   ojk::SavedGame& saved_game = ojk::SavedGame::get_instance();
 
saved_game.close();
 
@@ -751,7 +751,7 @@ int SG_GetSaveGameComment(
 {
int ret = 0;
 
-   auto& saved_game = ojk::SavedGame::get_instance();
+   ojk::SavedGame& saved_game = ojk::SavedGame::get_instance();
 
ojk::SavedGameHelper sgh(
::SavedGame::get_instance());
@@ -987,7 +987,7 @@ qboolean SG_GetSaveImage(
return false;
}
 
-   auto& saved_game = ojk::SavedGame::get_instance();
+   ojk::SavedGame& saved_game = ojk::SavedGame::get_instance();
 
if (!saved_game.open(base_name))
{
@@ -1149,7 +1149,7 @@ qboolean SG_WriteSavegame(const char *psPathlessBaseName, 
qboolean qbAutosave)
SG_StoreSaveGameComment(va("--> %s <--",psMapName));
}
 
-   auto& saved_game = ojk::SavedGame::get_instance();
+   ojk::SavedGame& saved_game = ojk::SavedGame::get_instance();
 
if(!saved_game.create( "current" ))
{
@@ -1228,7 +1228,7 @@ qboolean SG_ReadSavegame(
"0");
 #endif
 
-   auto& saved_game = ojk::SavedGame::get_instance();
+   ojk::SavedGame& saved_game = ojk::SavedGame::get_instance();
 
ojk::SavedGameHelper sgh(
_game);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 60/130: JO: Disable GHOUL2 gore and ragdoll

[Simon McVittie]

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

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

commit b48f21e28523b5a733fe53c99c99e2b18f7a13e9
Author: bibendovsky 
Date:   Sun Jul 31 14:07:06 2016 +0300

JO: Disable GHOUL2 gore and ragdoll
---
 code/game/G_Timer.cpp |  11 +-
 code/game/ghoul2_shared.h |  16 +++
 code/icarus/IcarusImplementation.cpp  |  27 ++--
 code/qcommon/q_shared.h   |  10 ++
 code/rd-vanilla/G2_API.cpp|  97 ++-
 code/rd-vanilla/G2_bones.cpp  |   9 +-
 code/rd-vanilla/G2_misc.cpp   | 225 +++---
 code/rd-vanilla/tr_ghoul2.cpp |  59 -
 code/server/sv_savegame.cpp   |  17 ++-
 code/server/sv_snapshot.cpp   |   2 +
 codeJK2/game/g_savegame.cpp   |   6 +
 shared/qcommon/ojk_i_saved_game.h |  21 
 shared/qcommon/ojk_i_saved_game_fwd.h |  22 +++-
 shared/qcommon/ojk_saved_game.cpp |  23 +++-
 shared/qcommon/ojk_saved_game.h   |  24 +++-
 15 files changed, 327 insertions(+), 242 deletions(-)

diff --git a/code/game/G_Timer.cpp b/code/game/G_Timer.cpp
index b835174..e66ae8c 100644
--- a/code/game/G_Timer.cpp
+++ b/code/game/G_Timer.cpp
@@ -234,11 +234,14 @@ void TIMER_Load( void )
 ::gi.saved_game->read_chunk(
 INT_ID('T','M','I','D'));
 
-auto& sg_buffer = ::gi.saved_game->get_buffer();
+auto sg_buffer_data = static_cast(
+::gi.saved_game->get_buffer_data());
 
-std::uninitialized_copy(
-sg_buffer.cbegin(),
-sg_buffer.cend(),
+const auto sg_buffer_size = ::gi.saved_game->get_buffer_size();
+
+std::uninitialized_copy_n(
+sg_buffer_data,
+sg_buffer_size,
 tempBuffer);
 
 ::gi.saved_game->read_chunk(
diff --git a/code/game/ghoul2_shared.h b/code/game/ghoul2_shared.h
index 29e9536..21eb846 100644
--- a/code/game/ghoul2_shared.h
+++ b/code/game/ghoul2_shared.h
@@ -127,6 +127,7 @@ struct  boneInfo_t
int boneBlendStart; // time bone angle blend with 
normal animation began
mdxaBone_t  newMatrix;  // This is the lerped matrix 
that Ghoul2 uses on the client side - does not go across the network
 
+#ifndef JK2_MODE
//rww - RAGDOLL_BEGIN
int lastTimeUpdated;  // if non-zero this is all 
intialized
int lastContents;
@@ -191,6 +192,7 @@ struct  boneInfo_t
 
int airTime; //base is in air, be more quick and 
sensitive about collisions
//rww - RAGDOLL_END
+#endif // !JK2_MODE
 
 boneInfo_t():
boneNumber(-1),
@@ -231,6 +233,8 @@ boneInfo_t():
 saved_game->write(boneBlendTime);
 saved_game->write(boneBlendStart);
 saved_game->write(newMatrix);
+
+#ifndef JK2_MODE
 saved_game->write(lastTimeUpdated);
 saved_game->write(lastContents);
 saved_game->write(lastPosition);
@@ -284,6 +288,7 @@ boneInfo_t():
 saved_game->write<>(animFrameMatrix);
 saved_game->write(hasAnimFrameMatrix);
 saved_game->write(airTime);
+#endif // !JK2_MODE
 }
 
 void sg_import(
@@ -304,6 +309,8 @@ boneInfo_t():
 saved_game->read(boneBlendTime);
 saved_game->read(boneBlendStart);
 saved_game->read(newMatrix);
+
+#ifndef JK2_MODE
 saved_game->read(lastTimeUpdated);
 saved_game->read(lastContents);
 saved_game->read(lastPosition);
@@ -357,6 +364,7 @@ boneInfo_t():
 saved_game->read<>(animFrameMatrix);
 saved_game->read(hasAnimFrameMatrix);
 saved_game->read(airTime);
+#endif // JK2_MODE
 }
 };
 //we save from top to boltUsed here. Don't bother saving the position, it gets 
rebuilt every frame anyway
@@ -511,7 +519,11 @@ public:
 ojk::ISavedGame* saved_game) const
 {
 saved_game->write(mModelindex);
+
+#ifndef JK2_MODE
 saved_game->write(animModelIndexOffset);
+#endif // !JK2_MODE
+
 saved_game->write(mCustomShader);
 saved_game->write(mCustomSkin);
 saved_game->write(mModelBoltLink);
@@ -535,7 +547,11 @@ public:
 ojk::ISavedGame* saved_game)
 {
 saved_game->read(mModelindex);
+
+#ifndef JK2_MODE
 saved_game->read(animModelIndexOffset);
+#endif // !JK2_MODE
+
 saved_game->read(mCustomShader);
 saved_game->read(mCustomSkin);
 saved_game->read(mModelBoltLink);
diff --git a/code/icarus/IcarusImplementation.cpp 
b/code/icarus/IcarusImplementation.cpp
index a93fdc6..e0b1c5b 100644
--- a/code/icarus/IcarusImplementation.cpp
+++ b/code/icarus/IcarusImplementation.cpp
@@ -709,11 +709,14 @@ int CIcarus::Load()
saved_game->read_chunk(
 INT_ID('I','S','E','Q'));
 
-auto& sg_buffer = 

[openjk] 79/130: SG: Revise read_chunk and write_chunk

[Simon McVittie]

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

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

commit 30125a5c2c35b51de083da419650d708befdbed7
Author: bibendovsky 
Date:   Mon Aug 29 19:45:54 2016 +0300

SG: Revise read_chunk and write_chunk
---
 shared/qcommon/ojk_saved_game.cpp | 224 +++---
 1 file changed, 112 insertions(+), 112 deletions(-)

diff --git a/shared/qcommon/ojk_saved_game.cpp 
b/shared/qcommon/ojk_saved_game.cpp
index 9b3fda2..8215a5e 100644
--- a/shared/qcommon/ojk_saved_game.cpp
+++ b/shared/qcommon/ojk_saved_game.cpp
@@ -199,34 +199,34 @@ bool SavedGame::read_chunk(
"Attempting read of chunk %s\n",
chunk_id_string.c_str());
 
-   uint32_t ulLoadedChid = 0;
-   uint32_t uiLoadedLength = 0;
+   uint32_t loaded_chunk_id = 0;
+   uint32_t loaded_data_size = 0;
 
-   int uiLoaded = ::FS_Read(
-   ,
-   static_cast(sizeof(ulLoadedChid)),
+   int loaded_chunk_size = ::FS_Read(
+   _chunk_id,
+   static_cast(sizeof(loaded_chunk_id)),
file_handle_);
 
-   uiLoaded += ::FS_Read(
-   ,
-   static_cast(sizeof(uiLoadedLength)),
+   loaded_chunk_size += ::FS_Read(
+   _data_size,
+   static_cast(sizeof(loaded_data_size)),
file_handle_);
 
-   const bool bBlockIsCompressed = (static_cast(uiLoadedLength) < 
0);
+   const bool is_compressed = (static_cast(loaded_data_size) < 0);
 
-   if (bBlockIsCompressed)
+   if (is_compressed)
{
-   uiLoadedLength = -static_cast(uiLoadedLength);
+   loaded_data_size = -static_cast(loaded_data_size);
}
 
// Make sure we are loading the correct chunk...
//
-   if (ulLoadedChid != chunk_id)
+   if (loaded_chunk_id != chunk_id)
{
is_failed_ = true;
 
const std::string loaded_chunk_id_string = get_chunk_id_string(
-   ulLoadedChid);
+   loaded_chunk_id);
 
error_message_ =
"Loaded chunk ID (" +
@@ -238,38 +238,38 @@ bool SavedGame::read_chunk(
return false;
}
 
-   uint32_t uiLoadedCksum = 0;
+   uint32_t loaded_checksum = 0;
 
 #ifdef JK2_MODE
// Get checksum...
//
-   uiLoaded += ::FS_Read(
-   ,
-   static_cast(sizeof(uiLoadedCksum)),
+   loaded_chunk_size += ::FS_Read(
+   _checksum,
+   static_cast(sizeof(loaded_checksum)),
file_handle_);
 #endif // JK2_MODE
 
// Load in data and magic number...
//
-   uint32_t uiCompressedLength = 0;
+   uint32_t compressed_size = 0;
 
-   if (bBlockIsCompressed)
+   if (is_compressed)
{
-   uiLoaded += ::FS_Read(
-   ,
-   static_cast(sizeof(uiCompressedLength)),
+   loaded_chunk_size += ::FS_Read(
+   _size,
+   static_cast(sizeof(compressed_size)),
file_handle_);
 
rle_buffer_.resize(
-   uiCompressedLength);
+   compressed_size);
 
-   uiLoaded += ::FS_Read(
+   loaded_chunk_size += ::FS_Read(
rle_buffer_.data(),
-   uiCompressedLength,
+   compressed_size,
file_handle_);
 
io_buffer_.resize(
-   uiLoadedLength);
+   loaded_data_size);
 
decompress(
rle_buffer_,
@@ -278,23 +278,23 @@ bool SavedGame::read_chunk(
else
{
io_buffer_.resize(
-   uiLoadedLength);
+   loaded_data_size);
 
-   uiLoaded += ::FS_Read(
+   loaded_chunk_size += ::FS_Read(
io_buffer_.data(),
-   uiLoadedLength,
+   loaded_data_size,
file_handle_);
}
 
 #ifdef JK2_MODE
-   uint32_t uiLoadedMagic = 0;
+   uint32_t loaded_magic_value = 0;
 
-   uiLoaded += ::FS_Read(
-   ,
-   static_cast(sizeof(uiLoadedMagic)),
+   loaded_chunk_size += ::FS_Read(
+   _magic_value,
+   static_cast(sizeof(loaded_magic_value)),
file_handle_);
 
-   if (uiLoadedMagic != get_jo_magic_value())
+   if (loaded_magic_value != get_jo_magic_value())
{
is_failed_ = true;
 
@@ -303,24 +303,22 @@ bool SavedGame::read_chunk(
 
return false;
}
-#endif // JK2_MODE
-
-#ifndef JK2_MODE
+#else
// Get checksum...
//
-   uiLoaded 

[openjk] 72/130: Revise sv_savegame

[Simon McVittie]

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

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

commit 3f439ad17e415d20b1a8c7dca353c7654f7a5ddd
Author: bibendovsky 
Date:   Fri Aug 12 21:32:36 2016 +0300

Revise sv_savegame
---
 code/server/sv_savegame.cpp| 188 +
 shared/qcommon/ojk_saved_game_helper.h |   7 ++
 shared/qcommon/ojk_saved_game_helper_fwd.h |   5 +
 3 files changed, 151 insertions(+), 49 deletions(-)

diff --git a/code/server/sv_savegame.cpp b/code/server/sv_savegame.cpp
index d3c4635..8dcedcd 100644
--- a/code/server/sv_savegame.cpp
+++ b/code/server/sv_savegame.cpp
@@ -58,7 +58,6 @@ char sLastSaveFileLoaded[MAX_QPATH]={0};
 #endif // JK2_MODE
 
 static char *SG_GetSaveGameMapName(const char *psPathlessBaseName);
-static void CompressMem_FreeScratchBuffer(void);
 
 
 #ifdef SG_PROFILE
@@ -765,11 +764,31 @@ int SG_GetSaveGameComment(
 
bool is_succeed = true;
 
+   // Read description
+   //
is_succeed = sgh.try_read_chunk(
-   INT_ID('C', 'O', 'M', 'M'),
-   sComment,
-   iSG_COMMENT_SIZE);
+   INT_ID('C', 'O', 'M', 'M'));
+
+   if (is_succeed)
+   {
+   if (sComment)
+   {
+   if (sgh.get_buffer_size() == iSG_COMMENT_SIZE)
+   {
+   std::uninitialized_copy_n(
+   static_cast(sgh.get_buffer_data()),
+   iSG_COMMENT_SIZE,
+   sComment);
+   }
+   else
+   {
+   sComment[0] = '\0';
+   }
+   }
+   }
 
+   // Read timestamp
+   //
auto tFileTime = ::SG_GetTime(0);
 
if (is_succeed)
@@ -788,6 +807,9 @@ int SG_GetSaveGameComment(
}
 
 #ifdef JK2_MODE
+   // Read screenshot
+   //
+
if (is_succeed)
{
size_t iScreenShotLength;
@@ -799,17 +821,35 @@ int SG_GetSaveGameComment(
 
if (is_succeed)
{
-   sgh.read_chunk(
+   is_succeed = sgh.try_read_chunk(
INT_ID('S', 'H', 'O', 'T'));
}
 #endif
 
+   // Read mapname
+   //
if (is_succeed)
{
-   sgh.read_chunk(
-   INT_ID('M', 'P', 'C', 'M'),
-   sMapName,
-   iSG_MAPCMD_SIZE);
+   is_succeed = sgh.try_read_chunk(
+   INT_ID('M', 'P', 'C', 'M'));
+
+   if (is_succeed)
+   {
+   if (sMapName)
+   {
+   if (sgh.get_buffer_size() == iSG_MAPCMD_SIZE)
+   {
+   std::uninitialized_copy_n(
+   static_cast(sgh.get_buffer_data()),
+   iSG_MAPCMD_SIZE,
+   sMapName);
+   }
+   else
+   {
+   sMapName[0] = '\0';
+   }
+   }
+   }
}
 
ret = tFileTime;
@@ -840,95 +880,144 @@ static char *SG_GetSaveGameMapName(const char 
*psPathlessBaseName)
 // pass in qtrue to set as loading screen, else pass in pvDest to read it into 
there...
 //
 #ifdef JK2_MODE
-static qboolean SG_ReadScreenshot(qboolean qbSetAsLoadingScreen, void *pvDest 
= NULL);
-static qboolean SG_ReadScreenshot(qboolean qbSetAsLoadingScreen, void *pvDest)
+static bool SG_ReadScreenshot(
+   bool set_as_loading_screen,
+   void* screenshot_ptr)
 {
-   qboolean bReturn = qfalse;
+   bool is_succeed = true;
 
ojk::SavedGameHelper saved_game(
::SavedGame::get_instance());
 
// get JPG screenshot data length...
//
-   size_t iScreenShotLength = 0;
+   size_t screenshot_length = 0;
 
-   saved_game.read_chunk(
+   is_succeed = saved_game.try_read_chunk(
INT_ID('S', 'H', 'L', 'N'),
-   iScreenShotLength);
+   screenshot_length);
 
//
// alloc enough space plus extra 4K for sloppy JPG-decode reader to not 
do memory access violation...
//
-   byte *pJPGData = (byte *) Z_Malloc(static_cast(iScreenShotLength + 
4096),TAG_TEMP_WORKSPACE, qfalse);
+   byte* jpeg_data = nullptr;
+
+   if (is_succeed)
+   {
+   jpeg_data = static_cast(::Z_Malloc(
+   static_cast(screenshot_length + 4096),
+   TAG_TEMP_WORKSPACE,
+   false));
+   }
+
 

[openjk] 69/130: Fix variable name

[Simon McVittie]

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

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

commit 4f47e3d4dfbef6008cb6396d0bc9dcac54cce5d4
Author: bibendovsky 
Date:   Wed Aug 10 21:10:51 2016 +0300

Fix variable name
---
 code/server/sv_savegame.cpp  | 40 
 codeJK2/icarus/Sequencer.cpp |  2 --
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/code/server/sv_savegame.cpp b/code/server/sv_savegame.cpp
index 7372c21..0711779 100644
--- a/code/server/sv_savegame.cpp
+++ b/code/server/sv_savegame.cpp
@@ -754,8 +754,8 @@ int SG_GetSaveGameComment(
 
auto& saved_game = ojk::SavedGame::get_instance();
 
-   ojk::SavedGameHelper saved_game(
-   _game);
+   ojk::SavedGameHelper sgh(
+   ::SavedGame::get_instance());
 
if (!saved_game.open(
psPathlessBaseName))
@@ -765,7 +765,7 @@ int SG_GetSaveGameComment(
 
bool is_succeed = true;
 
-   is_succeed = saved_game.try_read_chunk(
+   is_succeed = sgh.try_read_chunk(
INT_ID('C', 'O', 'M', 'M'),
sComment,
iSG_COMMENT_SIZE);
@@ -776,7 +776,7 @@ int SG_GetSaveGameComment(
{
unsigned int fileTime = 0;
 
-   is_succeed = saved_game.try_read_chunk(
+   is_succeed = sgh.try_read_chunk(
INT_ID('C', 'M', 'T', 'M'),
fileTime);
 
@@ -792,21 +792,21 @@ int SG_GetSaveGameComment(
{
size_t iScreenShotLength;
 
-   is_succeed = saved_game.try_read_chunk(
+   is_succeed = sgh.try_read_chunk(
INT_ID('S', 'H', 'L', 'N'),
iScreenShotLength);
}
 
if (is_succeed)
{
-   saved_game.read_chunk(
+   sgh.read_chunk(
INT_ID('S', 'H', 'O', 'T'));
}
 #endif
 
if (is_succeed)
{
-   saved_game.read_chunk(
+   sgh.read_chunk(
INT_ID('M', 'P', 'C', 'M'),
sMapName,
iSG_MAPCMD_SIZE);
@@ -913,13 +913,13 @@ qboolean SG_GetSaveImage(const char *psPathlessBaseName, 
void *pvAddress)
return qfalse;
}
 
-   ojk::SavedGameHelper saved_game(
+   ojk::SavedGameHelper sgh(
_game);
 
-   saved_game.read_chunk(
+   sgh.read_chunk(
INT_ID('C', 'O', 'M', 'M'));
 
-   saved_game.read_chunk(
+   sgh.read_chunk(
INT_ID('C', 'M', 'T', 'M'));
 
auto bGotSaveImage = SG_ReadScreenshot(
@@ -1064,7 +1064,7 @@ qboolean SG_WriteSavegame(const char *psPathlessBaseName, 
qboolean qbAutosave)
}
 //END JLF
 
-   ojk::SavedGameHelper saved_game(
+   ojk::SavedGameHelper sgh(
_game);
 
char   sMapCmd[iSG_MAPCMD_SIZE]={0};
@@ -1075,7 +1075,7 @@ qboolean SG_WriteSavegame(const char *psPathlessBaseName, 
qboolean qbAutosave)
SG_WriteScreenshot(qbAutosave, sMapCmd);
 #endif
 
-   saved_game.write_chunk(
+   sgh.write_chunk(
INT_ID('M', 'P', 'C', 'M'),
sMapCmd);
 
@@ -1087,11 +1087,11 @@ qboolean SG_WriteSavegame(const char 
*psPathlessBaseName, qboolean qbAutosave)
//
if (!qbAutosave)
{
-   saved_game.write_chunk(
+   sgh.write_chunk(
INT_ID('T', 'I', 'M', 'E'),
::sv.time);
 
-   saved_game.write_chunk(
+   sgh.write_chunk(
INT_ID('T', 'I', 'M', 'R'),
::sv.timeResidual);
 
@@ -1134,7 +1134,7 @@ qboolean SG_ReadSavegame(
 
auto& saved_game = ojk::SavedGame::get_instance();
 
-   ojk::SavedGameHelper saved_game(
+   ojk::SavedGameHelper sgh(
_game);
 
const auto iPrevTestSave = ::sv_testsave->integer;
@@ -1177,7 +1177,7 @@ qboolean SG_ReadSavegame(
 
// Read in all the server data...
//
-   saved_game.read_chunk(
+   sgh.read_chunk(
INT_ID('C', 'O', 'M', 'M'),
sComment);
 
@@ -1185,7 +1185,7 @@ qboolean SG_ReadSavegame(
"Reading: %s\n",
sComment);
 
-   saved_game.read_chunk(
+   sgh.read_chunk(
INT_ID('C', 'M', 'T', 'M'));
 
 #ifdef JK2_MODE
@@ -1193,7 +1193,7 @@ qboolean SG_ReadSavegame(
qtrue);
 #endif
 
-   saved_game.read_chunk(
+   sgh.read_chunk(
INT_ID('M', 'P', 'C', 'M'),
sMapCmd);
 
@@ -1214,11 +1214,11 @@ qboolean SG_ReadSavegame(
//
if (!qbAutosave)
{
-   saved_game.read_chunk(
+   sgh.read_chunk(
INT_ID('T', 'I', 'M', 'E'),
::sv.time);
 
-   

[openjk] 61/130: JO: Fix loading/saving of GHOUL2 and timers

[Simon McVittie]

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

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

commit 4142bd9460b40822ce610e532cc3910d2cdcfe39
Author: bibendovsky 
Date:   Sun Jul 31 20:03:59 2016 +0300

JO: Fix loading/saving of GHOUL2 and timers
---
 code/game/G_Timer.cpp |2 +
 code/qcommon/q_shared.h   |   35 +
 code/rd-vanilla/G2_misc.cpp   |   21 +-
 codeJK2/game/G_Timer.cpp  |2 +
 shared/qcommon/ojk_i_saved_game.h |  763 ++---
 shared/qcommon/ojk_i_saved_game_fwd.h |  418 +--
 shared/qcommon/ojk_saved_game.cpp | 1219 +
 shared/qcommon/ojk_saved_game.h   |  228 +++---
 8 files changed, 1388 insertions(+), 1300 deletions(-)

diff --git a/code/game/G_Timer.cpp b/code/game/G_Timer.cpp
index e66ae8c..c7f7b44 100644
--- a/code/game/G_Timer.cpp
+++ b/code/game/G_Timer.cpp
@@ -244,6 +244,8 @@ void TIMER_Load( void )
 sg_buffer_size,
 tempBuffer);
 
+   tempBuffer[sg_buffer_size] = '\0';
+
 ::gi.saved_game->read_chunk(
 INT_ID('T','D','T','A'),
 time);
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index ed87688..83a92dd 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -1378,14 +1378,24 @@ typedef struct {
 
 
 #defineMAX_MODELS  256
+
+#ifdef JK2_MODE
+#define MAX_SOUNDS (256)
+#else
 #defineMAX_SOUNDS  380
+#endif // JK2_MODE
 
 #define MAX_SUB_BSP32
 
 #defineMAX_SUBMODELS   512 // nine bits
 
 #define MAX_FX 128
+
+#ifdef JK2_MODE
+#define MAX_WORLD_FX (4)
+#else
 #define MAX_WORLD_FX   66  // was 16 // was 4
+#endif // JK2_MODE
 
 /*
 Ghoul2 Insert Start
@@ -1395,7 +1405,11 @@ Ghoul2 Insert Start
 Ghoul2 Insert End
 */
 
+#ifdef JK2_MODE
+#define MAX_CONFIGSTRINGS (1024)
+#else
 #defineMAX_CONFIGSTRINGS   1300//1024 //rww - I had to up this for 
terrains
+#endif // JK2_MODE
 
 // these are the only configstrings that the system reserves, all the
 // other ones are strictly for servergame to clientgame communication
@@ -1416,19 +1430,40 @@ Ghoul2 Insert End
 
 #defineCS_MODELS   10
 
+#ifndef JK2_MODE
 #defineCS_SKYBOXORG(CS_MODELS+MAX_MODELS)  //rww - 
skybox info
+#endif // !JK2_MODE
 
+#ifdef JK2_MODE
+#define CS_SOUNDS (CS_MODELS + MAX_MODELS)
+#else
 #defineCS_SOUNDS   (CS_SKYBOXORG+1)
+#endif // JK2_MODE
+
+#ifdef JK2_MODE
+#define CS_PLAYERS (CS_SOUNDS + MAX_SOUNDS)
+#else
 #ifdef BASE_SAVE_COMPAT
 #define CS_RESERVED1   (CS_SOUNDS+MAX_SOUNDS) // reserved field for 
base compat from immersion removal
 #defineCS_PLAYERS  (CS_RESERVED1 + 96)
 #else
 #defineCS_PLAYERS  (CS_SOUNDS+MAX_SOUNDS)
 #endif
+#endif // JK2_MODE
+
 #defineCS_LIGHT_STYLES (CS_PLAYERS+MAX_CLIENTS)
+
+#ifndef JK2_MODE
 #define CS_TERRAINS(CS_LIGHT_STYLES + (MAX_LIGHT_STYLES*3))
 #define CS_BSP_MODELS  (CS_TERRAINS + MAX_TERRAINS)
+#endif // !JK2_MODE
+
+#ifdef JK2_MODE
+#define CS_EFFECTS (CS_LIGHT_STYLES + (MAX_LIGHT_STYLES * 3))
+#else
 #define CS_EFFECTS (CS_BSP_MODELS + 
MAX_SUB_BSP)//(CS_LIGHT_STYLES + (MAX_LIGHT_STYLES*3))
+#endif // JK2_MODE
+
 /*
 Ghoul2 Insert Start
 */
diff --git a/code/rd-vanilla/G2_misc.cpp b/code/rd-vanilla/G2_misc.cpp
index 6a0111c..436c4a6 100644
--- a/code/rd-vanilla/G2_misc.cpp
+++ b/code/rd-vanilla/G2_misc.cpp
@@ -1788,13 +1788,16 @@ void G2_SaveGhoul2Models(
 
 // is there anything to save?
 if (!ghoul2.IsValid() || ghoul2.size() == 0) {
+const int zero_size = 0;
+
 #ifdef JK2_MODE
+   ::ri.saved_game->write(
+   zero_size);
+
 ::ri.saved_game->write_chunk_and_size(
-INT_ID('G', 'L', 'S', '2'),
+INT_ID('G', 'L', '2', 'S'),
 INT_ID('G', 'H', 'L', '2'));
 #else
-const int zero_size = 0;
-
 ::ri.saved_game->write_chunk(
 INT_ID('G', 'H', 'L', '2'),
 zero_size); //write out a zero buffer
@@ -1855,7 +1858,7 @@ void G2_SaveGhoul2Models(
 
 #ifdef JK2_MODE
 ::ri.saved_game->write_chunk_and_size(
-INT_ID('G', 'L', 'S', '2'),
+INT_ID('G', 'L', '2', 'S'),
 INT_ID('G', 'H', 'L', '2'));
 #else
 ::ri.saved_game->write_chunk(
@@ -1873,9 +1876,19 @@ void G2_LoadGhoul2Model(
 // first thing, lets see how many ghoul2 models we have, and resize our 
buffers accordingly
 auto model_count = 0;
 
+#ifdef JK2_MODE
+   if (::ri.saved_game->get_buffer_size() > 0)
+   {
+#endif // JK2_MODE
+
 ::ri.saved_game->read(
 model_count);
 
+#ifdef 

[openjk] 74/130: Remove unused header

[Simon McVittie]

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

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

commit dd26951829a00678451bed0550e719dd1f2e7e83
Author: bibendovsky 
Date:   Sat Aug 13 18:19:19 2016 +0300

Remove unused header
---
 code/game/g_public.h | 4 
 1 file changed, 4 deletions(-)

diff --git a/code/game/g_public.h b/code/game/g_public.h
index 914468b..8ca8785 100644
--- a/code/game/g_public.h
+++ b/code/game/g_public.h
@@ -25,10 +25,6 @@ along with this program; if not, see 
.
 #define __G_PUBLIC_H__
 // g_public.h -- game module information visible to server
 
-
-#include "qcommon/ojk_i_saved_game.h"
-
-
 #defineGAME_API_VERSION10
 
 // entity->svFlags

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 76/130: Remove define

[Simon McVittie]

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

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

commit f806aef895fc26ddc1168bfb793b65bb3ee4c9fc
Author: bibendovsky 
Date:   Mon Aug 29 15:12:07 2016 +0300

Remove define
---
 code/rd-vanilla/G2_misc.cpp | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/rd-vanilla/G2_misc.cpp b/code/rd-vanilla/G2_misc.cpp
index 069b8ab..b1aaad3 100644
--- a/code/rd-vanilla/G2_misc.cpp
+++ b/code/rd-vanilla/G2_misc.cpp
@@ -1770,15 +1770,10 @@ void *G2_FindSurface(const model_s *mod, int index, int 
lod)
return (void *)current;
 }
 
-#if 1
+
 #define SURFACE_SAVE_BLOCK_SIZEsizeof(surfaceInfo_t)
 #define BOLT_SAVE_BLOCK_SIZE sizeof(boltInfo_t)
 #define BONE_SAVE_BLOCK_SIZE sizeof(boneInfo_t)
-#else
-const auto SURFACE_SAVE_BLOCK_SIZE = static_cast(sizeof(SgSurfaceInfo));
-const auto BOLT_SAVE_BLOCK_SIZE = static_cast(sizeof(SgBoltInfo));
-const auto BONE_SAVE_BLOCK_SIZE = static_cast(sizeof(SgBoneInfo));
-#endif
 
 
 void G2_SaveGhoul2Models(

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 77/130: SG: Reduce usage of keyword 'auto' to minimum

[Simon McVittie]

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

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

commit 5ba419855eb42eee7c5e7a17784fc3bcdc62a37d
Author: bibendovsky 
Date:   Mon Aug 29 16:12:40 2016 +0300

SG: Reduce usage of keyword 'auto' to minimum
---
 code/game/G_Timer.cpp  |  4 +-
 code/game/g_savegame.cpp   | 18 -
 code/icarus/IcarusImplementation.cpp   |  8 ++--
 code/rd-vanilla/G2_misc.cpp| 22 +--
 code/server/sv_savegame.cpp| 10 ++---
 codeJK2/game/g_savegame.cpp|  2 +-
 codeJK2/icarus/Sequence.cpp|  2 +-
 codeJK2/icarus/TaskManager.cpp |  2 +-
 shared/qcommon/ojk_saved_game.cpp  | 70 +-
 shared/qcommon/ojk_saved_game_helper.h | 42 ++--
 10 files changed, 87 insertions(+), 93 deletions(-)

diff --git a/code/game/G_Timer.cpp b/code/game/G_Timer.cpp
index 90b5e3b..e7254c7 100644
--- a/code/game/G_Timer.cpp
+++ b/code/game/G_Timer.cpp
@@ -240,10 +240,10 @@ void TIMER_Load( void )
saved_game.read_chunk(
INT_ID('T', 'M', 'I', 'D'));
 
-   auto sg_buffer_data = static_cast(
+   const char* sg_buffer_data = static_cast(
saved_game.get_buffer_data());
 
-   const auto sg_buffer_size = 
saved_game.get_buffer_size();
+   const int sg_buffer_size = saved_game.get_buffer_size();
 
std::uninitialized_copy_n(
sg_buffer_data,
diff --git a/code/game/g_savegame.cpp b/code/game/g_savegame.cpp
index a6c15b7..8a41940 100644
--- a/code/game/g_savegame.cpp
+++ b/code/game/g_savegame.cpp
@@ -515,7 +515,7 @@ static void EnumerateFields(
 {
strList.clear();
 
-   auto pbData = reinterpret_cast(
+   const byte* pbData = reinterpret_cast(
src_instance);
 
// enumerate all the fields...
@@ -742,7 +742,7 @@ void saberInfoRetail_t::sg_export(
 
//forbid all other styles
dst.stylesForbidden = 0;
-   for (auto styleNum = SS_NONE + 1; styleNum < 
SS_NUM_SABER_STYLES; ++styleNum)
+   for (int styleNum = SS_NONE + 1; styleNum < 
SS_NUM_SABER_STYLES; ++styleNum)
{
if (styleNum != style)
{
@@ -768,14 +768,10 @@ static void copy_retail_gclient_to_current(
const RetailGClient& src,
gclient_t& dst)
 {
-   const auto src_pre_size = offsetof(RetailGClient, ps.saber[0]);
-
-   const auto src_post_offset =
-   offsetof(RetailGClient, ps.dualSabers);
-
-   const auto src_post_size = sizeof(RetailGClient) - src_post_offset;
-
-   const auto dst_post_offset = offsetof(gclient_t, ps.dualSabers);
+   constexpr size_t src_pre_size = offsetof(RetailGClient, ps.saber[0]);
+   constexpr size_t src_post_offset = offsetof(RetailGClient, 
ps.dualSabers);
+   constexpr size_t src_post_size = sizeof(RetailGClient) - 
src_post_offset;
+   constexpr size_t dst_post_offset = offsetof(gclient_t, ps.dualSabers);
 
::memcpy(
reinterpret_cast(),
@@ -801,7 +797,7 @@ static void EvaluateFields(
byte* pbOriginalRefData,
unsigned int ulChid)
 {
-   auto& instance = *pbData;
+   T& instance = *pbData;
 
ojk::SavedGameHelper saved_game(
::gi.saved_game);
diff --git a/code/icarus/IcarusImplementation.cpp 
b/code/icarus/IcarusImplementation.cpp
index 2fe169a..ad66f77 100644
--- a/code/icarus/IcarusImplementation.cpp
+++ b/code/icarus/IcarusImplementation.cpp
@@ -713,10 +713,10 @@ int CIcarus::Load()
saved_game.read_chunk(
INT_ID('I','S','E','Q'));
 
-   auto sg_buffer_data = static_cast(
+   const unsigned char* sg_buffer_data = static_cast(
saved_game.get_buffer_data());
 
-   const auto sg_buffer_size = saved_game.get_buffer_size();
+   const int sg_buffer_size = saved_game.get_buffer_size();
 
std::uninitialized_copy_n(
sg_buffer_data,
@@ -846,10 +846,10 @@ void CIcarus::BufferRead( void *pDstBuff, unsigned long 
ulNumBytesToRead )
saved_game.read_chunk(
INT_ID('I', 'S', 'E', 'Q'));
 
-   auto sg_buffer_data = static_cast(
+   const unsigned char* sg_buffer_data = static_cast(
saved_game.get_buffer_data());
 
-   const auto sg_buffer_size = saved_game.get_buffer_size();
+   const int sg_buffer_size = saved_game.get_buffer_size();
 
std::uninitialized_copy_n(
sg_buffer_data,
diff --git a/code/rd-vanilla/G2_misc.cpp b/code/rd-vanilla/G2_misc.cpp
index b1aaad3..5d0b0fa 100644
--- a/code/rd-vanilla/G2_misc.cpp

[openjk] 78/130: SG: Replace spaces with tabs

[Simon McVittie]

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

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

commit 9251b66232df84720a38df3212bbfd3b6c7eba85
Author: bibendovsky 
Date:   Mon Aug 29 17:08:29 2016 +0300

SG: Replace spaces with tabs
---
 code/client/cl_main.cpp| 2 +-
 codeJK2/game/Q3_Interface.cpp  | 2 +-
 codeJK2/icarus/TaskManager.cpp | 2 +-
 codeJK2/icarus/interface.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index d8f3891..5031113 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -1181,7 +1181,7 @@ void CL_InitRef( void ) {
 
rit.SV_PointContents = SV_PointContents;
 
-rit.saved_game = ::SavedGame::get_instance();
+   rit.saved_game = ::SavedGame::get_instance();
 
ret = GetRefAPI( REF_API_VERSION,  );
 
diff --git a/codeJK2/game/Q3_Interface.cpp b/codeJK2/game/Q3_Interface.cpp
index 7a6a73c..2321329 100644
--- a/codeJK2/game/Q3_Interface.cpp
+++ b/codeJK2/game/Q3_Interface.cpp
@@ -9263,7 +9263,7 @@ void Interface_Init( interface_export_t *pe )
 
//Save / Load functions
pe->I_LinkEntity=   ICARUS_LinkEntity;
-pe->saved_game = gi.saved_game;
+   pe->saved_game = gi.saved_game;
 
gclient_t   *client;
client = [0];
diff --git a/codeJK2/icarus/TaskManager.cpp b/codeJK2/icarus/TaskManager.cpp
index f20984b..2364146 100644
--- a/codeJK2/icarus/TaskManager.cpp
+++ b/codeJK2/icarus/TaskManager.cpp
@@ -1683,7 +1683,7 @@ int CTaskManager::SaveCommand( CBlock *block )
size);

//Save out the raw data
-const uint8_t* raw_data = static_cast(bm->GetData());
+   const uint8_t* raw_data = static_cast(bm->GetData());
 
saved_game.write_chunk(
INT_ID('B', 'M', 'E', 'M'),
diff --git a/codeJK2/icarus/interface.h b/codeJK2/icarus/interface.h
index 39cc915..8b83fa0 100644
--- a/codeJK2/icarus/interface.h
+++ b/codeJK2/icarus/interface.h
@@ -85,7 +85,7 @@ typedef struct interface_export_s
int (*I_ReadSaveData)( unsigned int chid, 
void *address, int length, void **addressptr/* = NULL */);
int (*I_LinkEntity)( int entID, CSequencer 
*sequencer, CTaskManager *taskManager );
 
-ojk::ISavedGame* saved_game;
+   ojk::ISavedGame* saved_game;
 } interface_export_t;
 
 #endif //__INTERFACE__

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 73/130: Update game api version

[Simon McVittie]

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

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

commit a11a6f3384391a0baa3792626fc197994b8188f6
Author: bibendovsky 
Date:   Sat Aug 13 18:03:00 2016 +0300

Update game api version
---
 code/game/g_public.h| 2 +-
 codeJK2/game/g_public.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/g_public.h b/code/game/g_public.h
index 3c71295..914468b 100644
--- a/code/game/g_public.h
+++ b/code/game/g_public.h
@@ -29,7 +29,7 @@ along with this program; if not, see 
.
 #include "qcommon/ojk_i_saved_game.h"
 
 
-#defineGAME_API_VERSION8
+#defineGAME_API_VERSION10
 
 // entity->svFlags
 // the server does not know how to interpret most of the values
diff --git a/codeJK2/game/g_public.h b/codeJK2/game/g_public.h
index 7627f9b..b4384b6 100644
--- a/codeJK2/game/g_public.h
+++ b/codeJK2/game/g_public.h
@@ -25,7 +25,7 @@ along with this program; if not, see 
.
 #define __G_PUBLIC_H__
 // g_public.h -- game module information visible to server
 
-#defineGAME_API_VERSION8   // 
Bumped up to 8, since we support JA's engine now --eez
+#defineGAME_API_VERSION10  // 
Bumped up to 8, since we support JA's engine now --eez
 
 // entity->svFlags
 // the server does not know how to interpret most of the values

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/openjk.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

[openjk] 68/130: SG: Add checks for file handle

[Simon McVittie]

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

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

commit 2cdbf4192e601c0d9b72b62502f8133cdc136e4d
Author: bibendovsky 
Date:   Sun Aug 7 21:46:10 2016 +0300

SG: Add checks for file handle
---
 shared/qcommon/ojk_i_saved_game.h  |  7 +++-
 shared/qcommon/ojk_saved_game.cpp  | 51 +++---
 shared/qcommon/ojk_saved_game_helper_fwd.h | 13 
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/shared/qcommon/ojk_i_saved_game.h 
b/shared/qcommon/ojk_i_saved_game.h
index f4d0140..50bad4f 100644
--- a/shared/qcommon/ojk_i_saved_game.h
+++ b/shared/qcommon/ojk_i_saved_game.h
@@ -32,7 +32,8 @@ public:
}
 
 
-   // Tries to reads a chunk from the file into the internal buffer.
+   // Reads a chunk from the file into the internal buffer.
+   // Returns true on success or false otherwise.
virtual bool read_chunk(
const uint32_t chunk_id) = 0;
 
@@ -44,21 +45,25 @@ public:
 
 
// Writes a chunk into the file from the internal buffer.
+   // Returns true on success or false otherwise.
virtual bool write_chunk(
const uint32_t chunk_id) = 0;
 
 
// Reads data from the internal buffer.
+   // Returns true on success or false otherwise.
virtual bool read(
void* dst_data,
int dst_size) = 0;
 
// Writes data into the internal buffer.
+   // Returns true on success or false otherwise.
virtual bool write(
const void* src_data,
int src_size) = 0;
 
// Increments buffer's offset by the specified non-negative count.
+   // Returns true on success or false otherwise.
virtual bool skip(
int count) = 0;
 
diff --git a/shared/qcommon/ojk_saved_game.cpp 
b/shared/qcommon/ojk_saved_game.cpp
index 708fc28..ede9b5a 100644
--- a/shared/qcommon/ojk_saved_game.cpp
+++ b/shared/qcommon/ojk_saved_game.cpp
@@ -163,10 +163,8 @@ void SavedGame::close()
file_handle_ = 0;
}
 
-   error_message_.clear();
-
-   io_buffer_.clear();
-   io_buffer_offset_ = 0;
+   clear_error();
+   reset_buffer();
 
saved_io_buffer_.clear();
saved_io_buffer_offset_ = 0;
@@ -175,7 +173,6 @@ void SavedGame::close()
 
is_readable_ = false;
is_writable_ = false;
-   is_failed_ = false;
 }
 
 bool SavedGame::read_chunk(
@@ -186,6 +183,12 @@ bool SavedGame::read_chunk(
return false;
}
 
+   if (file_handle_ == 0)
+   {
+   is_failed_ = true;
+   error_message_ = "Not open or created.";
+   return false;
+   }
 
io_buffer_offset_ = 0;
 
@@ -352,6 +355,16 @@ bool SavedGame::read_chunk(
 
 bool SavedGame::is_all_data_read() const
 {
+   if (is_failed_)
+   {
+   return false;
+   }
+
+   if (file_handle_ == 0)
+   {
+   return false;
+   }
+
return io_buffer_.size() == io_buffer_offset_;
 }
 
@@ -373,6 +386,13 @@ bool SavedGame::write_chunk(
return false;
}
 
+   if (file_handle_ == 0)
+   {
+   is_failed_ = true;
+   error_message_ = "Not open or created.";
+   return false;
+   }
+
 
const auto chunk_id_string = get_chunk_id_string(
chunk_id);
@@ -548,6 +568,13 @@ bool SavedGame::read(
return false;
}
 
+   if (file_handle_ == 0)
+   {
+   is_failed_ = true;
+   error_message_ = "Not open or created.";
+   return false;
+   }
+
if (!dst_data)
{
is_failed_ = true;
@@ -600,6 +627,13 @@ bool SavedGame::write(
return false;
}
 
+   if (file_handle_ == 0)
+   {
+   is_failed_ = true;
+   error_message_ = "Not open or created.";
+   return false;
+   }
+
if (!src_data)
{
is_failed_ = true;
@@ -654,6 +688,13 @@ bool SavedGame::skip(
return false;
}
 
+   if (file_handle_ == 0)
+   {
+   is_failed_ = true;
+   error_message_ = "Not open or created.";
+   return false;
+   }
+
if (!is_readable_ && !is_writable_)
{
is_failed_ = true;
diff --git a/shared/qcommon/ojk_saved_game_helper_fwd.h 
b/shared/qcommon/ojk_saved_game_helper_fwd.h
index 7dee5b6..a2f866c 100644
--- a/shared/qcommon/ojk_saved_game_helper_fwd.h
+++ b/shared/qcommon/ojk_saved_game_helper_fwd.h
@@ -22,25 +22,38 @@ public:
ISavedGame* saved_game);
 
 
+   // Reads a chunk from the file into the internal buffer.
+   // Calls error method on failure.
void read_chunk(
const