From 0de796c5ea1eafcd2da136bea936319cd69a6fe4 Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Tue, 4 Jan 2005 21:51:23 +0000 Subject: [PATCH] Send Load event to GUI objects after (instead of while) loading the rest of the engine This was SVN commit r1635. --- source/gui/CGUI.cpp | 1 - source/main.cpp | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp index 4faac9b153..fb7123fc2e 100755 --- a/source/gui/CGUI.cpp +++ b/source/gui/CGUI.cpp @@ -499,7 +499,6 @@ void CGUI::AddObject(IGUIObject* pObject) // Loaded GUI::RecurseObject(0, pObject, &IGUIObject::HandleMessage, SGUIMessage(GUIM_LOAD)); - GUI::RecurseObject(0, pObject, &IGUIObject::ScriptEvent, "load"); } catch (PS_RESULT e) { diff --git a/source/main.cpp b/source/main.cpp index 3c22a664bc..7cc7b186fa 100755 --- a/source/main.cpp +++ b/source/main.cpp @@ -1132,6 +1132,10 @@ TIMER(init_after_InitRenderer); in_add_handler(hotkeyInputHandler); // <- Leave this one until after all the others. } +#ifndef NO_GUI + g_GUI.SendEventToAll("load"); +#endif + MICROLOG(L"render blank"); // render everything to a blank frame to force renderer to load everything RenderNoCull();