Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-02 23:57:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Moved MINS/MAXS to bg_pmove

Browse source
This commit is contained in:
smallmodel 2023-10-14 13:31:19 +02:00
parent 1a293420c0
commit 407538fd85
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
4 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
code/fgame/actor.cpp
View file

@ -49,9 +49,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <cmath>
Vector MINS(-15.0, -15.0, 0.0);
Vector MAXS(15.0, 15.0, 96.0);
extern Vector PLAYER_BASE_MIN;
extern Vector PLAYER_BASE_MAX;
@ -3097,12 +3094,8 @@ void Actor::SetMoveInfo(mmove_t *mm)
mm->frametime = level.frametime;
mm->mins[0] = MINS.x;
mm->mins[1] = MINS.y;
mm->mins[2] = MINS.z;
mm->maxs[0] = MAXS.x;
mm->maxs[1] = MAXS.y;
mm->maxs[2] = MAXS.z;
VectorCopy(MINS, mm->mins);
VectorCopy(MAXS, mm->maxs);
mm->tracemask = m_bNoPlayerCollision == false ? MASK_PATHSOLID : MASK_TARGETPATH;
}

4
code/fgame/actor_machinegunner.cpp
View file

@ -24,9 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "actor.h"
#include "weapturret.h"
extern Vector MINS;
extern Vector MAXS;
#include "bg_local.h"
void Actor::InitMachineGunner(GlobalFuncs_t *func)
{

3
code/fgame/bg_local.h
View file

@ -76,6 +76,9 @@ extern float pm_friction;
extern float pm_waterfriction;
extern float pm_flightfriction;
extern const vec3_t MINS;
extern const vec3_t MAXS;
extern int c_pmove;
void PM_ClipVelocity( vec3_t in, vec3_t normal, vec3_t out, float overbounce );

3
code/fgame/bg_pmove.cpp
View file

@ -48,6 +48,9 @@ float pm_backspeed = 0.80f;
float pm_flightfriction = 3.0f;
float PM_NOCLIPfriction = 5.0f;
const vec3_t MINS = { -15, -15, 0 };
const vec3_t MAXS = { 15, 15, 0 };
int c_pmove = 0;
/*