Commits

David Stone committed b2da177

Reduced some unneeded padding in classes.

Comments (0)

Files changed (7)

source/clients/pokemon_lab/battle_settings.cpp

 
 BattleSettings::BattleSettings (uint8_t battle_generation, uint32_t battle_active_party_size, uint32_t battle_max_team_length):
 	network::GenericBattleSettings (),
-	generation (battle_generation),
 	active_party_size (battle_active_party_size),
-	max_team_length (battle_max_team_length) {
+	max_team_length (battle_max_team_length),
+	generation (battle_generation) {
 }
 
 bool BattleSettings::are_acceptable () const {

source/clients/pokemon_lab/battle_settings.hpp

 namespace pl {
 
 class BattleSettings : public network::GenericBattleSettings {
-	private:
-		uint8_t generation;
-		uint32_t active_party_size;
-		uint32_t max_team_length;
 	public:
 		BattleSettings (uint8_t battle_generation, uint32_t battle_active_party_size, uint32_t battle_max_team_length);
 		bool are_acceptable () const;
+	private:
+		uint32_t active_party_size;
+		uint32_t max_team_length;
+		uint8_t generation;
 };
 
 }	// namespace pl

source/clients/pokemon_online/battle.hpp

 		void parse_spot_shifts (InMessage & msg);
 		void parse_battle_end (InMessage & msg);
 		uint16_t max_damage_precision () const;
+		Party last_attacker;
 		OutMessage action;
-		Party last_attacker;
 };
 
 }	// namespace po

source/clients/pokemon_online/battle_settings.hpp

 };
 
 class BattleConfiguration {
+	public:
+		BattleConfiguration (InMessage & msg);
 	private:
 		uint8_t const generation;
 		uint8_t const mode;
-	public:
 		uint32_t const id1;
 		uint32_t const id2;
-	private:
 		uint32_t const clauses;
-	public:
 		BattleSettings const settings;
-		BattleConfiguration (InMessage & msg);
 };
 
 }	// namespace po

source/clients/pokemon_online/client.hpp

 		// of a new battle to prevent counter-teaming. It's only used when challenged.
 		Team team;
 	private:
-		uint32_t my_id;
 		std::map <uint32_t, std::string> user_id_to_name;
 		std::map <std::string, uint32_t> user_name_to_id;
 		std::map <std::string, uint32_t> channel_to_id;
 		std::map <uint32_t, std::string> id_to_channel;
+		uint32_t my_id;
 };
 
 }	// namespace po

source/team_predictor/detailed_stats.cpp

 }	// unnamed namespace
 
 DetailedStats::DetailedStats():
+	item(),
 	ability(),
-	item(),
 	nature() {
 	static std::string const file_name = "settings/Generation 4/OU/detailed.xml";
 	boost::property_tree::ptree pt;

source/team_predictor/detailed_stats.hpp

 		template<typename T>
 		T const & get(Species species) const;
 	private:
+		std::array<std::vector<Moves>, number_of_species> move;
+		std::array<Item::Items, number_of_species> item;
 		std::array<Ability::Abilities, number_of_species> ability;
-		std::array<Item::Items, number_of_species> item;
 		std::array<Nature::Natures, number_of_species> nature;
-		std::array<std::vector<Moves>, number_of_species> move;
 };
 
 }	// namespace technicalmachine