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 c36cedb3a8
commit 90225b5964
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog
20071101
--------
main/collide.c, main/laser.c: Data types correction
20071031
--------
arch/ogl/gr.c, main/multi.c, main/multi.h, main/network.c, main/state.c, main/state.h: Improvements for -gl_prshot; Improved show_netgame_info(); Removed obsolete multisave code

6
main/collide.c
View file

@ -1013,7 +1013,7 @@ void collide_robot_and_player( object * robot, object * playerobj, vms_vector *c
{
int steal_attempt = 0;
int collision_seg;
static int last_play_time=0;
static fix last_play_time=0;
if (robot->flags&OF_EXPLODING)
return;
@ -1143,7 +1143,7 @@ void apply_damage_to_controlcen(object *controlcen, fix damage, short who)
void collide_player_and_controlcen( object * controlcen, object * playerobj, vms_vector *collision_point )
{
static int last_play_time=0;
static fix last_play_time=0;
if (playerobj->id == Player_num) {
Control_center_been_hit = 1;
@ -1792,7 +1792,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;
digi_link_sound_to_pos( SOUND_ROBOT_HIT_PLAYER, player1->segnum, 0, collision_point, 0, F1_0 );

2
main/laser.c
View file

@ -526,7 +526,7 @@ void do_omega_stuff(object *parent_objp, vms_vector *firing_pos, object *weapon_
int lock_objnum, firing_segnum;
vms_vector goal_pos;
int pnum = parent_objp->id;
static int last_play_time=0;
static fix last_play_time=0;
if (pnum == Player_num) {
// If charge >= min, or (some charge and zero energy), allow to fire.