yquake2/xatrix
0
0
Fork 0
mirror of https://github.com/yquake2/xatrix.git synced 2025-04-20 17:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #94 from protocultor/g_swap_speed_fix

Browse source 
Fix for g_swap_speed behaviour with extreme values
This commit is contained in:
Yamagi 2023-09-14 21:12:42 +02:00 committed by GitHub
commit 381b0ca57c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG
View file

@ -5,11 +5,11 @@ The Reckoning 2.10 to 2.11:
a player standing on a blocked elevator gets turned around (by
skuller).
- Fix several coop related bugs with the powercubes. (by BjossiAlfreds)
- A way better fix for dead bodys obstructing elevators or falling
- A way better fix for dead bodies obstructing elevators or falling
through the worldmodel. (by BjossiAlfreds)
- Fix items already in water playing a splash sound at level start. (by
BjossiAlfreds)
- Phalanx explosions should be muffeled under water. (by protocultor)
- Phalanx explosions should be muffled under water. (by protocultor)
The Reckoning 2.09 to 2.10:
- Refine the 'g_footstep' cvar to match Quake II itself.

6
Makefile
View file

@ -6,8 +6,8 @@
# #
# Dependencies: #
# - None, but you need a Quake II to play. #
# While in theorie every one should work #
# Yamagi Quake II ist recommended. #
# While in theory every one should work #
# Yamagi Quake II is recommended. #
# #
# Platforms: #
# - FreeBSD #
@ -276,7 +276,7 @@ XATRIX_OBJS_ = \
# ----------
# Rewrite pathes to our object directory
# Rewrite paths to our object directory
XATRIX_OBJS = $(patsubst %,build/%,$(XATRIX_OBJS_))
# ----------

2
src/g_misc.c
View file

@ -828,7 +828,7 @@ SP_info_null(edict_t *self)
/*
* QUAKED info_notnull (0 0.5 0) (-4 -4 -4) (4 4 4)
* Used as a positional target for lightning.
* Used as a positional target for lighting.
*/
void
SP_info_notnull(edict_t *self)

4
src/player/weapon.c
View file

@ -685,7 +685,9 @@ Weapon_Generic(edict_t *ent, int FRAME_ACTIVATE_LAST, int FRAME_FIRE_LAST,
int *fire_frames, void (*fire)(edict_t *ent))
{
int n;
const unsigned short int change_speed = (g_swap_speed->value > 0)?(unsigned short int)g_swap_speed->value:1;
const unsigned short int change_speed = (g_swap_speed->value > 1)?
(g_swap_speed->value < USHRT_MAX)? (unsigned short int)g_swap_speed->value : 1
: 1;
if (!ent || !fire_frames || !fire)
{