Skip to content

Commit b5f8a07

Browse files
committedDec 3, 2017
qtscript: More tutorial events needed.
Adds: eventMenuDesign and eventMenuResearchSelected
1 parent 2007f14 commit b5f8a07

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed
 

‎src/hci.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,6 +1277,7 @@ INT_RETVAL intRunWidgets()
12771277
intAddDesign(false);
12781278
intMode = INT_DESIGN;
12791279
reticuleCallback(RETBUT_DESIGN);
1280+
triggerEvent(TRIGGER_MENU_DESIGN_UP);
12801281
break;
12811282

12821283
case IDRET_CANCEL:
@@ -2167,6 +2168,10 @@ static void intProcessStats(UDWORD id)
21672168
{
21682169
triggerEvent(TRIGGER_MENU_BUILD_SELECTED);
21692170
}
2171+
else if (objMode == IOBJ_RESEARCH)
2172+
{
2173+
triggerEvent(TRIGGER_MENU_RESEARCH_SELECTED);
2174+
}
21702175

21712176
// Set the object stats
21722177
compIndex = id - IDSTAT_START;

‎src/qtscript.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,6 +1096,9 @@ bool triggerEvent(SCRIPT_TRIGGER_TYPE trigger, BASE_OBJECT *psObj)
10961096
case TRIGGER_MENU_BUILD_SELECTED:
10971097
callFunction(engine, "eventMenuBuildSelected", args);
10981098
break;
1099+
case TRIGGER_MENU_RESEARCH_SELECTED:
1100+
callFunction(engine, "eventMenuResearchSelected", args);
1101+
break;
10991102
case TRIGGER_MENU_BUILD_UP:
11001103
args += QScriptValue(true);
11011104
callFunction(engine, "eventMenuBuild", args);
@@ -1104,6 +1107,10 @@ bool triggerEvent(SCRIPT_TRIGGER_TYPE trigger, BASE_OBJECT *psObj)
11041107
args += QScriptValue(true);
11051108
callFunction(engine, "eventMenuResearch", args);
11061109
break;
1110+
case TRIGGER_MENU_DESIGN_UP:
1111+
args += QScriptValue(true);
1112+
callFunction(engine, "eventMenuDesign", args);
1113+
break;
11071114
case TRIGGER_MENU_MANUFACTURE_UP:
11081115
args += QScriptValue(true);
11091116
callFunction(engine, "eventMenuManufacture", args);

‎src/qtscript.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,12 @@ enum SCRIPT_TRIGGER_TYPE
5252
TRIGGER_DESIGN_SYSTEM,
5353
TRIGGER_DESIGN_PROPULSION,
5454
TRIGGER_DESIGN_QUIT,
55+
TRIGGER_MENU_DESIGN_UP,
5556
TRIGGER_MENU_BUILD_UP,
5657
TRIGGER_MENU_BUILD_SELECTED,
5758
TRIGGER_MENU_MANUFACTURE_UP,
5859
TRIGGER_MENU_RESEARCH_UP,
60+
TRIGGER_MENU_RESEARCH_SELECTED,
5961
TRIGGER_OBJECT_RECYCLED
6062
};
6163

0 commit comments

Comments
 (0)