Mercurial > hg > openttd
changeset 8290:3412cb1628bc draft
(svn r11854) -Fix (r11848): Nightly build farm showed up more compiler warnings... c++ is fun
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Mon, 14 Jan 2008 20:52:43 +0000 |
parents | 7950218031ab |
children | 690fb294ef90 |
files | src/widgets/dropdown_type.h |
diffstat | 1 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/widgets/dropdown_type.h +++ b/src/widgets/dropdown_type.h @@ -15,6 +15,8 @@ int result; ///< Result code to return to window on selection bool masked; ///< Masked and unselectable item + DropDownListItem(int result, bool masked) : result(result), masked(masked) {} + virtual ~DropDownListItem() {} virtual StringID String() const; }; @@ -25,12 +27,7 @@ public: StringID string; ///< String ID of item - DropDownListStringItem(StringID string, uint result, bool masked) - { - this->string = string; - this->result = result; - this->masked = masked; - } + DropDownListStringItem(StringID string, int result, bool masked) : DropDownListItem(result, masked), string(string) {} StringID String() const; }; @@ -42,7 +39,7 @@ public: uint64 decode_params[10]; ///< Parameters of the string - DropDownListParamStringItem(StringID string, uint result, bool masked) : DropDownListStringItem(string, result, masked) {} + DropDownListParamStringItem(StringID string, int result, bool masked) : DropDownListStringItem(string, result, masked) {} StringID String() const; void SetParam(uint index, uint64 value) { decode_params[index] = value; }