Unused variables were commented out using //UNUSED:.

Sirp, grep for it and definitvely remove them if correct.
This commit is contained in:
zas 2003-09-19 14:25:26 +00:00
parent 41a3da1674
commit d68835f8ea
4 changed files with 10 additions and 13 deletions

View File

@ -852,7 +852,6 @@ TITLE_RESULT show_title(display& screen)
for(;;) {
int mousex, mousey;
const int mouse_flags = SDL_GetMouseState(&mousex,&mousey);
const bool left_button = mouse_flags&SDL_BUTTON_LMASK;
if(tutorial_button.process(mousex,mousey,left_button))

View File

@ -110,16 +110,15 @@ LEVEL_RESULT play_level(game_data& gameinfo, config& terrain_config,
(*overlay)->values["image"]);
}
const double scroll_speed = 30.0;
const double zoom_amount = 5.0;
//UNUSED: const double scroll_speed = 30.0;
//UNUSED: const double zoom_amount = 5.0;
for(units_map::iterator i = units.begin(); i != units.end(); ++i) {
i->second.new_turn();
}
bool left_button = false, right_button = false;
gamemap::location selected_hex;
//UNUSED: bool left_button = false, right_button = false;
//UNUSED: gamemap::location selected_hex;
gui.scroll_to_tile(map.starting_position(1).x,map.starting_position(1).y,
display::WARP);

View File

@ -46,7 +46,7 @@ void play_turn(game_data& gameinfo, game_state& state_of_game,
team& current_team = teams[team_num-1];
const double scroll_speed = 30.0;
const double zoom_amount = 5.0;
//UNUSED: const double zoom_amount = 5.0;
const std::string menu_items[] = {"scenario_objectives","recruit",
"recall","unit_list","save_game",
@ -129,12 +129,11 @@ void play_turn(game_data& gameinfo, game_state& state_of_game,
hex != selected_hex &&
enemy->second.side() != u->second.side()) {
const unit_type& type = u->second.type();
const unit_type& enemy_type = enemy->second.type();
//UNUSED: const unit_type& type = u->second.type();
//UNUSED: const unit_type& enemy_type = enemy->second.type();
const std::vector<attack_type>& attacks = u->second.attacks();
std::vector<std::string> items;
const std::vector<attack_type>& defends =
enemy->second.attacks();
//UNUSED: const std::vector<attack_type>& defends = enemy->second.attacks();
std::vector<unit> units_list;

View File

@ -202,7 +202,7 @@ void set_grid(bool ison)
void show_preferences_dialog(display& disp)
{
const int border_size = 6;
//UNUSED: const int border_size = 6;
const int xpos = disp.x()/2 - 300;
const int ypos = disp.y()/2 - 200;
const int width = 600;
@ -286,7 +286,7 @@ void show_preferences_dialog(display& disp)
const int mouse_flags = SDL_GetMouseState(&mousex,&mousey);
const bool left_button = mouse_flags&SDL_BUTTON_LMASK;
const bool right_button = mouse_flags&SDL_BUTTON_RMASK;
//UNUSED: const bool right_button = mouse_flags&SDL_BUTTON_RMASK;
if(close_button.process(mousex,mousey,left_button)) {
break;