Commits

David Stone  committed 7f017d6

Made a network client member function private instead of public. Removed a function that was defined in a base class.

  • Participants
  • Parent commits 0a01a50

Comments (0)

Files changed (2)

File source/clients/network/client.cpp

 }
 
 
-void Client::handle_incoming_challenge (std::string const & opponent, BattleSettings const & settings) {
-	bool const accepted = settings.are_acceptable () and is_trusted (opponent);
-	constexpr bool challenger = false;
-	handle_finalize_challenge (opponent, accepted, challenger);
-}
-
 std::string const & Client::username() const {
 	return current_username;
 }

File source/clients/network/client.hpp

 			read_header(msg);
 			io.run();
 		}
-		virtual void send_keep_alive_message () = 0;
 		std::string const & username() const;
 		std::string const & password() const;
 		void handle_server_message (std::string const & sender, std::string const & message) const;
-		void handle_incoming_challenge (std::string const & opponent, BattleSettings const & settings);
 		template<typename Battle, typename ... Args>
 		Battle const & add_pending_challenge(Args && ... args) {
 			return Base::add_pending_challenge<Battle>(std::forward<Args>(args)...);
 		bool is_trusted (std::string const & user) const;
 		void load_settings (bool reloading);
 		void connect ();
+		virtual void send_keep_alive_message () = 0;
 		virtual void join_channel (std::string const & channel) = 0;
 		virtual void part_channel (std::string const & channel) = 0;
 		bool is_highlighted (std::string const & message) const;