(svn r13024) -Codechange: do not use WE_MOUSELOOP when WE_TICK suffices, rename WE_4 to something more descriptive and correct some (completely incorrect) comments.
--- a/src/airport_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/airport_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -230,7 +230,7 @@
}
} break;
- case WE_MOUSELOOP: {
+ case WE_TICK: {
if (WP(w, def_d).close) {
delete w;
return;
--- a/src/dock_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/dock_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -274,7 +274,7 @@
}
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
if (WP(w, def_d).close) {
delete w;
return;
@@ -349,7 +349,7 @@
}
} break;
- case WE_MOUSELOOP:
+ case WE_TICK:
if (WP(w, def_d).close) delete w;
break;
--- a/src/industry_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/industry_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -881,7 +881,7 @@
}
break;
- case WE_4:
+ case WE_100_TICKS:
w->SetDirty();
break;
--- a/src/misc_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/misc_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -401,7 +401,7 @@
if (_right_button_down) delete w;
break;
- case WE_4:
+ case WE_100_TICKS:
if (--_errmsg_duration == 0) delete w;
break;
--- a/src/music_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/music_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -463,7 +463,7 @@
}
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
InvalidateWindowWidget(WC_MUSIC_WINDOW, 0, 7);
break;
}
--- a/src/openttd.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/openttd.cpp Fri May 09 09:29:27 2008 +0000
@@ -97,6 +97,7 @@
void ResetMusic();
void ResetOldNames();
void ProcessAsyncSaveFinish();
+void CallWindowTickEvent();
extern void SetDifficultyLevel(int mode, GameOptions *gm_opt);
extern Player* DoStartupNewPlayer(bool is_ai);
--- a/src/player_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/player_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -1309,7 +1309,7 @@
}
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
/* redraw the window every now and then */
if ((++w->vscroll.pos & 0x1F) == 0) w->SetDirty();
break;
--- a/src/rail_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/rail_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -1122,7 +1122,7 @@
w->SetDirty();
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
if (WP(w, def_d).close) {
delete w;
return;
@@ -1345,7 +1345,7 @@
w->SetDirty();
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
if (WP(w, def_d).close) delete w;
return;
@@ -1436,7 +1436,7 @@
}
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
if (WP(w, def_d).close) delete w;
return;
@@ -1535,7 +1535,7 @@
break;
}
- case WE_MOUSELOOP:
+ case WE_TICK:
if (WP(w, def_d).close) delete w;
break;
--- a/src/road_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/road_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -762,7 +762,7 @@
}
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
if (WP(w, def_d).close) delete w;
break;
@@ -919,7 +919,7 @@
}
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
if (WP(w, def_d).close) {
delete w;
return;
--- a/src/settings_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/settings_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -655,7 +655,7 @@
break;
} break;
- case WE_MOUSELOOP: /* Handle the visual 'clicking' of the buttons */
+ case WE_TICK: /* Handle the visual 'clicking' of the buttons */
if (diffic_d->timeout != 0) {
diffic_d->timeout--;
if (diffic_d->timeout == 0) diffic_d->clicked_button = NO_SETTINGS_BUTTON;
--- a/src/smallmap_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/smallmap_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -982,7 +982,7 @@
}
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
/* update the window every now and then */
if ((++w->vscroll.pos & 0x1F) == 0) w->SetDirty();
break;
--- a/src/toolbar_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/toolbar_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -745,7 +745,7 @@
w->SetDirty();
break;
- case WE_MOUSELOOP:
+ case WE_TICK:
if (w->IsWidgetLowered(0) != !!_pause_game) {
w->ToggleWidgetLoweredState(0);
w->InvalidateWidget(0);
@@ -1017,7 +1017,7 @@
}
} break;
- case WE_MOUSELOOP:
+ case WE_TICK:
if (w->IsWidgetLowered(0) != !!_pause_game) {
w->ToggleWidgetLoweredState(0);
w->SetDirty();
--- a/src/town_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/town_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -252,7 +252,7 @@
}
break;
- case WE_4:
+ case WE_100_TICKS:
w->SetDirty();
break;
}
@@ -555,7 +555,7 @@
}
break;
- case WE_4:
+ case WE_100_TICKS:
w->SetDirty();
break;
--- a/src/vehicle_gui.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/vehicle_gui.cpp Fri May 09 09:29:27 2008 +0000
@@ -2157,7 +2157,7 @@
DeleteWindowById(WC_VEHICLE_TIMETABLE, w->window_number);
break;
- case WE_MOUSELOOP: {
+ case WE_TICK: {
const Vehicle *v = GetVehicle(w->window_number);
bool veh_stopped = v->IsStoppedInDepot();
--- a/src/window.cpp Fri May 09 07:47:30 2008 +0000
+++ b/src/window.cpp Fri May 09 09:29:27 2008 +0000
@@ -1984,7 +1984,7 @@
if (t >= 100) {
for (wz = _last_z_window; wz != _z_windows;) {
- CallWindowEventNP(*--wz, WE_4);
+ CallWindowEventNP(*--wz, WE_100_TICKS);
}
t = 0;
}
--- a/src/window_gui.h Fri May 09 07:47:30 2008 +0000
+++ b/src/window_gui.h Fri May 09 09:29:27 2008 +0000
@@ -117,10 +117,10 @@
WE_DOUBLE_CLICK, ///< Left mouse button double click
WE_RCLICK, ///< Right mouse button click
WE_MOUSEOVER,
- WE_MOUSELOOP,
WE_MOUSEWHEEL,
- WE_TICK, ///< Regularly occurring event (about once every 20 seconds orso, 10 days) for slowly changing content (typically list sorting)
- WE_4, ///< Regularly occurring event for updating continuously changing window content (other than view ports), or timer expiring
+ WE_MOUSELOOP, ///< Event for each mouse event in the game (at least once every game tick)
+ WE_TICK, ///< Regularly occurring event (every game tick)
+ WE_100_TICKS, ///< Regularly occurring event (every 100 game ticks, approximatelly 3 seconds)
WE_TIMEOUT,
WE_PLACE_OBJ,
WE_ABORT_PLACE_OBJ,
@@ -504,7 +504,6 @@
/* window.cpp */
void CallWindowEventNP(Window *w, int event);
-void CallWindowTickEvent();
Window *BringWindowToFrontById(WindowClass cls, WindowNumber number);
Window *FindWindowFromPt(int x, int y);