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

Rewrite simple fix64 casts from C style to static_cast<>

Browse source 
s/(\(fix\(64\)\?\))\s*\(\w\+\);/static_cast<\1>(\3);/g
This commit is contained in:
Kp 2016-07-07 03:08:13 +00:00
parent 9128ff7c35
commit 1dd60cc5be
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
similar/main/ai.cpp
View file

@ -4592,11 +4592,11 @@ static void ai_local_read_swap(ai_local *ail, int swap, PHYSFS_File *fp)
#endif
ail->player_awareness_time = PHYSFSX_readSXE32(fp, swap);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
ail->time_player_seen = (fix64)tmptime32;
ail->time_player_seen = static_cast<fix64>(tmptime32);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
ail->time_player_sound_attacked = (fix64)tmptime32;
ail->time_player_sound_attacked = static_cast<fix64>(tmptime32);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
ail->next_misc_sound_time = (fix64)tmptime32;
ail->next_misc_sound_time = static_cast<fix64>(tmptime32);
ail->time_since_processed = PHYSFSX_readSXE32(fp, swap);
range_for (auto &j, ail->goal_angles)
@ -4633,7 +4633,7 @@ static void ai_cloak_info_read_n_swap(ai_cloak_info *ci, int n, int swap, PHYSFS
for (i = 0; i < n; i++, ci++)
{
tmptime32 = PHYSFSX_readSXE32(fp, swap);
ci->last_time = (fix64)tmptime32;
ci->last_time = static_cast<fix64>(tmptime32);
#if defined(DXX_BUILD_DESCENT_II)
ci->last_segment = PHYSFSX_readSXE32(fp, swap);
#endif
@ -4652,10 +4652,10 @@ int ai_restore_state(PHYSFS_File *fp, int version, int swap)
PHYSFSX_serialize_read(fp, Point_segs);
ai_cloak_info_read_n_swap(Ai_cloak_info.data(), Ai_cloak_info.size(), swap, fp);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
Boss_cloak_start_time = (fix64)tmptime32;
Boss_cloak_start_time = static_cast<fix64>(tmptime32);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
Last_teleport_time = (fix64)tmptime32;
Last_teleport_time = static_cast<fix64>(tmptime32);
#if defined(DXX_BUILD_DESCENT_II)
Boss_teleport_interval =
#endif
@ -4666,10 +4666,10 @@ int ai_restore_state(PHYSFS_File *fp, int version, int swap)
PHYSFSX_readSXE32(fp, swap);
PHYSFSX_readSXE32(fp, swap);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
Last_gate_time = (fix64)tmptime32;
Last_gate_time = static_cast<fix64>(tmptime32);
Gate_interval = PHYSFSX_readSXE32(fp, swap);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
Boss_dying_start_time = (fix64)tmptime32;
Boss_dying_start_time = static_cast<fix64>(tmptime32);
Boss_dying = PHYSFSX_readSXE32(fp, swap);
Boss_dying_sound_playing = PHYSFSX_readSXE32(fp, swap);
#if defined(DXX_BUILD_DESCENT_I)
@ -4678,12 +4678,12 @@ int ai_restore_state(PHYSFS_File *fp, int version, int swap)
PHYSFSX_readSXE32(fp, swap);
#elif defined(DXX_BUILD_DESCENT_II)
tmptime32 = PHYSFSX_readSXE32(fp, swap);
Boss_hit_time = (fix64)tmptime32;
Boss_hit_time = static_cast<fix64>(tmptime32);
if (version >= 8) {
Escort_kill_object = PHYSFSX_readSXE32(fp, swap);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
Escort_last_path_created = (fix64)tmptime32;
Escort_last_path_created = static_cast<fix64>(tmptime32);
Escort_goal_object = static_cast<escort_goal_t>(PHYSFSX_readSXE32(fp, swap));
Escort_special_goal = static_cast<escort_goal_t>(PHYSFSX_readSXE32(fp, swap));
Escort_goal_index = PHYSFSX_readSXE32(fp, swap);

2
similar/main/newdemo.cpp
View file

@ -636,7 +636,7 @@ static void nd_read_object(const vobjptridx_t obj)
// MWA old way -- won't work with big endian machines nd_read_byte((uint8_t *)&(obj->lifeleft));
nd_read_byte(&b);
obj->lifeleft = (fix)b;
obj->lifeleft = static_cast<fix>(b);
if (obj->lifeleft == -1)
obj->lifeleft = IMMORTAL_TIME;
else

4
similar/main/state.cpp
View file

@ -1407,7 +1407,7 @@ int state_restore_all_sub(const char *filename, const secret_restore secret)
//Restore GameTime
tmptime32 = PHYSFSX_readSXE32(fp, swap);
GameTime64 = (fix64)tmptime32;
GameTime64 = static_cast<fix64>(tmptime32);
// Start new game....
callsign_t org_callsign;
@ -1711,7 +1711,7 @@ int state_restore_all_sub(const char *filename, const secret_restore secret)
if (version >= 12) {
Flash_effect = PHYSFSX_readSXE32(fp, swap);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
Time_flash_last_played = (fix64)tmptime32;
Time_flash_last_played = static_cast<fix64>(tmptime32);
PaletteRedAdd = PHYSFSX_readSXE32(fp, swap);
PaletteGreenAdd = PHYSFSX_readSXE32(fp, swap);
PaletteBlueAdd = PHYSFSX_readSXE32(fp, swap);