fixed a bug where events scheduled for the same time run in backwards order

simplified CoreTiming::AddEventToQueue
fixed emu.frameadvance and implemented emu.wait
fixed Lua script termination
brought over some luaconf customizations to fix issue 2245 in a better way and deal with certain other scripting problems

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5383 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nitsuja-
2010-04-18 08:28:52 +00:00
parent 766818baa8
commit b31042cb10
6 changed files with 92 additions and 92 deletions

View File

@ -51,8 +51,8 @@ void LuaStop(int uid, bool ok)
{
if(ok)
g_contextMap[uid]->PrintMessage("Script completed successfully!\n");
else
g_contextMap[uid]->PrintMessage("Script failed\n");
//else // disabled because this message makes no sense in certain contexts, and there's always an earlier error message anyway.
// g_contextMap[uid]->PrintMessage("Script failed.\n");
g_contextMap[uid]->OnStop();
}
@ -173,7 +173,7 @@ void wxLuaWindow::OnEvent_ScriptStop_Press(wxCommandEvent& WXUNUSED(event))
{
CoreTiming::ScheduleEvent_Threadsafe_Immediate(ev_LuaStop, luaID);
OnStop();
PrintMessage("Script stopped!\n");
PrintMessage("Stopping script...\n");
}
void wxLuaWindow::OnStop()