Merge 1.9.0-beta2

src/window_gui.h

@@ -1,4 +1,4 @@
-/* $Id: window_gui.h 27147 2015-02-13 21:25:48Z frosch $ */
+/* $Id$ */
 
 /*
  * This file is part of OpenTTD.
@@ -679,13 +679,18 @@ public:
 	/**
 	 * Called once per (game) tick.
 	 */
-	virtual void OnTick() {}
+	virtual void OnGameTick() {}
 
 	/**
 	 * Called once every 100 (game) ticks.
 	 */
 	virtual void OnHundredthTick() {}
 
+	/**
+	 * Called periodically.
+	 */
+	virtual void OnRealtimeTick(uint delta_ms) {}
+
 	/**
 	 * Called when this window's timeout has been reached.
 	 */