From: <bal...@us...> - 2003-12-29 20:10:13
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core In directory sc8-pr-cvs1:/tmp/cvs-serv32551/plugins/Core Modified Files: GlobalTimer.cpp Log Message: GlobalTimer.cpp : - Added Waiting for Dialog end Index: GlobalTimer.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GlobalTimer.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GlobalTimer.cpp 15 Dec 2003 11:07:54 -0000 1.5 --- GlobalTimer.cpp 29 Dec 2003 20:10:06 -0000 1.6 *************** *** 53,56 **** --- 53,61 ---- return; } + GameControl * gc = (GameControl*)core->GetWindow(0)->GetControl(0); + if(gc->ControlType == IE_GUI_GAMECONTROL) { + if(gc->Dialogue) + return; + } MovingActor = NULL; if(CutScene) { |