OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2016-12-10 15:46:35 -05:00
commit 4eef1d99ee
16 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/b_func.cpp
View file

@ -193,7 +193,7 @@ void DBot::Dofire (ticcmd_t *cmd)
else
{
//*4 is for atmosphere, the chainsaws sounding and all..
no_fire = (Dist > MELEERANGE*4);
no_fire = (Dist > DEFMELEERANGE*4);
}
}
else if (player->ReadyWeapon->WeaponFlags & WIF_BOT_BFG)

2
src/p_actionfunctions.cpp
View file

@ -2093,7 +2093,7 @@ DEFINE_ACTION_FUNCTION(AStateProvider, A_CustomPunch)
damage *= pr_cwpunch() % 8 + 1;
angle = self->Angles.Yaw + pr_cwpunch.Random2() * (5.625 / 256);
if (range == 0) range = MELEERANGE;
if (range == 0) range = DEFMELEERANGE;
pitch = P_AimLineAttack (self, angle, range, &t);
// only use ammo when actually hitting something!

2
src/p_local.h
View file

@ -62,7 +62,7 @@ extern int bmapnegy;
#define TALKRANGE (128.)
#define USERANGE (64.)
#define MELEERANGE (64.)
#define DEFMELEERANGE (64.)
#define SAWRANGE (64.+(1./65536.)) // use meleerange + 1 so the puff doesn't skip the flash (i.e. plays all states)
#define MISSILERANGE (32*64.)
#define PLAYERMISSILERANGE (8192.) // [RH] New MISSILERANGE for players