Author: euschn
Date: Tue Jun 23 09:08:50 2009
New Revision: 36356
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36356&view=rev
Log:
removed unused unused parameter from get_player_info()
Modified:
trunk/src/gamestatus.cpp
trunk/src/gamestatus.hpp
trunk/src/play_controller.cpp
Modified: trunk/src/gamestatus.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gamestatus.cpp?rev=36356&r1=36355&r2=36356&view=diff
==============================================================================
--- trunk/src/gamestatus.cpp (original)
+++ trunk/src/gamestatus.cpp Tue Jun 23 09:08:50 2009
@@ -887,7 +887,7 @@
void game_state::get_player_info(const config& cfg,
std::string save_id,
std::vector<team>& teams,
const config& level, gamemap& map,
unit_map& units,
- gamestatus& /*game_status*/,
tod_manager& tod_mng, bool snapshot)
+ tod_manager& tod_mng, bool snapshot)
{
player_info *player = NULL;
Modified: trunk/src/gamestatus.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gamestatus.hpp?rev=36356&r1=36355&r2=36356&view=diff
==============================================================================
--- trunk/src/gamestatus.hpp (original)
+++ trunk/src/gamestatus.hpp Tue Jun 23 09:08:50 2009
@@ -28,7 +28,6 @@
#include <vector>
class unit;
-class gamestatus; //needed to declare get_player_info (until game_state and
gamestatus get merged)
class tod_manager;
class scoped_wml_variable;
@@ -147,7 +146,7 @@
// populate high-level objects
- void get_player_info(const config& cfg, std::string save_id,
std::vector<team>& teams, const config& level, gamemap& map, unit_map& units,
gamestatus& game_status, tod_manager& tod_mng, bool snapshot);
+ void get_player_info(const config& cfg, std::string save_id,
std::vector<team>& teams, const config& level, gamemap& map, unit_map& units,
tod_manager& tod_mng, bool snapshot);
game_classification& classification() { return classification_; }
const game_classification& classification() const { return
classification_; } //FIXME: const getter to allow use from const
gamestatus::sog() (see ai.cpp:344) - remove after merge?
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=36356&r1=36355&r2=36356&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Tue Jun 23 09:08:50 2009
@@ -141,7 +141,7 @@
if (first_human_team_ == -1){
first_human_team_ =
team_manager_.get_first_human_team(ui, unit_cfg, preferences::client_type(),
preferences::login());
}
- gamestate_.get_player_info(**ui, save_id, teams_, level_, map_,
units_, status_, tod_manager_, snapshot);
+ gamestate_.get_player_info(**ui, save_id, teams_, level_, map_,
units_, tod_manager_, snapshot);
}
LOG_NG << "loading units..." << (SDL_GetTicks() - ticks_) << "\n";
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
