(svn r13015) -Codechange: move some 'WP' structs out of window_gui.h to the .cpp files where they are actually used.

1 files changed, 14 insertions, 2 deletions

diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index cdb6e30bb..aaa75d7a2 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -97,8 +97,7 @@ static void Place_LandInfo(TileIndex tile)
 {
 	DeleteWindowById(WC_LAND_INFO, 0);
 
-	Window *w = new Window(&_land_info_desc);
-	WP(w, void_d).data = &_landinfo_data;
+	new Window(&_land_info_desc);
 
 	Player *p = GetPlayer(IsValidPlayer(_local_player) ? _local_player : PLAYER_FIRST);
 	Town *t = ClosestTownFromTile(tile, _patches.dist_local_authority);
@@ -202,6 +201,12 @@ void PlaceLandBlockInfo()
 	}
 }
 
+struct scroller_d {
+	int height;
+	uint16 counter;
+};
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(scroller_d));
+
 static const char *credits[] = {
 	/*************************************************************************
 	 *                      maximum length of string which fits in window   -^*/
@@ -519,6 +524,13 @@ void HideFillingPercent(TextEffectID te_id)
 	if (te_id != INVALID_TE_ID) RemoveTextEffect(te_id);
 }
 
+struct tooltips_d {
+	StringID string_id;
+	byte paramcount;
+	uint64 params[5];
+};
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(tooltips_d));
+
 static const Widget _tooltips_widgets[] = {
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   199,     0,    31, 0x0, STR_NULL},
 {   WIDGETS_END},