0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kill an always true bool

Browse source 
Supposed to track change but broken. Not worth the trouble since when
there is no change, there is not much to skip
This commit is contained in:
Ali El Gariani 2010-09-14 05:37:46 +00:00
parent 8b2494e69f
commit c375a1e32d
2 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/display.cpp
View file

@ -1222,12 +1222,10 @@ void display::set_diagnostic(const std::string& msg)
}
}
bool display::draw_init()
void display::draw_init()
{
bool changed = false;
if (get_map().empty()) {
return changed;
return;
}
if(benchmark) {
@ -1237,7 +1235,6 @@ bool display::draw_init()
if(!panelsDrawn_) {
draw_all_panels();
panelsDrawn_ = true;
changed = true;
}
if(redraw_background_) {
@ -1263,11 +1260,9 @@ bool display::draw_init()
redrawMinimap_ = true;
}
return changed;
}
void display::draw_wrap(bool update,bool force,bool changed)
void display::draw_wrap(bool update, bool force)
{
static const int time_between_draws = preferences::draw_delay();
const int current_time = SDL_GetTicks();
@ -1276,22 +1271,18 @@ void display::draw_wrap(bool update,bool force,bool changed)
if(redrawMinimap_) {
redrawMinimap_ = false;
draw_minimap();
changed = true;
}
if(update) {
if(force || changed) {
update_display();
if(!force && wait_time > 0) {
// If it's not time yet to draw, delay until it is
SDL_Delay(wait_time);
}
update_display();
if(!force && wait_time > 0) {
// If it's not time yet to draw, delay until it is
SDL_Delay(wait_time);
}
// Set the theortical next draw time
nextDraw_ += time_between_draws;
// If the next draw already should have been finished,
// we'll enter an update frenzy, so make sure that the
// too late value doesn't keep growing.
@ -1946,7 +1937,7 @@ void display::draw(bool update,bool force) {
local_tod_light_ = has_time_area() && preferences::get("local_tod_light", false);
bool changed = draw_init();
draw_init();
pre_draw();
// invalidate all that needs to be invalidated
invalidate_animations();
@ -1969,19 +1960,17 @@ void display::draw(bool update,bool force) {
* ran if invalidated_.empty() == true.
*/
if(!invalidated_.empty() || preferences::show_haloes()) {
changed = true;
draw_invalidated();
invalidated_.clear();
}
drawing_buffer_commit();
post_commit();
draw_sidebar();
/** @todo FIXME: This changed can probably be smarter */
changed = true;
// Simulate slow PC:
//SDL_Delay(2*simulate_delay + rand() % 20);
}
draw_wrap(update, force, changed);
draw_wrap(update, force);
}
map_labels& display::labels()

4
src/display.hpp
View file

@ -823,8 +823,8 @@ protected:
* Invalidate controls and panels when changed after they have been drawn
* initially. Useful for dynamic theme modification.
*/
bool draw_init();
void draw_wrap(bool update,bool force,bool changed);
void draw_init();
void draw_wrap(bool update,bool force);
/** Used to indicate to drawing funtions that we are doing a map screenshot */
bool map_screenshot_;