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

Remove unnecessary zero of .invulnerable_time

Browse source
This commit is contained in:
Kp 2015-10-30 02:52:54 +00:00
parent 4882558d6e
commit 64c161c4b2
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
similar/main/gameseq.cpp
View file

@ -350,7 +350,7 @@ void init_player_stats_level(const secret_restore secret_flag)
#endif
DXX_MAKE_VAR_UNDEFINED(get_local_player().cloak_time);
get_local_player().invulnerable_time = 0;
DXX_MAKE_VAR_UNDEFINED(get_local_player().invulnerable_time);
if ((Game_mode & GM_MULTI) && !(Game_mode & GM_MULTI_COOP))
get_local_player().flags |= (KEY_BLUE | KEY_RED | KEY_GOLD);
@ -464,7 +464,7 @@ void init_player_stats_new_ship(ubyte pnum)
plr.flags |= map_granted_flags_to_player_flags(GrantedItems);
plr.primary_weapon_flags |= granted_primary_weapon_flags;
DXX_MAKE_VAR_UNDEFINED(Players[pnum].cloak_time);
Players[pnum].invulnerable_time = 0;
DXX_MAKE_VAR_UNDEFINED(Players[pnum].invulnerable_time);
Players[pnum].homing_object_dist = -F1_0; // Added by RH
digi_kill_sound_linked_to_object(vcobjptridx(Players[pnum].objnum));
}

8
similar/main/newdemo.cpp
View file

@ -1704,7 +1704,7 @@ static int newdemo_read_demo_start(enum purpose_type purpose)
{
i.flags &= ~(PLAYER_FLAGS_CLOAKED | PLAYER_FLAGS_INVULNERABLE);
DXX_MAKE_VAR_UNDEFINED(i.cloak_time);
i.invulnerable_time = 0;
DXX_MAKE_VAR_UNDEFINED(i.invulnerable_time);
}
}
else
@ -1734,7 +1734,7 @@ static int newdemo_read_demo_start(enum purpose_type purpose)
range_for (auto &i, partial_range(Players, N_players)) {
i.flags &= ~(PLAYER_FLAGS_CLOAKED | PLAYER_FLAGS_INVULNERABLE);
DXX_MAKE_VAR_UNDEFINED(i.cloak_time);
i.invulnerable_time = 0;
DXX_MAKE_VAR_UNDEFINED(i.invulnerable_time);
nd_read_string(i.callsign.buffer());
nd_read_byte(&(i.connected));
if (purpose == PURPOSE_REWRITE)
@ -2454,7 +2454,7 @@ static int newdemo_read_frame_information(int rewrite)
get_local_player().cloak_time = GameTime64 - (CLOAK_TIME_MAX / 2);
}
if (!(oflags & PLAYER_FLAGS_INVULNERABLE) && (get_local_player().flags & PLAYER_FLAGS_INVULNERABLE))
get_local_player().invulnerable_time = 0;
DXX_MAKE_VAR_UNDEFINED(get_local_player().invulnerable_time);
if ((oflags & PLAYER_FLAGS_INVULNERABLE) && !(get_local_player().flags & PLAYER_FLAGS_INVULNERABLE))
get_local_player().invulnerable_time = GameTime64 - (INVULNERABLE_TIME_MAX / 2);
get_local_player().flags = oflags;
@ -2468,7 +2468,7 @@ static int newdemo_read_frame_information(int rewrite)
if (!(oflags & PLAYER_FLAGS_INVULNERABLE) && (get_local_player().flags & PLAYER_FLAGS_INVULNERABLE))
get_local_player().invulnerable_time = GameTime64 - (INVULNERABLE_TIME_MAX / 2);
if ((oflags & PLAYER_FLAGS_INVULNERABLE) && !(get_local_player().flags & PLAYER_FLAGS_INVULNERABLE))
get_local_player().invulnerable_time = 0;
DXX_MAKE_VAR_UNDEFINED(get_local_player().invulnerable_time);
}
update_laser_weapon_info(); // in case of quad laser change
break;