stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 13:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/upstream/thunder-fixes' into test-many-mrs

Browse source
This commit is contained in:
fickleheart 2019-03-09 21:23:07 -06:00
commit 20c0db1f22
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_inter.c
View file

@ -141,6 +141,9 @@ boolean P_CanPickupItem(player_t *player, UINT8 weapon)
|| (weapon != 3 && player->kartstuff[k_itemamount]) || (weapon != 3 && player->kartstuff[k_itemamount])
|| player->kartstuff[k_itemheld]) || player->kartstuff[k_itemheld])
return false; return false;
if (weapon == 3 && player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD)
return false; // No stacking thunder shields!
} }
} }

4
src/p_user.c
View file

@ -7654,12 +7654,14 @@ static void P_NukeAllPlayers(player_t *player)
// //
void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius) void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius)
{ {
const fixed_t ns = 60 << FRACBITS; const fixed_t ns = 60 * mapobjectscale;
mobj_t *mo; mobj_t *mo;
angle_t fa; angle_t fa;
thinker_t *think; thinker_t *think;
INT32 i; INT32 i;
radius = FixedMul(radius, mapobjectscale);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
fa = (i*(FINEANGLES/16)); fa = (i*(FINEANGLES/16));