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

Data types correction

Browse source
This commit is contained in:
zicodxx 2007-11-01 18:49:28 +00:00
parent e60fadff94
commit 8387358ec8
2 changed files with 7 additions and 3 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
20071101
--------
main/collide.c: Data types correction
20071031
--------
d1x.ini, SConstruct, arch/linux/linuxnet.c, arch/ogl/gr.c, arch/win32/winnet.c, include/args.h, main/args.c, main/collide.c, main/game.c, main/hudmsg.c, main/inferno.c, main/kconfig.c, main/laser.c, main/menu.c, main/multi.c, main/multi.h, main/multipow.h, main/netlist.c, main/network.c, main/state.c, main/state.h: Improvements for -gl_prshot; Improved show_netgame_info(); Removed obsolete multisave code; Removed mekh stuff and wide cleanings in whole multi code; Incremented MULTI_PROTO_D1X_VER (for version checks in the future if needed); Renamed 'D1X-only game' to 'Version Check'

6
main/collide.c
View file

@ -668,7 +668,7 @@ void collide_robot_and_controlcen( object * obj1, object * obj2, vms_vector *col
//##}
void collide_robot_and_player( object * robot, object * player, vms_vector *collision_point ) {
static int last_play_time=0;
static fix last_play_time=0;
if (player->id == Player_num) {
create_awareness_event(player, PA_PLAYER_COLLISION); // object robot can attract attention to player
@ -768,7 +768,7 @@ void apply_damage_to_controlcen(object *controlcen, fix damage, short who)
void collide_player_and_controlcen( object * controlcen, object * player, vms_vector *collision_point )
{
static int last_play_time=0;
static fix last_play_time=0;
if (player->id == Player_num) {
Control_center_been_hit = 1;
@ -1055,7 +1055,7 @@ void collide_hostage_and_player( object * hostage, object * player, vms_vector *
//##}
void collide_player_and_player( object * player1, object * player2, vms_vector *collision_point ) {
static int last_play_time=0;
static fix last_play_time=0;
if (last_play_time + (F1_0/50) < GameTime || last_play_time > GameTime) {
last_play_time = GameTime + (F1_0/10);
digi_link_sound_to_pos( SOUND_ROBOT_HIT_PLAYER, player1->segnum, 0, collision_point, 0, F1_0 );