From: Laszlo T. <ave...@us...> - 2005-04-19 20:12:16
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5449/plugins/Core Modified Files: GameControl.cpp GameControl.h Interface.cpp Log Message: fixed Dialog start in pst (no messagewindow present when dialog is started) Index: Interface.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.cpp,v retrieving revision 1.296 retrieving revision 1.297 diff -C2 -d -r1.296 -r1.297 *** Interface.cpp 10 Apr 2005 19:04:26 -0000 1.296 --- Interface.cpp 19 Apr 2005 20:11:53 -0000 1.297 *************** *** 1874,1878 **** guiscript->RunFunction( "UpdateControlStatus" ); //giving control back to GameControl ! SetControlStatus(0,0,0xff000000|IE_GUI_CONTROL_FOCUSED); } } --- 1874,1882 ---- guiscript->RunFunction( "UpdateControlStatus" ); //giving control back to GameControl ! SetControlStatus(0,0,0x7f000000|IE_GUI_CONTROL_FOCUSED); ! GameControl *gc = GetGameControl(); ! if (gc->GetDialogueFlags()&DF_START_DIALOG) { ! gc->DialogChoose( (unsigned int) -1); ! } } } Index: GameControl.h =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameControl.h,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** GameControl.h 8 Apr 2005 16:54:34 -0000 1.64 --- GameControl.h 19 Apr 2005 20:11:52 -0000 1.65 *************** *** 50,53 **** --- 50,54 ---- #define DF_UNBREAKABLE 4 #define DF_FREEZE_SCRIPTS 8 + #define DF_START_DIALOG 16 //screen flags Index: GameControl.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameControl.cpp,v retrieving revision 1.221 retrieving revision 1.222 diff -C2 -d -r1.221 -r1.222 *** GameControl.cpp 17 Apr 2005 13:00:02 -0000 1.221 --- GameControl.cpp 19 Apr 2005 20:11:49 -0000 1.222 *************** *** 1313,1317 **** this->speaker = speaker; ScreenFlags |= SF_GUIENABLED|SF_DISABLEMOUSE|SF_CENTERONACTOR|SF_LOCKSCROLL; ! DialogueFlags |= DF_IN_DIALOG; //allow mouse selection from dialog (even though screen is locked) core->GetVideoDriver()->DisableMouse = false; --- 1313,1317 ---- this->speaker = speaker; ScreenFlags |= SF_GUIENABLED|SF_DISABLEMOUSE|SF_CENTERONACTOR|SF_LOCKSCROLL; ! DialogueFlags |= DF_IN_DIALOG|DF_START_DIALOG; //allow mouse selection from dialog (even though screen is locked) core->GetVideoDriver()->DisableMouse = false; *************** *** 1323,1327 **** ieDword index = core->GetGame()->ControlStatus&~3; core->GetGame()->SetControlStatus(index + 2, BM_SET); ! DialogChoose( (unsigned int) -1 ); } --- 1323,1327 ---- ieDword index = core->GetGame()->ControlStatus&~3; core->GetGame()->SetControlStatus(index + 2, BM_SET); ! //DialogChoose( (unsigned int) -1 ); } *************** *** 1366,1369 **** --- 1366,1370 ---- char Tmp[256]; + DialogueFlags&=~DF_START_DIALOG; TextArea* ta = core->GetMessageTextArea(); if (!ta) { |