OpenJK-git: fix compilation

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Jul 25 11:59:02 2021 +0200
Changeset:	4000b42f09cc0a043b61ef3466a7d43325f18f6a

Modified Files:
	OpenJK-git/distinfo
Added Files:
	OpenJK-git/patches/patch-codeJK2_game_bg__pmove.cpp

Log Message:
OpenJK-git: fix compilation

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4000b42f09cc0a043b61ef3466a7d43325f18f6a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 OpenJK-git/distinfo                                |  1 +
 .../patches/patch-codeJK2_game_bg__pmove.cpp       | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diffs:
diff --git a/OpenJK-git/distinfo b/OpenJK-git/distinfo
index cbb4619c0e..619125924b 100644
--- a/OpenJK-git/distinfo
+++ b/OpenJK-git/distinfo
@@ -4,6 +4,7 @@ SHA1 (OpenJK/cc4094c8fa989663eb8087b33d97bb2749295b9f-cc4094c8fa989663eb8087b33d
 RMD160 (OpenJK/cc4094c8fa989663eb8087b33d97bb2749295b9f-cc4094c8fa989663eb8087b33d97bb2749295b9f.tar.gz) = b1df484fca341e5728f9fa8684c83ebe899f9a20
 SHA512 (OpenJK/cc4094c8fa989663eb8087b33d97bb2749295b9f-cc4094c8fa989663eb8087b33d97bb2749295b9f.tar.gz) = d16cca9836545eba86ac39e608ac002d3f768ab4160bee87a9687841b5f3d6941135be641a689eca67a01610563a1169c0b49b4aadfba2916d2e36b315fe2d1a
 Size (OpenJK/cc4094c8fa989663eb8087b33d97bb2749295b9f-cc4094c8fa989663eb8087b33d97bb2749295b9f.tar.gz) = 11708269 bytes
+SHA1 (patch-codeJK2_game_bg__pmove.cpp) = c6e6e5c815a58fab12afd96ac8a8cd1582907056
 SHA1 (patch-code_rd-vanilla_qgl.h) = d8be7ae133e65bb184f2bb6f4eefac6077cde2e2
 SHA1 (patch-codemp_rd-dedicated_qgl.h) = bb18c945dea4c03f2aedfb4dfb609919ccfa72ec
 SHA1 (patch-codemp_rd-vanilla_qgl.h) = 1c090620009d81f988a89afe1ba36cdc8ba02b5d
diff --git a/OpenJK-git/patches/patch-codeJK2_game_bg__pmove.cpp b/OpenJK-git/patches/patch-codeJK2_game_bg__pmove.cpp
new file mode 100644
index 0000000000..a840c1e597
--- /dev/null
+++ b/OpenJK-git/patches/patch-codeJK2_game_bg__pmove.cpp
@@ -0,0 +1,23 @@
+$NetBSD$
+
+ret is conditional on "ifdef DEBUG", so make the assert also conditional.
+
+--- codeJK2/game/bg_pmove.cpp.orig	2021-01-01 13:35:17.000000000 +0000
++++ codeJK2/game/bg_pmove.cpp
+@@ -6500,7 +6500,9 @@ qboolean PM_SaberLocked( void )
+ #endif // _DEBUG
+ 						gi.G2API_GetBoneAnimIndex( &gent->ghoul2[gent->playerModel], gent->lowerLumbarBone, (cg.time?cg.time:level.time), &currentFrame, &junk, &junk, &junk, &junk2, NULL );
+ 
++#ifdef _DEBUG
+ 					assert(ret); // this would be pretty bad, the below code seems to assume the call succeeds. -gil
++#endif // _DEBUG
+ 
+ 					strength = G_SaberLockStrength( gent );
+ 					if ( pm->ps->torsoAnim == BOTH_CCWCIRCLELOCK ||
+@@ -8991,4 +8993,4 @@ void Pmove( pmove_t *pmove )
+ 	{//half grav
+ 		pm->ps->gravity *= 2;
+ 	}
+-}
+\ No newline at end of file
++}