vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'kartinternal/master' into next

This commit is contained in:
TehRealSalt 2018-12-03 17:32:20 -05:00
parent 5658f69ba7 188c0164b6
commit e009ab94d1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/info.c
View File

@ -14856,8 +14856,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_kc2e, // deathsound
60*FRACUNIT, // speed
36*FRACUNIT, // radius
36*FRACUNIT, // height
48*FRACUNIT, // radius
48*FRACUNIT, // height
0, // display offset
100, // mass
MT_RANDOMITEMPOP, // damage
@ -14910,8 +14910,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_itpick, // deathsound
0, // speed
24*FRACUNIT, // radius
24*FRACUNIT, // height
32*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage

4
src/p_mobj.c
View File

@ -6362,7 +6362,7 @@ void P_RunShadows(void)
}
if (mobj->target->type == MT_FLOATINGITEM)
P_SetScale(mobj, mobj->scale/2);
P_SetScale(mobj, mobj->scale/3);
}
P_SetTarget(&shadowcap, NULL);
}
@ -8490,7 +8490,7 @@ void P_MobjThinker(mobj_t *mobj)
// Give items an item-sized hitbox
if (mobj->target->player->kartstuff[k_comebackmode] == 1)
mobj->radius = 36*mobj->target->scale;
mobj->radius = 48*mobj->target->scale;
else
mobj->radius = 24*mobj->target->scale;
mobj->height = 2*mobj->radius;