From cda35f1355c4e4dfe382b1cabf0653e35025300f Mon Sep 17 00:00:00 2001 From: bjarni Date: Wed, 27 Sep 2006 14:05:15 +0000 Subject: [PATCH] (svn r6527) -Codechange: [depot window] added asserts to ensure that widget names, widget array and array of resize info stays the same length Really bad stuff will happen if one of them contains a different number of widgets ;) This is meant as a protection against incorrect additions of code rather than verifying that the current code works --- depot_gui.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/depot_gui.c b/depot_gui.c index 31ecd71f57..951141d274 100644 --- a/depot_gui.c +++ b/depot_gui.c @@ -56,6 +56,7 @@ typedef enum DepotWindowWidgets { DEPOT_WIDGET_CLONE, DEPOT_WIDGET_LOCATION, DEPOT_WIDGET_RESIZE, + DEPOT_WIDGET_LAST, // used to assert if DepotWindowWidgets and widget_moves got different lengths. Due to this usage, it needs to be last } DepotWindowWidget; /* Define how to move each widget. The order is important */ @@ -738,6 +739,10 @@ void ShowDepotWindow(TileIndex tile, byte type) { Window *w; + /* First we ensure that the widget counts are equal in all 3 lists to prevent bad stuff from happening */ + assert(lengthof(widget_moves) == lengthof(_depot_widgets)); + assert(lengthof(widget_moves) == DEPOT_WIDGET_LAST); + switch (type) { case VEH_Train: w = AllocateWindowDescFront(&_train_depot_desc, tile); break; case VEH_Road: w = AllocateWindowDescFront(&_road_depot_desc, tile); break;