diff --git a/src/Common/Game/IW3/IW3_Assets.h b/src/Common/Game/IW3/IW3_Assets.h index 9b8c8e18..1d79c0ba 100644 --- a/src/Common/Game/IW3/IW3_Assets.h +++ b/src/Common/Game/IW3/IW3_Assets.h @@ -1933,6 +1933,30 @@ namespace IW3 void* data; }; + enum ItemDefType + { + ITEM_TYPE_TEXT = 0x0, + ITEM_TYPE_BUTTON = 0x1, + ITEM_TYPE_RADIOBUTTON = 0x2, + ITEM_TYPE_CHECKBOX = 0x3, + ITEM_TYPE_EDITFIELD = 0x4, + ITEM_TYPE_COMBO = 0x5, + ITEM_TYPE_LISTBOX = 0x6, + ITEM_TYPE_MODEL = 0x7, + ITEM_TYPE_OWNERDRAW = 0x8, + ITEM_TYPE_NUMERICFIELD = 0x9, + ITEM_TYPE_SLIDER = 0xA, + ITEM_TYPE_YESNO = 0xB, + ITEM_TYPE_MULTI = 0xC, + ITEM_TYPE_DVARENUM = 0xD, + ITEM_TYPE_BIND = 0xE, + ITEM_TYPE_MENUMODEL = 0xF, + ITEM_TYPE_VALIDFILEFIELD = 0x10, + ITEM_TYPE_DECIMALFIELD = 0x11, + ITEM_TYPE_UPREDITFIELD = 0x12, + ITEM_TYPE_GAME_MESSAGE_WINDOW = 0x13 + }; + struct itemDef_s { windowDef_t window; diff --git a/src/Common/Game/IW4/IW4_Assets.h b/src/Common/Game/IW4/IW4_Assets.h index a54ee34e..2766fe6f 100644 --- a/src/Common/Game/IW4/IW4_Assets.h +++ b/src/Common/Game/IW4/IW4_Assets.h @@ -1336,6 +1336,34 @@ namespace IW4 Material* background; }; + enum ItemDefType + { + ITEM_TYPE_TEXT = 0x0, + ITEM_TYPE_BUTTON = 0x1, + ITEM_TYPE_RADIOBUTTON = 0x2, + ITEM_TYPE_CHECKBOX = 0x3, + ITEM_TYPE_EDITFIELD = 0x4, + ITEM_TYPE_COMBO = 0x5, + ITEM_TYPE_LISTBOX = 0x6, + ITEM_TYPE_MODEL = 0x7, + ITEM_TYPE_OWNERDRAW = 0x8, + ITEM_TYPE_NUMERICFIELD = 0x9, + ITEM_TYPE_SLIDER = 0xA, + ITEM_TYPE_YESNO = 0xB, + ITEM_TYPE_MULTI = 0xC, + ITEM_TYPE_DVARENUM = 0xD, + ITEM_TYPE_BIND = 0xE, + ITEM_TYPE_MENUMODEL = 0xF, + ITEM_TYPE_VALIDFILEFIELD = 0x10, + ITEM_TYPE_DECIMALFIELD = 0x11, + ITEM_TYPE_UPREDITFIELD = 0x12, + ITEM_TYPE_GAME_MESSAGE_WINDOW = 0x13, + ITEM_TYPE_NEWS_TICKER = 0x14, + ITEM_TYPE_TEXT_SCROLL = 0x15, + ITEM_TYPE_EMAILFIELD = 0x16, + ITEM_TYPE_PASSWORDFIELD = 0x17 + }; + struct itemDef_s { windowDef_t window; diff --git a/src/Common/Game/IW5/IW5_Assets.h b/src/Common/Game/IW5/IW5_Assets.h index 2b0aa3a4..29bb554e 100644 --- a/src/Common/Game/IW5/IW5_Assets.h +++ b/src/Common/Game/IW5/IW5_Assets.h @@ -2942,6 +2942,34 @@ namespace IW5 Statement_s* expression; }; + enum ItemDefType + { + ITEM_TYPE_TEXT = 0x0, + ITEM_TYPE_BUTTON = 0x1, + ITEM_TYPE_RADIOBUTTON = 0x2, + ITEM_TYPE_CHECKBOX = 0x3, + ITEM_TYPE_EDITFIELD = 0x4, + ITEM_TYPE_COMBO = 0x5, + ITEM_TYPE_LISTBOX = 0x6, + ITEM_TYPE_MODEL = 0x7, + ITEM_TYPE_OWNERDRAW = 0x8, + ITEM_TYPE_NUMERICFIELD = 0x9, + ITEM_TYPE_SLIDER = 0xA, + ITEM_TYPE_YESNO = 0xB, + ITEM_TYPE_MULTI = 0xC, + ITEM_TYPE_DVARENUM = 0xD, + ITEM_TYPE_BIND = 0xE, + ITEM_TYPE_MENUMODEL = 0xF, + ITEM_TYPE_VALIDFILEFIELD = 0x10, + ITEM_TYPE_DECIMALFIELD = 0x11, + ITEM_TYPE_UPREDITFIELD = 0x12, + ITEM_TYPE_GAME_MESSAGE_WINDOW = 0x13, + ITEM_TYPE_NEWS_TICKER = 0x14, + ITEM_TYPE_TEXT_SCROLL = 0x15, + ITEM_TYPE_EMAILFIELD = 0x16, + ITEM_TYPE_PASSWORDFIELD = 0x17 + }; + struct itemDef_s { windowDef_t window; diff --git a/src/Common/Game/T5/T5_Assets.h b/src/Common/Game/T5/T5_Assets.h index ce8ab5cd..ac6f9c36 100644 --- a/src/Common/Game/T5/T5_Assets.h +++ b/src/Common/Game/T5/T5_Assets.h @@ -2715,6 +2715,40 @@ namespace T5 int animDuration; }; + enum ItemDefType + { + ITEM_TYPE_DEFAULT = 0x0, + ITEM_TYPE_TEXT = 0x1, + ITEM_TYPE_IMAGE = 0x2, + ITEM_TYPE_BUTTON = 0x3, + ITEM_TYPE_LISTBOX = 0x4, + ITEM_TYPE_EDITFIELD = 0x5, + ITEM_TYPE_OWNERDRAW = 0x6, + ITEM_TYPE_NUMERICFIELD = 0x7, + ITEM_TYPE_SLIDER = 0x8, + ITEM_TYPE_YESNO = 0x9, + ITEM_TYPE_MULTI = 0xA, + ITEM_TYPE_DVARENUM = 0xB, + ITEM_TYPE_BIND = 0xC, + ITEM_TYPE_VALIDFILEFIELD = 0xD, + ITEM_TYPE_UPREDITFIELD = 0xE, + ITEM_TYPE_GAME_MESSAGE_WINDOW = 0xF, + ITEM_TYPE_BIND2 = 0x10, + ITEM_TYPE_HIGHLIGHT = 0x11, + ITEM_TYPE_OWNERDRAW_TEXT = 0x12, + ITEM_TYPE_OD_BUTTON = 0x13, + ITEM_TYPE_OD_TEXT_BUTTON = 0x14, + ITEM_TYPE_BUTTON_NO_TEXT = 0x15, + ITEM_TYPE_ALPHANUMERICFIELD = 0x16, + ITEM_TYPE_RADIOBUTTON = 0x19, + ITEM_TYPE_MODEL = 0x1A, + ITEM_TYPE_CHECKBOX = 0x1B, + ITEM_TYPE_COMBO = 0x1C, + ITEM_TYPE_DECIMALFIELD = 0x1E, + ITEM_TYPE_CONFEDITFIELD = 0x1F, + ITEM_TYPE_MENUMODEL = 0x27 + }; + struct type_align(8) itemDef_s { windowDef_t window; diff --git a/src/Common/Game/T6/T6_Assets.h b/src/Common/Game/T6/T6_Assets.h index 374463a6..a5944817 100644 --- a/src/Common/Game/T6/T6_Assets.h +++ b/src/Common/Game/T6/T6_Assets.h @@ -3968,40 +3968,36 @@ namespace T6 enum ItemType { - // ITEM_TYPE_XYZ = 1, // ? some kind of read only text field - ITEM_TYPE_IMAGE = 2, - // Confirmed - // ITEM_TYPE_XYZ = 3, // ? some kind of read only text field - ITEM_TYPE_LISTBOX = 4, - // Confirmed - ITEM_TYPE_EDITFIELD = 5, - // editable text field - ITEM_TYPE_OWNERDRAW = 6, - // Confirmed - ITEM_TYPE_NUMERICFIELD = 7, - // editable text field - ITEM_TYPE_SLIDER = 8, - // Confirmed - ITEM_TYPE_YESNO = 9, - // Confirmed - ITEM_TYPE_MULTI = 10, - // Confirmed - ITEM_TYPE_DVARENUM = 11, - // Confirmed - ITEM_TYPE_BIND_PRIMARY = 12, - // Confirmed - ITEM_TYPE_NAMEFIELD = 13, - // editable text field - ITEM_TYPE_UPPERTEXTFIELD = 14, - // editable text field - ITEM_TYPE_GAME_MESSAGE_WINDOW = 15, - // Confirmed - ITEM_TYPE_BIND_SECONDARY = 16, - // Confirmed - ITEM_TYPE_PROFILEMULTI = 22, - // Confirmed - ITEM_TYPE_DVAR_FLOAT = 30, - // editable text field + ITEM_TYPE_DEFAULT = 0x0, + ITEM_TYPE_TEXT = 0x1, + ITEM_TYPE_IMAGE = 0x2, + ITEM_TYPE_BUTTON = 0x3, + ITEM_TYPE_LISTBOX = 0x4, + ITEM_TYPE_EDITFIELD = 0x5, + ITEM_TYPE_OWNERDRAW = 0x6, + ITEM_TYPE_NUMERICFIELD = 0x7, + ITEM_TYPE_SLIDER = 0x8, + ITEM_TYPE_YESNO = 0x9, + ITEM_TYPE_MULTI = 0xA, + ITEM_TYPE_DVARENUM = 0xB, + ITEM_TYPE_BIND = 0xC, + ITEM_TYPE_VALIDFILEFIELD = 0xD, + ITEM_TYPE_UPREDITFIELD = 0xE, + ITEM_TYPE_GAME_MESSAGE_WINDOW = 0xF, + ITEM_TYPE_BIND2 = 0x10, + ITEM_TYPE_HIGHLIGHT = 0x11, + ITEM_TYPE_OWNERDRAW_TEXT = 0x12, + ITEM_TYPE_OD_BUTTON = 0x13, + ITEM_TYPE_OD_TEXT_BUTTON = 0x14, + ITEM_TYPE_BUTTON_NO_TEXT = 0x15, + ITEM_TYPE_PROFILEMULTI = 0x16, + ITEM_TYPE_RADIOBUTTON = 0x19, + ITEM_TYPE_MODEL = 0x1A, + ITEM_TYPE_CHECKBOX = 0x1B, + ITEM_TYPE_COMBO = 0x1C, + ITEM_TYPE_DVAR_FLOAT = 0x1E, + ITEM_TYPE_CONFEDITFIELD = 0x1F, + ITEM_TYPE_MENUMODEL = 0x27 }; diff --git a/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt b/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt index 1dee4cfe..ae9b961d 100644 --- a/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt +++ b/src/ZoneCode/Game/IW3/XAssets/menuDef_t.txt @@ -57,20 +57,18 @@ set string enableDvar; use itemDefData_t; set string enumDvarName; set condition data never; -set condition listBox itemDef_s::type == 6; -set condition editField itemDef_s::type == 0 - || itemDef_s::type == 4 - || itemDef_s::type == 9 - || itemDef_s::type == 10 - || itemDef_s::type == 11 - || itemDef_s::type == 14 - || itemDef_s::type == 16 - || itemDef_s::type == 17 - || itemDef_s::type == 18 - || itemDef_s::type == 22 - || itemDef_s::type == 23; -set condition multi itemDef_s::type == 12; -set condition enumDvarName itemDef_s::type == 13; +set condition listBox itemDef_s::type == ITEM_TYPE_LISTBOX; +set condition editField itemDef_s::type == ITEM_TYPE_TEXT + || itemDef_s::type == ITEM_TYPE_EDITFIELD + || itemDef_s::type == ITEM_TYPE_NUMERICFIELD + || itemDef_s::type == ITEM_TYPE_SLIDER + || itemDef_s::type == ITEM_TYPE_YESNO + || itemDef_s::type == ITEM_TYPE_BIND + || itemDef_s::type == ITEM_TYPE_VALIDFILEFIELD + || itemDef_s::type == ITEM_TYPE_DECIMALFIELD + || itemDef_s::type == ITEM_TYPE_UPREDITFIELD; +set condition multi itemDef_s::type == ITEM_TYPE_MULTI; +set condition enumDvarName itemDef_s::type == ITEM_TYPE_DVARENUM; // listBoxDef_s set string listBoxDef_s::doubleClick; diff --git a/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt b/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt index 70db6feb..98373980 100644 --- a/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt +++ b/src/ZoneCode/Game/IW4/XAssets/menuDef_t.txt @@ -106,22 +106,22 @@ set reusable materialExp; use itemDefData_t; set string enumDvarName; set condition data never; -set condition listBox itemDef_s::type == 6; -set condition editField itemDef_s::type == 0 - || itemDef_s::type == 4 - || itemDef_s::type == 9 - || itemDef_s::type == 10 - || itemDef_s::type == 11 - || itemDef_s::type == 14 - || itemDef_s::type == 16 - || itemDef_s::type == 17 - || itemDef_s::type == 18 - || itemDef_s::type == 22 - || itemDef_s::type == 23; -set condition multi itemDef_s::type == 12; -set condition enumDvarName itemDef_s::type == 13; -set condition ticker itemDef_s::type == 20; -set condition scroll itemDef_s::type == 21; +set condition listBox itemDef_s::type == ITEM_TYPE_LISTBOX; +set condition editField itemDef_s::type == ITEM_TYPE_TEXT + || itemDef_s::type == ITEM_TYPE_EDITFIELD + || itemDef_s::type == ITEM_TYPE_NUMERICFIELD + || itemDef_s::type == ITEM_TYPE_SLIDER + || itemDef_s::type == ITEM_TYPE_YESNO + || itemDef_s::type == ITEM_TYPE_BIND + || itemDef_s::type == ITEM_TYPE_VALIDFILEFIELD + || itemDef_s::type == ITEM_TYPE_DECIMALFIELD + || itemDef_s::type == ITEM_TYPE_UPREDITFIELD + || itemDef_s::type == ITEM_TYPE_EMAILFIELD + || itemDef_s::type == ITEM_TYPE_PASSWORDFIELD; +set condition multi itemDef_s::type == ITEM_TYPE_MULTI; +set condition enumDvarName itemDef_s::type == ITEM_TYPE_DVARENUM; +set condition ticker itemDef_s::type == ITEM_TYPE_NEWS_TICKER; +set condition scroll itemDef_s::type == ITEM_TYPE_TEXT_SCROLL; // multiDef_s use multiDef_s; diff --git a/src/ZoneCode/Game/IW5/XAssets/menuDef_t.txt b/src/ZoneCode/Game/IW5/XAssets/menuDef_t.txt index 412c3281..3a8b9b2d 100644 --- a/src/ZoneCode/Game/IW5/XAssets/menuDef_t.txt +++ b/src/ZoneCode/Game/IW5/XAssets/menuDef_t.txt @@ -94,22 +94,22 @@ set reusable textAlignYExp; use itemDefData_t; set string enumDvarName; set condition data never; -set condition listBox itemDef_s::type == 6; -set condition editField itemDef_s::type == 0 - || itemDef_s::type == 4 - || itemDef_s::type == 9 - || itemDef_s::type == 10 - || itemDef_s::type == 11 - || itemDef_s::type == 14 - || itemDef_s::type == 16 - || itemDef_s::type == 17 - || itemDef_s::type == 18 - || itemDef_s::type == 22 - || itemDef_s::type == 23; -set condition multi itemDef_s::type == 12; -set condition enumDvarName itemDef_s::type == 13; -set condition ticker itemDef_s::type == 20; -set condition scroll itemDef_s::type == 21; +set condition listBox itemDef_s::type == ITEM_TYPE_LISTBOX; +set condition editField itemDef_s::type == ITEM_TYPE_TEXT + || itemDef_s::type == ITEM_TYPE_EDITFIELD + || itemDef_s::type == ITEM_TYPE_NUMERICFIELD + || itemDef_s::type == ITEM_TYPE_SLIDER + || itemDef_s::type == ITEM_TYPE_YESNO + || itemDef_s::type == ITEM_TYPE_BIND + || itemDef_s::type == ITEM_TYPE_VALIDFILEFIELD + || itemDef_s::type == ITEM_TYPE_DECIMALFIELD + || itemDef_s::type == ITEM_TYPE_UPREDITFIELD + || itemDef_s::type == ITEM_TYPE_EMAILFIELD + || itemDef_s::type == ITEM_TYPE_PASSWORDFIELD; +set condition multi itemDef_s::type == ITEM_TYPE_MULTI; +set condition enumDvarName itemDef_s::type == ITEM_TYPE_DVARENUM; +set condition ticker itemDef_s::type == ITEM_TYPE_NEWS_TICKER; +set condition scroll itemDef_s::type == ITEM_TYPE_TEXT_SCROLL; // listBoxDef_s set reusable listBoxDef_s::elementHeightExp; diff --git a/src/ZoneCode/Game/T5/XAssets/menuDef_t.txt b/src/ZoneCode/Game/T5/XAssets/menuDef_t.txt index a331eff8..2c2e621d 100644 --- a/src/ZoneCode/Game/T5/XAssets/menuDef_t.txt +++ b/src/ZoneCode/Game/T5/XAssets/menuDef_t.txt @@ -47,30 +47,30 @@ set string dvarTest; set string enableDvar; set condition parent never; set condition typeData::textDef -type == 1 || type == 3 || type == 4 -|| type == 5 || type == 7 || type == 8 -|| type == 9 || type == 10 || type == 11 -|| type == 12 || type == 13 || type == 14 -|| type == 15 || type == 16 || type == 18 -|| type == 20 || type == 22; -set condition typeData::imageDef type == 2; -set condition typeData::blankButtonDef type == 19 || type == 21; -set condition typeData::ownerDrawDef type == 6; +type == ITEM_TYPE_TEXT || type == ITEM_TYPE_BUTTON || type == ITEM_TYPE_LISTBOX +|| type == ITEM_TYPE_EDITFIELD || type == ITEM_TYPE_NUMERICFIELD || type == ITEM_TYPE_SLIDER +|| type == ITEM_TYPE_YESNO || type == ITEM_TYPE_MULTI || type == ITEM_TYPE_DVARENUM +|| type == ITEM_TYPE_BIND || type == ITEM_TYPE_VALIDFILEFIELD || type == ITEM_TYPE_UPREDITFIELD +|| type == ITEM_TYPE_GAME_MESSAGE_WINDOW || type == ITEM_TYPE_BIND2 || type == ITEM_TYPE_OWNERDRAW_TEXT +|| type == ITEM_TYPE_OD_TEXT_BUTTON || type == ITEM_TYPE_ALPHANUMERICFIELD; +set condition typeData::imageDef type == ITEM_TYPE_IMAGE; +set condition typeData::blankButtonDef type == ITEM_TYPE_OD_BUTTON || type == ITEM_TYPE_BUTTON_NO_TEXT; +set condition typeData::ownerDrawDef type == ITEM_TYPE_OWNERDRAW; set condition typeData::data never; // textDef_s use textDef_s; set string text; -set condition textTypeData::focusItemDef itemDef_s::type == 3 -|| itemDef_s::type == 4 || itemDef_s::type == 5 -|| itemDef_s::type == 7 || itemDef_s::type == 8 -|| itemDef_s::type == 9 || itemDef_s::type == 10 -|| itemDef_s::type == 11 || itemDef_s::type == 12 -|| itemDef_s::type == 13 || itemDef_s::type == 14 -|| itemDef_s::type == 16 || itemDef_s::type == 20 -|| itemDef_s::type == 21 || itemDef_s::type == 22 -|| itemDef_s::type == 30; -set condition textTypeData::gameMsgDef itemDef_s::type == 15; +set condition textTypeData::focusItemDef itemDef_s::type == ITEM_TYPE_BUTTON +|| itemDef_s::type == ITEM_TYPE_LISTBOX || itemDef_s::type == ITEM_TYPE_EDITFIELD +|| itemDef_s::type == ITEM_TYPE_NUMERICFIELD || itemDef_s::type == ITEM_TYPE_SLIDER +|| itemDef_s::type == ITEM_TYPE_YESNO || itemDef_s::type == ITEM_TYPE_MULTI +|| itemDef_s::type == ITEM_TYPE_DVARENUM || itemDef_s::type == ITEM_TYPE_BIND +|| itemDef_s::type == ITEM_TYPE_VALIDFILEFIELD || itemDef_s::type == ITEM_TYPE_UPREDITFIELD +|| itemDef_s::type == ITEM_TYPE_BIND2 || itemDef_s::type == ITEM_TYPE_OD_TEXT_BUTTON +|| itemDef_s::type == ITEM_TYPE_BUTTON_NO_TEXT || itemDef_s::type == ITEM_TYPE_ALPHANUMERICFIELD +|| itemDef_s::type == ITEM_TYPE_DECIMALFIELD; +set condition textTypeData::gameMsgDef itemDef_s::type == ITEM_TYPE_GAME_MESSAGE_WINDOW; set condition textTypeData::data never; // focusItemDef_s @@ -79,19 +79,19 @@ set string mouseEnterText; set string mouseExitText; set string mouseEnter; set string mouseExit; -set condition focusTypeData::listBox itemDef_s::type == 4; -set condition focusTypeData::multi itemDef_s::type == 10; -set condition focusTypeData::editField itemDef_s::type == 5 -|| itemDef_s::type == 7 -|| itemDef_s::type == 8 -|| itemDef_s::type == 9 -|| itemDef_s::type == 12 -|| itemDef_s::type == 13 -|| itemDef_s::type == 14 -|| itemDef_s::type == 16 -|| itemDef_s::type == 22 -|| itemDef_s::type == 30; -set condition focusTypeData::enumDvar itemDef_s::type == 11; +set condition focusTypeData::listBox itemDef_s::type == ITEM_TYPE_LISTBOX; +set condition focusTypeData::multi itemDef_s::type == ITEM_TYPE_MULTI; +set condition focusTypeData::editField itemDef_s::type == ITEM_TYPE_EDITFIELD +|| itemDef_s::type == ITEM_TYPE_NUMERICFIELD +|| itemDef_s::type == ITEM_TYPE_SLIDER +|| itemDef_s::type == ITEM_TYPE_YESNO +|| itemDef_s::type == ITEM_TYPE_BIND +|| itemDef_s::type == ITEM_TYPE_VALIDFILEFIELD +|| itemDef_s::type == ITEM_TYPE_UPREDITFIELD +|| itemDef_s::type == ITEM_TYPE_BIND2 +|| itemDef_s::type == ITEM_TYPE_ALPHANUMERICFIELD +|| itemDef_s::type == ITEM_TYPE_DECIMALFIELD; +set condition focusTypeData::enumDvar itemDef_s::type == ITEM_TYPE_DVARENUM; set condition focusTypeData::data never; // listBoxDef_s diff --git a/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt b/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt index 3dd0fa9c..b8ac0079 100644 --- a/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt +++ b/src/ZoneCode/Game/T6/XAssets/menuDef_t.txt @@ -49,30 +49,30 @@ set string dvarTest; set string enableDvar; set condition parent never; set condition typeData::textDef -type == 1 || type == 3 || type == 4 -|| type == 5 || type == 7 || type == 8 -|| type == 9 || type == 10 || type == 11 -|| type == 12 || type == 13 || type == 14 -|| type == 15 || type == 16 || type == 18 -|| type == 20 || type == 22; -set condition typeData::imageDef type == 2; -set condition typeData::blankButtonDef type == 19 || type == 21; -set condition typeData::ownerDrawDef type == 6; +type == ITEM_TYPE_TEXT || type == ITEM_TYPE_BUTTON || type == ITEM_TYPE_LISTBOX +|| type == ITEM_TYPE_EDITFIELD || type == ITEM_TYPE_NUMERICFIELD || type == ITEM_TYPE_SLIDER +|| type == ITEM_TYPE_YESNO || type == ITEM_TYPE_MULTI || type == ITEM_TYPE_DVARENUM +|| type == ITEM_TYPE_BIND || type == ITEM_TYPE_VALIDFILEFIELD || type == ITEM_TYPE_UPREDITFIELD +|| type == ITEM_TYPE_GAME_MESSAGE_WINDOW || type == ITEM_TYPE_BIND2 || type == ITEM_TYPE_OWNERDRAW_TEXT +|| type == ITEM_TYPE_OD_TEXT_BUTTON || type == ITEM_TYPE_PROFILEMULTI; +set condition typeData::imageDef type == ITEM_TYPE_IMAGE; +set condition typeData::blankButtonDef type == ITEM_TYPE_OD_BUTTON || type == ITEM_TYPE_BUTTON_NO_TEXT; +set condition typeData::ownerDrawDef type == ITEM_TYPE_OWNERDRAW; set condition typeData::data never; // textDef_s use textDef_s; set string text; -set condition textTypeData::focusItemDef itemDef_s::type == 3 -|| itemDef_s::type == 4 || itemDef_s::type == 5 -|| itemDef_s::type == 7 || itemDef_s::type == 8 -|| itemDef_s::type == 9 || itemDef_s::type == 10 -|| itemDef_s::type == 11 || itemDef_s::type == 12 -|| itemDef_s::type == 13 || itemDef_s::type == 14 -|| itemDef_s::type == 16 || itemDef_s::type == 20 -|| itemDef_s::type == 21 || itemDef_s::type == 22 -|| itemDef_s::type == 30; -set condition textTypeData::gameMsgDef itemDef_s::type == 15; +set condition textTypeData::focusItemDef itemDef_s::type == ITEM_TYPE_BUTTON +|| itemDef_s::type == ITEM_TYPE_LISTBOX || itemDef_s::type == ITEM_TYPE_EDITFIELD +|| itemDef_s::type == ITEM_TYPE_NUMERICFIELD || itemDef_s::type == ITEM_TYPE_SLIDER +|| itemDef_s::type == ITEM_TYPE_YESNO || itemDef_s::type == ITEM_TYPE_MULTI +|| itemDef_s::type == ITEM_TYPE_DVARENUM || itemDef_s::type == ITEM_TYPE_BIND +|| itemDef_s::type == ITEM_TYPE_VALIDFILEFIELD || itemDef_s::type == ITEM_TYPE_UPREDITFIELD +|| itemDef_s::type == ITEM_TYPE_BIND2 || itemDef_s::type == ITEM_TYPE_OD_TEXT_BUTTON +|| itemDef_s::type == ITEM_TYPE_BUTTON_NO_TEXT || itemDef_s::type == ITEM_TYPE_PROFILEMULTI +|| itemDef_s::type == ITEM_TYPE_DVAR_FLOAT; +set condition textTypeData::gameMsgDef itemDef_s::type == ITEM_TYPE_GAME_MESSAGE_WINDOW; set condition textTypeData::data never; // focusItemDef_s @@ -81,19 +81,19 @@ set string mouseEnterText; set string mouseExitText; set string mouseEnter; set string mouseExit; -set condition focusTypeData::listBox itemDef_s::type == 4; -set condition focusTypeData::multi itemDef_s::type == 10; -set condition focusTypeData::profileMulti itemDef_s::type == 22; -set condition focusTypeData::editField itemDef_s::type == 5 -|| itemDef_s::type == 7 -|| itemDef_s::type == 8 -|| itemDef_s::type == 9 -|| itemDef_s::type == 12 -|| itemDef_s::type == 13 -|| itemDef_s::type == 14 -|| itemDef_s::type == 16 -|| itemDef_s::type == 30; -set condition focusTypeData::enumDvar itemDef_s::type == 11; +set condition focusTypeData::listBox itemDef_s::type == ITEM_TYPE_LISTBOX; +set condition focusTypeData::multi itemDef_s::type == ITEM_TYPE_MULTI; +set condition focusTypeData::profileMulti itemDef_s::type == ITEM_TYPE_PROFILEMULTI; +set condition focusTypeData::editField itemDef_s::type == ITEM_TYPE_EDITFIELD +|| itemDef_s::type == ITEM_TYPE_NUMERICFIELD +|| itemDef_s::type == ITEM_TYPE_SLIDER +|| itemDef_s::type == ITEM_TYPE_YESNO +|| itemDef_s::type == ITEM_TYPE_BIND +|| itemDef_s::type == ITEM_TYPE_VALIDFILEFIELD +|| itemDef_s::type == ITEM_TYPE_UPREDITFIELD +|| itemDef_s::type == ITEM_TYPE_BIND2 +|| itemDef_s::type == ITEM_TYPE_DVAR_FLOAT; +set condition focusTypeData::enumDvar itemDef_s::type == ITEM_TYPE_DVARENUM; set condition focusTypeData::data never; // listBoxDef_s