teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-10 14:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with frozen or enemy lasers firing in the wrong direction consistently

Browse source
This commit is contained in:
Simon 2023-07-13 21:52:57 +01:00
parent f4a6e66ed0
commit 1a6a99e2a7
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Projects/Android/jni/OpenJK/code/game/wp_blaster_pistol.cpp
View file

@ -45,7 +45,6 @@ void WP_FireBryarPistol( gentity_t *ent, qboolean alt_fire )
if ( BG_UseVRPosition(ent)) if ( BG_UseVRPosition(ent))
{ {
BG_CalculateVRWeaponPosition(muzzle, angs); BG_CalculateVRWeaponPosition(muzzle, angs);
AngleVectors(angs, forward, NULL, NULL);
} }
else { else {
vectoangles(forwardVec, angs); vectoangles(forwardVec, angs);
@ -70,11 +69,11 @@ void WP_FireBryarPistol( gentity_t *ent, qboolean alt_fire )
angs[PITCH] += ( Q_flrand(-1.0f, 1.0f) * ((5-ent->NPC->currentAim)*0.25f) ); angs[PITCH] += ( Q_flrand(-1.0f, 1.0f) * ((5-ent->NPC->currentAim)*0.25f) );
angs[YAW] += ( Q_flrand(-1.0f, 1.0f) * ((5-ent->NPC->currentAim)*0.25f) ); angs[YAW] += ( Q_flrand(-1.0f, 1.0f) * ((5-ent->NPC->currentAim)*0.25f) );
} }
AngleVectors( angs, forward, NULL, NULL );
} }
} }
AngleVectors( angs, forward, NULL, NULL );
WP_MissileTargetHint(ent, start, forward); WP_MissileTargetHint(ent, start, forward);
float velocity = BRYAR_PISTOL_VEL; float velocity = BRYAR_PISTOL_VEL;

2
Projects/Android/jni/OpenJK/code/rd-gles/tr_ghoul2.cpp
View file

@ -3611,7 +3611,7 @@ qboolean R_LoadMDXM( model_t *mod, void *buffer, const char *mod_name, qboolean
#ifndef JK2_MODE #ifndef JK2_MODE
else else
{ {
assert (tr.models[mdxm->animIndex]->mdxa->numBones == mdxm->numBones); //assert (tr.models[mdxm->animIndex]->mdxa->numBones == mdxm->numBones);
if (tr.models[mdxm->animIndex]->mdxa->numBones != mdxm->numBones) if (tr.models[mdxm->animIndex]->mdxa->numBones != mdxm->numBones)
{ {
if ( isAnOldModelFile ) if ( isAnOldModelFile )

2
Projects/Android/jni/OpenJK/shared/qcommon/q_math.c
View file

@ -249,7 +249,7 @@ int irand( int min, int max )
{ {
int result; int result;
assert((max - min) < QRAND_MAX); //assert((max - min) < QRAND_MAX);
max++; max++;
holdrand = (holdrand * 214013L) + 2531011L; holdrand = (holdrand * 214013L) + 2531011L;