diff options
| -rw-r--r-- | src/misc_gui.cpp | 16 | ||||
| -rw-r--r-- | src/player_gui.cpp | 6 | ||||
| -rw-r--r-- | src/smallmap_gui.cpp | 7 | ||||
| -rw-r--r-- | src/vehicle_gui.cpp | 5 | ||||
| -rw-r--r-- | src/window_gui.h | 43 |
5 files changed, 32 insertions, 45 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}, diff --git a/src/player_gui.cpp b/src/player_gui.cpp index 4724a0dbb..845d5249f 100644 --- a/src/player_gui.cpp +++ b/src/player_gui.cpp @@ -42,6 +42,12 @@ struct facesel_d { }; assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(facesel_d)); +struct highscore_d { + uint32 background_img; + int8 rank; +}; +assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(highscore_d)); + enum { FIRST_GUI_CALL = INT_MAX, ///< default value to specify thuis is the first call of the resizable gui }; diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 9651bf12f..5ea843f4f 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -32,6 +32,13 @@ #include "table/strings.h" #include "table/sprites.h" +struct smallmap_d { + int32 scroll_x; + int32 scroll_y; + int32 subscroll; +}; +assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(smallmap_d)); + static const Widget _smallmap_widgets[] = { { WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CAPTION, RESIZE_RIGHT, 13, 11, 337, 0, 13, STR_00B0_MAP, STR_018C_WINDOW_TITLE_DRAG_THIS}, diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index bab13faa5..c35560e77 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -40,6 +40,11 @@ #include "table/sprites.h" #include "table/strings.h" +struct vehicledetails_d { + byte tab; +}; +assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vehicledetails_d)); + struct refit_d { int sel; struct RefitOption *cargo; diff --git a/src/window_gui.h b/src/window_gui.h index 27f914770..c9c1b91bb 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -379,18 +379,6 @@ struct def_d { }; assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(def_d)); -struct void_d { - void *data; -}; -assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(void_d)); - -struct tooltips_d { - StringID string_id; - byte paramcount; - uint64 params[5]; -}; -assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(tooltips_d)); - struct depot_d { VehicleID sel; VehicleType type; @@ -404,18 +392,6 @@ struct depot_d { }; assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(depot_d)); -struct vehicledetails_d { - byte tab; -}; -assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vehicledetails_d)); - -struct smallmap_d { - int32 scroll_x; - int32 scroll_y; - int32 subscroll; -}; -assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(smallmap_d)); - struct vp_d { VehicleID follow_vehicle; int32 scrollpos_x; @@ -426,18 +402,6 @@ struct vp_d { }; assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vp_d)); -struct highscore_d { - uint32 background_img; - int8 rank; -}; -assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(highscore_d)); - -struct scroller_d { - int height; - uint16 counter; -}; -assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(scroller_d)); - enum SortListFlags { VL_NONE = 0, ///< no sort VL_DESC = 1 << 0, ///< sort descending or ascending @@ -461,13 +425,6 @@ struct list_d { }; assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(list_d)); -struct message_d { - int msg; - int wparam; - int lparam; -}; -assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(message_d)); - struct vehiclelist_d { const Vehicle** sort_list; // List of vehicles (sorted) Listing *_sorting; // pointer to the appropiate subcategory of _sorting |