TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix drop_player_eggs smart mine logic

Browse source 
The count of mines was not decremented, so a player who entered the loop
could continue to drop until (d_rand() < rthresh) became false.  Halving
rthresh on each pass guaranteed that it would stop, but with the right
string of random numbers, the player could drop more mines than he had.
Remove the ==1 qualifier, so that mines can spawn whenever one will be
lost to rounding.
This commit is contained in:
Kp 2015-11-12 02:57:45 +00:00
parent 93888b4e37
commit 9a132977b9
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
similar/main/collide.cpp
View file

@ -1889,33 +1889,27 @@ void drop_player_eggs(const vobjptridx_t playerobj)
auto &secondary_ammo = playerobj->ctype.player_info.secondary_ammo;
#if defined(DXX_BUILD_DESCENT_II)
// If the player had smart mines, maybe arm one of them.
int rthresh;
rthresh = 30000;
while (secondary_ammo[SMART_MINE_INDEX] % 4 == 1 && d_rand() < rthresh)
const auto drop_armed_bomb = [&](uint8_t mines, weapon_type_t id) {
mines %= 4;
for (int rthresh = 30000; mines && d_rand() < rthresh; rthresh /= 2)
{
const auto randvec = make_random_vector();
rthresh /= 2;
const auto tvec = vm_vec_add(playerobj->pos, randvec);
auto newseg = find_point_seg(tvec, playerobj->segnum);
if (newseg != segment_none)
Laser_create_new(randvec, tvec, newseg, playerobj, SUPERPROX_ID, 0);
}
{
-- mines;
Laser_create_new(randvec, tvec, newseg, playerobj, id, 0);
}
}
};
drop_armed_bomb(secondary_ammo[SMART_MINE_INDEX], SUPERPROX_ID);
// If the player had proximity bombs, maybe arm one of them.
if ((Game_mode & GM_MULTI) && !game_mode_hoard())
{
rthresh = 30000;
while (secondary_ammo[PROXIMITY_INDEX] % 4 == 1 && d_rand() < rthresh)
{
const auto randvec = make_random_vector();
rthresh /= 2;
const auto tvec = vm_vec_add(playerobj->pos, randvec);
auto newseg = find_point_seg(tvec, playerobj->segnum);
if (newseg != segment_none)
Laser_create_new(randvec, tvec, newseg, playerobj, PROXIMITY_ID, 0);
}
drop_armed_bomb(secondary_ammo[PROXIMITY_INDEX], PROXIMITY_ID);
}
#endif