openttd-mini: comparison src/bridge

equal deleted inserted replaced

-:5476e1a21517
+:95e9cbc0257e
 	uint32 type;
 	GUIBridgeList *bridges;
 	void BuildBridge(uint8 i)
 	{
-		DoCommandP(this->end_tile, this->start_tile, this->type | this->bridges->sort_list[i].index,
+		DoCommandP(this->end_tile, this->start_tile, this->type | this->bridges->Get(i)->index,
 				CcBuildBridge, CMD_BUILD_BRIDGE | CMD_MSG(STR_5015_CAN_T_BUILD_BRIDGE_HERE));
 	}
 	/** Sort the builable bridges */
 	void SortBridgeList()
 	{
 		/* Skip sorting if resort bit is not set */
 		if (!(bridges->flags & VL_RESORT)) return;
-		qsort(this->bridges->sort_list, this->bridges->list_length, sizeof(this->bridges->sort_list[0]), _bridge_sorter[_bridge_sorting.criteria]);
+		qsort(this->bridges->Begin(), this->bridges->Length(), sizeof(this->bridges->Begin()), _bridge_sorter[_bridge_sorting.criteria]);
 		/* Display the current sort variant */
 		this->widget[BBSW_DROPDOWN_CRITERIA].data = _bridge_sort_listing[this->bridges->sort_type];
 		bridges->flags &= ~VL_RESORT;
 		/* Change the data, or the caption of the gui. Set it to road or rail, accordingly */
 		this->widget[BBSW_CAPTION].data = (GB(this->type, 15, 2) == TRANSPORT_ROAD) ? STR_1803_SELECT_ROAD_BRIDGE : STR_100D_SELECT_RAIL_BRIDGE;
 		this->resize.step_height = 22;
-		this->vscroll.count = bl->list_length;
+		this->vscroll.count = bl->Length();
 		if (this->last_size <= 4) {
 			this->vscroll.cap = 4;
 		} else {
 			/* Resize the bridge selection window if we used a bigger one the last time */
 		this->FindWindowPlacementAndResize(desc);
 	}
 	~BuildBridgeWindow()
 	{
-		free(this->bridges->sort_list);
 		delete bridges;
 	}
 	virtual void OnPaint()
 	{
 		this->DrawSortButtonState(BBSW_DROPDOWN_ORDER, (this->bridges->flags & VL_DESC) ? SBS_DOWN : SBS_UP);
 		uint y = this->widget[BBSW_BRIDGE_LIST].top + 2;
-		for (int i = this->vscroll.pos; (i < (this->vscroll.cap + this->vscroll.pos)) && (i < this->bridges->list_length); i++) {
+		for (int i = this->vscroll.pos; (i < (this->vscroll.cap + this->vscroll.pos)) && (i < (int)this->bridges->Length()); i++) {
-			const BridgeSpec *b = this->bridges->sort_list[i].spec;
+			const BridgeSpec *b = this->bridges->Get(i)->spec;
-			SetDParam(2, this->bridges->sort_list[i].cost);
+			SetDParam(2, this->bridges->Get(i)->cost);
 			SetDParam(1, b->speed * 10 / 16);
 			SetDParam(0, b->material);
 			DrawSprite(b->sprite, b->pal, 3, y);
 			DrawString(44, y, STR_500D, TC_FROMSTRING);
 	}
 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
 	{
 		const uint8 i = keycode - '1';
-		if (i < 9 && i < this->bridges->list_length) {
+		if (i < 9 && i < this->bridges->Length()) {
 			/* Build the requested bridge */
 			this->BuildBridge(i);
 			delete this;
 			return ES_HANDLED;
 		}
 			default: break;
 			case BBSW_BRIDGE_LIST: {
 				uint i = ((int)pt.y - this->widget[BBSW_BRIDGE_LIST].top) / this->resize.step_height;
 				if (i < this->vscroll.cap) {
 					i += this->vscroll.pos;
-					if (i < this->bridges->list_length) {
+					if (i < this->bridges->Length()) {
 						this->BuildBridge(i);
 						delete this;
 					}
 				}
 			} break;
 	virtual void OnResize(Point new_size, Point delta)
 	{
 		this->vscroll.cap += delta.y / (int)this->resize.step_height;
 		this->widget[BBSW_BRIDGE_LIST].data = (this->vscroll.cap << 8) + 1;
-		SetVScrollCount(this, this->bridges->list_length);
+		SetVScrollCount(this, this->bridges->Length());
 		this->last_size = this->vscroll.cap;
 	}
 };
 	WDP_AUTO, WDP_AUTO, 200, 114, 200, 114,
 	WC_BUILD_BRIDGE, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE,
 	_build_bridge_widgets,
 };
-/**
-* Add a buildable bridge to the list.
-*  If the list is empty a new one is created.
-*
-* @param bl The list which we want to manage
-* @param item The item to add
-* @return The pointer to the list
-*/
-static GUIBridgeList *PushBridgeList(GUIBridgeList *bl, BuildBridgeData item)
-{
-	if (bl == NULL) {
-		/* Create the list if needed */
-		bl = new GUIBridgeList();
-		bl->flags |= VL_RESORT;
-		if (_bridge_sorting.order) bl->flags |= VL_DESC;
-		bl->list_length = 1;
-		bl->sort_type = _bridge_sorting.criteria;
-	} else {
-		/* Resize the list */
-		bl->list_length++;
-	}
-	bl->sort_list = ReallocT(bl->sort_list, bl->list_length);
-	bl->sort_list[bl->list_length - 1] = item;
-	return bl;
-}
 /**
 * Prepare the data for the build a bridge window.
 *  If we can't build a bridge under the given conditions
 *  show an error message.
 		 * length of the middle parts of the bridge */
 		const uint bridge_len = GetTunnelBridgeLength(start, end);
 		/* total length of bridge */
 		const uint tot_bridgedata_len = CalcBridgeLenCostFactor(bridge_len + 2);
+		bl = new GUIBridgeList();
 		/* loop for all bridgetypes */
 		for (BridgeType brd_type = 0; brd_type != MAX_BRIDGES; brd_type++) {
 			if (CheckBridge_Stuff(brd_type, bridge_len)) {
 				/* bridge is accepted, add to list */
-				BuildBridgeData item;
+				BuildBridgeData *item = bl->Append();
-				item.index = brd_type;
+				item->index = brd_type;
-				item.spec = GetBridgeSpec(brd_type);
+				item->spec = GetBridgeSpec(brd_type);
 				/* Add to terraforming & bulldozing costs the cost of the
 				 * bridge itself (not computed with DC_QUERY_COST) */
-				item.cost = ret.GetCost() + (((int64)tot_bridgedata_len * _price.build_bridge * item.spec->price) >> 8);
+				item->cost = ret.GetCost() + (((int64)tot_bridgedata_len * _price.build_bridge * item->spec->price) >> 8);
-				bl = PushBridgeList(bl, item);
 			}
 		}
 	}
-	if (bl != NULL) {
+	if (bl != NULL && bl->Length() != 0) {
 		new BuildBridgeWindow(&_build_bridge_desc, start, end, type, bl);
 	} else {
+		if (bl != NULL) delete bl;
 		ShowErrorMessage(errmsg, STR_5015_CAN_T_BUILD_BRIDGE_HERE, TileX(end) * TILE_SIZE, TileY(end) * TILE_SIZE);
 	}
 }

changeset 9365	95e9cbc0257e
parent 9320	4e17d11b92e4
child 9367	a643c88b2791