Remove ScriptingHost initialisation code (share with ScriptInterface instead).
Fix GUI scripts to avoid strict warnings.
Rejig GUI/SpiderMonkey interface to use less custom code, and to work with JSOPTION_VAROBJFIX.
Add event name to GUI event handler function names (visible in the profiler).
Description
Description
Details
Details
- Committed
philip Jul 20 2010, 1:01 AM - Parents
- rP7768: Disable unnecessary state hash check in single-player games.
- Branches
- Unknown
- Tags
Event Timeline
| /ps/trunk/source/gui/GUIManager.cpp | ||
|---|---|---|
| 181 | As mentioned in rP7214, this m_CurrentGUI concept seems like quite a workaround. Also it seems m_CurrentGUI should be set in general prior to CallFunction call and other calls that can lead to CallFunction being called (for example GUI events sent to the page), in particular: TickObjects
CallFunction("init", initDataVal, hotloadDataVal))
CallFunction(callback.c_str(), argVal))
CallFunction("getHotloadData", &hotloadDataVal);
CallFunction("getSavedGameData", &data);
CallFunction("restoreSavedGameData", dataVal);
CallFunction("handleInputBeforeGui", handled, *ev, top()->FindObjectUnderMouse()))
CallFunction("handleInputAfterGui", handled, *ev))
p.gui->SendEventToAll("WindowResized");
page.gui->SendEventToAll("load");In any case the caller should decide the "current page", rather than having a hidden default which easily bugs when one doesn't know about this workaround. | |
| /ps/trunk/source/gui/GUIManager.h | ||
| 125 | ^ | |