mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-03-04 16:01:29 +00:00
Fix squishing a shrunken enemy while changing weapon bug
git-svn-id: https://svn.eduke32.com/eduke32@216 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
6fb8ac956b
commit
2142db118e
2 changed files with 12 additions and 13 deletions
|
@ -161,19 +161,18 @@ void addweapon( struct player_struct *p,short weapon)
|
|||
p->kickback_pic = 0;
|
||||
|
||||
if(p->curr_weapon != weapon)
|
||||
{
|
||||
p->curr_weapon = weapon;
|
||||
|
||||
SetGameVarID(g_iWeaponVarID,p->curr_weapon, p->i, snum);
|
||||
if(p->curr_weapon>=0)
|
||||
{
|
||||
SetGameVarID(g_iWorksLikeVarID,aplWeaponWorksLike[p->curr_weapon][snum], p->i, snum);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetGameVarID(g_iWorksLikeVarID,-1, p->i, snum);
|
||||
}
|
||||
OnEvent(EVENT_CHANGEWEAPON,p->i, snum, -1);
|
||||
|
||||
p->curr_weapon = weapon;
|
||||
|
||||
SetGameVarID(g_iWeaponVarID,p->curr_weapon, p->i, snum);
|
||||
if(p->curr_weapon>=0)
|
||||
{
|
||||
SetGameVarID(g_iWorksLikeVarID,aplWeaponWorksLike[p->curr_weapon][snum], p->i, snum);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetGameVarID(g_iWorksLikeVarID,-1, p->i, snum);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -130,7 +130,7 @@ extern "C" {
|
|||
|
||||
// DEFAULT mouse sensitivity scale
|
||||
|
||||
#define DEFAULTMOUSESENSITIVITY 10
|
||||
#define DEFAULTMOUSESENSITIVITY 18
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue