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

When colliding with robot not controlled by us in Multi-Robot game do not apply force or damage - wait until the robot is under our control - preventing juggeling robots back and forth between players and creating massive damage

Browse source
This commit is contained in:
zicodxx 2011-07-14 13:36:24 +02:00
parent cf23e6bb24
commit 83f64ec080
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20110714
--------
main/collide.c: When colliding with robot not controlled by us in Multi-Robot game do not apply force or damage - wait until the robot is under our control - preventing juggeling robots back and forth between players and creating massive damage
20110713
--------
arch/sdl/event.c, arch/sdl/key.c, main/kconfig.c, main/menu.c: Stability fixes: avoid somfusions with same named variables in one function; Properly sort out players from player list that use too long filenames; Removed call for gr_set_fontcolor in kconfig where no canvas is set, causing crashes when trying to reassign a button, key or axis

3
main/collide.c
View file

@ -656,7 +656,10 @@ void collide_robot_and_player( object * robot, object * player, vms_vector *coll
#ifdef NETWORK
#ifndef SHAREWARE
else
{
multi_robot_request_change(robot, player->id);
return; // only controlling player should make damage otherwise we might juggle robot back and forth, killing it instantly
}
#endif
#endif