mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17578) -Fix (r17572): Some compilers don't like default function template arguments.

release/1.0
alberth 2009-09-19 14:41:43 +00:00
parent 1497cf7e01
commit 89df436f84
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/order_gui.cpp
View File

@ -475,7 +475,7 @@ private:
*/ */
int GetOrderFromPt(int y) int GetOrderFromPt(int y)
{ {
int sel = (y - this->GetWidget(ORDER_WIDGET_ORDER_LIST)->pos_y - WD_FRAMERECT_TOP) / this->resize.step_height; // Selected line in the ORDER_WIDGET_ORDER_LIST panel. int sel = (y - this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST)->pos_y - WD_FRAMERECT_TOP) / this->resize.step_height; // Selected line in the ORDER_WIDGET_ORDER_LIST panel.
if ((uint)sel >= this->vscroll.GetCapacity()) return INVALID_ORDER; if ((uint)sel >= this->vscroll.GetCapacity()) return INVALID_ORDER;
@ -680,7 +680,7 @@ public:
this->selected_order = -1; this->selected_order = -1;
this->owner = v->owner; this->owner = v->owner;
int num_lines = (this->GetWidget(ORDER_WIDGET_ORDER_LIST)->current_y - WD_FRAMERECT_TOP - WD_FRAMERECT_BOTTOM) / this->resize.step_height; int num_lines = (this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST)->current_y - WD_FRAMERECT_TOP - WD_FRAMERECT_BOTTOM) / this->resize.step_height;
this->vscroll.SetCapacity(num_lines); this->vscroll.SetCapacity(num_lines);
if (_settings_client.gui.quick_goto && v->owner == _local_company) { if (_settings_client.gui.quick_goto && v->owner == _local_company) {
@ -1234,7 +1234,7 @@ public:
{ {
if (this->goto_type == OPOS_CONDITIONAL) { if (this->goto_type == OPOS_CONDITIONAL) {
this->goto_type = OPOS_GOTO; this->goto_type = OPOS_GOTO;
NWidgetBase *nwid = this->GetWidget(ORDER_WIDGET_ORDER_LIST); NWidgetBase *nwid = this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST);
if (IsInsideBS(_cursor.pos.x, this->left + nwid->pos_x, nwid->current_x) && IsInsideBS(_cursor.pos.y, this->top + nwid->pos_y, nwid->current_y)) { if (IsInsideBS(_cursor.pos.x, this->left + nwid->pos_x, nwid->current_x) && IsInsideBS(_cursor.pos.y, this->top + nwid->pos_y, nwid->current_y)) {
int order_id = this->GetOrderFromPt(_cursor.pos.y - this->top); int order_id = this->GetOrderFromPt(_cursor.pos.y - this->top);
if (order_id != INVALID_ORDER) { if (order_id != INVALID_ORDER) {

2
src/window_gui.h
View File

@ -398,7 +398,7 @@ public:
Window *z_front; ///< The window in front of us in z-order. Window *z_front; ///< The window in front of us in z-order.
Window *z_back; ///< The window behind us in z-order. Window *z_back; ///< The window behind us in z-order.
template <class NWID = NWidgetBase> template <class NWID>
inline NWID *GetWidget(uint widnum) const; inline NWID *GetWidget(uint widnum) const;