[Gemrb-commits] gemrb/gemrb/plugins/Core GameControl.cpp,1.250,1.251 Interface.cpp,1.344,1.345

[Jarda B. <edh...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20307/plugins/Core

Modified Files:
	GameControl.cpp Interface.cpp 
Log Message:
Option to let MessageWindow behave as in PS:T, i.e. no cleaning after each reply



Index: Interface.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.cpp,v
retrieving revision 1.344
retrieving revision 1.345
diff -C2 -d -r1.344 -r1.345
*** Interface.cpp	15 Aug 2005 15:55:39 -0000	1.344
--- Interface.cpp	22 Aug 2005 23:10:17 -0000	1.345
***************
*** 1545,1548 ****
--- 1545,1549 ----
  	SetFeature( ini->GetKeyAsInt( "resources", "SmallFog", 1 ), GF_SMALL_FOG );
  	SetFeature( ini->GetKeyAsInt( "resources", "ReverseDoor", 0 ), GF_REVERSE_DOOR );
+ 	SetFeature( ini->GetKeyAsInt( "resources", "DialogueScrolls", 0 ), GF_DIALOGUE_SCROLLS );
  	ForceStereo = ini->GetKeyAsInt( "resources", "ForceStereo", 0 );
  

Index: GameControl.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GameControl.cpp,v
retrieving revision 1.250
retrieving revision 1.251
diff -C2 -d -r1.250 -r1.251
*** GameControl.cpp	13 Aug 2005 10:50:09 -0000	1.250
--- GameControl.cpp	22 Aug 2005 23:10:17 -0000	1.251
***************
*** 1521,1524 ****
--- 1521,1527 ----
  		if (tr->textStrRef != 0xffffffff) {
  			core->DisplayStringName( tr->textStrRef, 0x8080FF, speaker);
+ 			if (core->HasFeature( GF_DIALOGUE_SCROLLS )) {
+ 				ta->AppendText( "", -1 );
+ 			}
  		}
  
***************
*** 1615,1619 ****
  end_of_choose:
  	//padding the rows so our text will be at the top
! 	ta->PadMinRow();
  	// is this correct?
  	if (DialogueFlags & DF_FREEZE_SCRIPTS) {
--- 1618,1627 ----
  end_of_choose:
  	//padding the rows so our text will be at the top
! 	if (core->HasFeature( GF_DIALOGUE_SCROLLS )) {
! 		ta->AppendText( "", -1 );
! 	}
! 	else {
! 		ta->PadMinRow();
! 	}
  	// is this correct?
  	if (DialogueFlags & DF_FREEZE_SCRIPTS) {