Changeset - r5071:949c4f7f3fa6
[Not reviewed]
master
0 9 0
Darkvater - 18 years ago 2006-11-11 09:47:44
darkvater@openttd.org
(svn r7129) -Codechange: Get rid of a global variable that only sets a window's number.
9 files changed with 18 insertions and 30 deletions:
0 comments (0 inline, 0 general)
aircraft_gui.c
Show inline comments
 
@@ -183,9 +183,7 @@ static void ShowAircraftDetailsWindow(co
 
	DeleteWindowById(WC_VEHICLE_ORDERS, veh);
 
	DeleteWindowById(WC_VEHICLE_DETAILS, veh);
 

	
 
	_alloc_wnd_parent_num = veh;
 
	w = AllocateWindowDesc(&_aircraft_details_desc);
 
	w->window_number = veh;
 
	w = AllocateWindowDescFront(&_aircraft_details_desc, veh);
 
	w->caption_color = v->owner;
 
//	w->vscroll.cap = 6;
 
//	w->traindetails_d.tab = 0;
depot_gui.c
Show inline comments
 
@@ -221,10 +221,7 @@ static const WindowDesc _depot_sell_all_
 

	
 
static void ShowDepotSellAllWindow(TileIndex tile, byte type)
 
{
 
	Window *w;
 

	
 
	_alloc_wnd_parent_num = tile;
 
	w = AllocateWindowDescFront(&_depot_sell_all_desc, tile);
 
	Window *w = AllocateWindowDescFront(&_depot_sell_all_desc, tile);
 

	
 
	if (w != NULL) {
 
		w->caption_color = GetTileOwner(tile);
order_gui.c
Show inline comments
 
@@ -649,16 +649,13 @@ void ShowOrdersWindow(const Vehicle *v)
 
	DeleteWindowById(WC_VEHICLE_ORDERS, veh);
 
	DeleteWindowById(WC_VEHICLE_DETAILS, veh);
 

	
 
	_alloc_wnd_parent_num = veh;
 

	
 
	if (v->owner != _local_player) {
 
		w = AllocateWindowDesc(&_other_orders_desc);
 
		w = AllocateWindowDescFront(&_other_orders_desc, veh);
 
	} else {
 
		w = AllocateWindowDesc((v->type == VEH_Train) ? &_orders_train_desc : &_orders_desc);
 
		w = AllocateWindowDescFront((v->type == VEH_Train) ? &_orders_train_desc : &_orders_desc, veh);
 
	}
 

	
 
	if (w != NULL) {
 
		w->window_number = veh;
 
		w->caption_color = v->owner;
 
		w->vscroll.cap = 6;
 
		w->resize.step_height = 10;
roadveh_gui.c
Show inline comments
 
@@ -219,9 +219,8 @@ static void ShowRoadVehDetailsWindow(con
 

	
 
	DeleteWindowById(WC_VEHICLE_ORDERS, veh);
 
	DeleteWindowById(WC_VEHICLE_DETAILS, veh);
 
	_alloc_wnd_parent_num = veh;
 
	w = AllocateWindowDesc(&_roadveh_details_desc);
 
	w->window_number = veh;
 

	
 
	w = AllocateWindowDescFront(&_roadveh_details_desc, veh);
 
	w->caption_color = v->owner;
 
}
 

	
ship_gui.c
Show inline comments
 
@@ -217,9 +217,7 @@ static void ShowShipDetailsWindow(const 
 

	
 
	DeleteWindowById(WC_VEHICLE_ORDERS, veh);
 
	DeleteWindowById(WC_VEHICLE_DETAILS, veh);
 
	_alloc_wnd_parent_num = veh;
 
	w = AllocateWindowDesc(&_ship_details_desc);
 
	w->window_number = veh;
 
	w = AllocateWindowDescFront(&_ship_details_desc, veh);
 
	w->caption_color = v->owner;
 
}
 

	
train_gui.c
Show inline comments
 
@@ -1216,10 +1216,8 @@ static void ShowTrainDetailsWindow(const
 
	DeleteWindowById(WC_VEHICLE_ORDERS, veh);
 
	DeleteWindowById(WC_VEHICLE_DETAILS, veh);
 

	
 
	_alloc_wnd_parent_num = veh;
 
	w = AllocateWindowDesc(&_train_details_desc);
 
	w = AllocateWindowDescFront(&_train_details_desc, veh);
 

	
 
	w->window_number = veh;
 
	w->caption_color = v->owner;
 
	w->vscroll.cap = 6;
 
	w->widget[4].data = (w->vscroll.cap << 8) + 1;
vehicle_gui.c
Show inline comments
 
@@ -442,9 +442,7 @@ void ShowVehicleRefitWindow(const Vehicl
 

	
 
	DeleteWindowById(WC_VEHICLE_REFIT, v->index);
 

	
 
	_alloc_wnd_parent_num = v->index;
 

	
 
	w = AllocateWindowDesc(&_vehicle_refit_desc);
 
	w = AllocateWindowDescFront(&_vehicle_refit_desc, v->index);
 
	WP(w, refit_d).order = order;
 

	
 
	if (w != NULL) {
window.c
Show inline comments
 
@@ -682,12 +682,17 @@ static Window *LocalAllocateWindowDesc(c
 
	Point pt;
 
	Window *w;
 

	
 
	if (desc->parent_cls != WC_MAIN_WINDOW &&
 
			(w = FindWindowById(desc->parent_cls, _alloc_wnd_parent_num), _alloc_wnd_parent_num=0, w) != NULL &&
 
	/* By default position a child window at an offset of 10/10 of its parent.
 
	 * However if it falls too extremely outside window positions, reposition
 
	 * it to an automatic place */
 
	if (desc->parent_cls != 0 /* WC_MAIN_WINDOW */ &&
 
			(w = FindWindowById(desc->parent_cls, window_number)) != NULL &&
 
			w->left < _screen.width-20 && w->left > -60 && w->top < _screen.height-20) {
 

	
 
		pt.x = w->left + 10;
 
		if (pt.x > _screen.width + 10 - desc->width)
 
		if (pt.x > _screen.width + 10 - desc->width) {
 
			pt.x = (_screen.width + 10 - desc->width) - 20;
 
		}
 
		pt.y = w->top + 10;
 
	} else if (desc->cls == WC_BUILD_TOOLBAR) { // open Build Toolbars aligned
 
		/* Override the position if a toolbar is opened according to the place of the maintoolbar
 
@@ -1715,7 +1720,7 @@ int PositionMainToolbar(Window *w)
 
	}
 

	
 
	switch (_patches.toolbar_pos) {
 
		case 1:  w->left = (_screen.width - w->width) >> 1; break;
 
		case 1:  w->left = (_screen.width - w->width) / 2; break;
 
		case 2:  w->left = _screen.width - w->width; break;
 
		default: w->left = 0;
 
	}
window.h
Show inline comments
 
@@ -840,8 +840,6 @@ VARDEF bool _left_button_clicked;
 
VARDEF bool _right_button_down;
 
VARDEF bool _right_button_clicked;
 

	
 
VARDEF int _alloc_wnd_parent_num;
 

	
 
VARDEF int _scrollbar_start_pos;
 
VARDEF int _scrollbar_size;
 
VARDEF byte _scroller_click_timeout;
0 comments (0 inline, 0 general)