Renamed bswap macros

Author: twist84

game/source/cseries/cseries.cpp

@@ -351,7 +351,7 @@ int32 __cdecl ascii_stricmp(char const* s1, char const* s2)
 
 char* tag_to_string(tag _tag, char* buffer)
 {
-	*(tag*)buffer = bswap_dword(_tag);
+	*(tag*)buffer = bswap_uint32(_tag);
 	buffer[4] = 0;
 
 	return buffer;

game/source/cseries/cseries.hpp

@@ -1349,67 +1349,67 @@ struct c_static_string
 		return csstrnlen(m_string, k_maximum_count);
 	}
 
-	bool is_equal(char const* _string) const
+	bool is_equal(char const* string) const
 	{
-		ASSERT(_string);
+		ASSERT(string);
 
-		return csstrnlen(_string, k_maximum_count) == length() && csmemcmp(get_string(), _string, length()) == 0;
+		return csstrnlen(string, k_maximum_count) == length() && csmemcmp(get_string(), string, length()) == 0;
 	}
 
-	bool starts_with(char const* _string) const
+	bool starts_with(char const* string) const
 	{
-		ASSERT(_string);
+		ASSERT(string);
 
-		return csmemcmp(_string, get_string(), csstrnlen(_string, k_maximum_count)) == 0;
+		return csmemcmp(string, get_string(), csstrnlen(string, k_maximum_count)) == 0;
 	}
 
-	bool ends_with(char const* _string) const
+	bool ends_with(char const* string) const
 	{
-		ASSERT(_string);
+		ASSERT(string);
 
 		int32 _length = length();
-		int32 suffix_length = csstrnlen(_string, k_maximum_count);
+		int32 suffix_length = csstrnlen(string, k_maximum_count);
 
 		if (suffix_length > _length)
 			return false;
 
 		char const* suffix = get_string() + (_length - suffix_length);
 
-		bool result = csmemcmp(suffix, _string, suffix_length) == 0;
+		bool result = csmemcmp(suffix, string, suffix_length) == 0;
 		return result;
 	}
 
-	int32 next_index_of(char const* _string, int32 index) const
+	int32 next_index_of(char const* string, int32 index) const
 	{
-		ASSERT(_string);
+		ASSERT(string);
 
 		int32 result = NONE;
 
 		if (index < length())
 		{
-			char const* s = csstrstr(m_string + index, _string);
+			char const* s = csstrstr(m_string + index, string);
 			if (s)
 				result = s - get_string();
 		}
 
 		return result;
 	}
 
-	int32 index_of(char const* _string) const
+	int32 index_of(char const* string) const
 	{
-		ASSERT(_string);
+		ASSERT(string);
 
-		return next_index_of(_string, 0);
+		return next_index_of(string, 0);
 	}
 
-	void set_bounded(char const* _string, int32 _length)
+	void set_bounded(char const* string, int32 _length)
 	{
 		if (_length + 1 < k_maximum_count)
 			_length++;
 		else
 			_length = k_maximum_count;
 
-		csstrnzcpy(m_string, _string, _length);
+		csstrnzcpy(m_string, string, _length);
 	}
 
 	bool substring(int32 index, int32 _length, c_static_string<k_maximum_count>& s) const

game/source/game/game_engine_assault.cpp

@@ -10,20 +10,20 @@ void c_game_engine_assault_variant::byteswap()
 {
 	c_game_engine_base_variant::byteswap();
 
-	bswap_word_inplace(m_variant_flags);
-	bswap_word_inplace(m_respawn);
-	bswap_word_inplace(m_game_type);
-	bswap_word_inplace(m_enemy_bomb_waypoint);
-	bswap_word_inplace(m_score_to_win);
-	bswap_word_inplace(m_score_unknown0);
-	bswap_word_inplace(m_score_unknown1);
-	bswap_word_inplace(m_score_unknown2);
-	bswap_word_inplace(m_score_unknown3);
-	bswap_word_inplace(m_sudden_death_time);
-	bswap_word_inplace(m_bomb_reset_time);
-	bswap_word_inplace(m_bomb_arming_time);
-	bswap_word_inplace(m_bomb_disarming_time);
-	bswap_word_inplace(m_bomb_fuse_time);
+	bswap_uint16_inplace(m_variant_flags);
+	bswap_uint16_inplace(m_respawn);
+	bswap_uint16_inplace(m_game_type);
+	bswap_uint16_inplace(m_enemy_bomb_waypoint);
+	bswap_uint16_inplace(m_score_to_win);
+	bswap_uint16_inplace(m_score_unknown0);
+	bswap_uint16_inplace(m_score_unknown1);
+	bswap_uint16_inplace(m_score_unknown2);
+	bswap_uint16_inplace(m_score_unknown3);
+	bswap_uint16_inplace(m_sudden_death_time);
+	bswap_uint16_inplace(m_bomb_reset_time);
+	bswap_uint16_inplace(m_bomb_arming_time);
+	bswap_uint16_inplace(m_bomb_disarming_time);
+	bswap_uint16_inplace(m_bomb_fuse_time);
 	m_carrier_traits.byteswap();
 	m_arming_traits.byteswap();
 

game/source/game/game_engine_ctf.cpp

@@ -10,11 +10,11 @@ void c_game_engine_ctf_variant::byteswap()
 {
 	c_game_engine_base_variant::byteswap();
 
-	bswap_word_inplace(m_touch_return_timeout);
-	bswap_word_inplace(m_sudden_death_time);
-	bswap_word_inplace(m_score_to_win);
-	bswap_word_inplace(m_score_unknown);
-	bswap_word_inplace(m_flag_reset_time);
+	bswap_uint16_inplace(m_touch_return_timeout);
+	bswap_uint16_inplace(m_sudden_death_time);
+	bswap_uint16_inplace(m_score_to_win);
+	bswap_uint16_inplace(m_score_unknown);
+	bswap_uint16_inplace(m_flag_reset_time);
 	m_carrier_traits.byteswap();
 
 	ASSERT(array_is_zeroed(m_pad1));

game/source/game/game_engine_default.cpp

@@ -326,8 +326,8 @@ void c_game_engine_base_variant::byteswap()
 	m_respawn_options.byteswap();
 	m_social_options.byteswap();
 	m_map_override_options.byteswap();
-	bswap_word_inplace(m_flags);
-	bswap_word_inplace(m_team_scoring_method);
+	bswap_uint16_inplace(m_flags);
+	bswap_uint16_inplace(m_team_scoring_method);
 }
 
 void c_game_engine_base_variant::set(c_game_engine_base_variant const* variant, bool force)

game/source/game/game_engine_infection.cpp

@@ -10,7 +10,7 @@ void c_game_engine_infection_variant::byteswap()
 {
 	c_game_engine_base_variant::byteswap();
 
-	bswap_word_inplace(m_safe_haven_movement_time);
+	bswap_uint16_inplace(m_safe_haven_movement_time);
 	m_zombie_traits.byteswap();
 	m_first_zombie_traits.byteswap();
 	m_safe_haven_defender_traits.byteswap();

game/source/game/game_engine_juggernaut.cpp

@@ -10,8 +10,8 @@ void c_game_engine_juggernaut_variant::byteswap()
 {
 	c_game_engine_base_variant::byteswap();
 
-	bswap_word_inplace(m_score_to_win_round);
-	bswap_word_inplace(m_score_unknown);
+	bswap_uint16_inplace(m_score_to_win_round);
+	bswap_uint16_inplace(m_score_unknown);
 
 	ASSERT(array_is_zeroed(m_pad));
 

game/source/game/game_engine_king.cpp

@@ -10,9 +10,9 @@ void c_game_engine_king_variant::byteswap()
 {
 	c_game_engine_base_variant::byteswap();
 
-	bswap_dword_inplace(m_variant_flags);
-	bswap_word_inplace(m_score_to_win);
-	bswap_word_inplace(m_score_unknown);
+	bswap_uint32_inplace(m_variant_flags);
+	bswap_uint16_inplace(m_score_to_win);
+	bswap_uint16_inplace(m_score_unknown);
 	m_inside_hill_traits.byteswap();
 
 	ASSERT(array_is_zeroed(m_pad1));

game/source/game/game_engine_oddball.cpp

@@ -10,12 +10,12 @@ void c_game_engine_oddball_variant::byteswap()
 {
 	c_game_engine_base_variant::byteswap();
 
-	bswap_dword_inplace(m_variant_flags);
-	bswap_word_inplace(m_score_to_win);
-	bswap_word_inplace(m_score_unknown);
-	bswap_word_inplace(m_carrying_points);
-	bswap_word_inplace(m_ball_spawn_delay);
-	bswap_word_inplace(m_ball_inactive_respawn_delay);
+	bswap_uint32_inplace(m_variant_flags);
+	bswap_uint16_inplace(m_score_to_win);
+	bswap_uint16_inplace(m_score_unknown);
+	bswap_uint16_inplace(m_carrying_points);
+	bswap_uint16_inplace(m_ball_spawn_delay);
+	bswap_uint16_inplace(m_ball_inactive_respawn_delay);
 	m_carrier_traits.byteswap();
 
 	ASSERT(array_is_zeroed(m_pad1));

game/source/game/game_engine_player_traits.cpp

@@ -432,7 +432,7 @@ real32 c_player_trait_shield_vitality::get_maximum_shield_vitality()
 
 void c_player_trait_weapons::byteswap()
 {
-	bswap_word_inplace(m_initial_grenade_count_setting);
+	bswap_uint16_inplace(m_initial_grenade_count_setting);
 }
 
 void c_player_trait_weapons::set(c_player_trait_weapons const* traits, bool force)
@@ -1039,8 +1039,8 @@ void c_player_trait_appearance::set_forced_change_color_setting(e_forced_change_
 
 void c_player_trait_sensors::byteswap()
 {
-	bswap_word_inplace(m_motion_tracker_setting);
-	bswap_word_inplace(m_motion_tracker_range_setting);
+	bswap_uint16_inplace(m_motion_tracker_setting);
+	bswap_uint16_inplace(m_motion_tracker_range_setting);
 }
 
 void c_player_trait_sensors::set(c_player_trait_sensors const* traits, bool force)