From cc74c91c8928c7202c6c96f6efbe6565e4070930 Mon Sep 17 00:00:00 2001 From: Kp Date: Wed, 17 Aug 2016 04:44:22 +0000 Subject: [PATCH] Remove useless casts in similar/main/newdemo.cpp --- similar/main/newdemo.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/similar/main/newdemo.cpp b/similar/main/newdemo.cpp index f4170a838..6e51781ec 100644 --- a/similar/main/newdemo.cpp +++ b/similar/main/newdemo.cpp @@ -640,7 +640,7 @@ static void nd_read_object(const vobjptridx_t obj) if (obj->lifeleft == -1) obj->lifeleft = IMMORTAL_TIME; else - obj->lifeleft = static_cast(static_cast(obj->lifeleft) << 12); + obj->lifeleft = obj->lifeleft << 12; } if ((obj->type == OBJ_ROBOT) && !shareware) { @@ -1850,7 +1850,7 @@ static int newdemo_read_demo_start(enum purpose_type purpose) #if defined(DXX_BUILD_DESCENT_I) if (shareware) { - nd_read_byte(reinterpret_cast(&c)); + nd_read_byte(&c); if (c != ND_EVENT_NEW_LEVEL) { auto flags = get_local_player_flags().get_player_flags(); energy = shield; @@ -1919,7 +1919,7 @@ static int newdemo_read_frame_information(int rewrite) done=1; nd_read_short(&last_frame_length); nd_read_int(&nd_playback_v_framecount); - nd_read_int(reinterpret_cast(&nd_recorded_time)); + nd_read_int(&nd_recorded_time); if (nd_playback_v_bad_read) { done = -1; break; } if (rewrite) { @@ -2580,7 +2580,7 @@ static int newdemo_read_frame_information(int rewrite) nd_write_short(distance); break; } - get_local_plrobj().ctype.player_info.homing_object_dist = i2f(static_cast(distance << 16)); + get_local_plrobj().ctype.player_info.homing_object_dist = i2f(distance << 16); break; } @@ -3345,8 +3345,8 @@ void newdemo_goto_end(int to_rewrite) if (Newdemo_game_mode & GM_MULTI_COOP) { nd_read_int(&(i.score)); } else { - nd_read_short(reinterpret_cast(&i.net_killed_total)); - nd_read_short(reinterpret_cast(&i.net_kills_total)); + nd_read_short(&i.net_killed_total); + nd_read_short(&i.net_kills_total); } } } else {