[Gemrb-commits] gemrb/gemrb/plugins/Core Actions.cpp,1.32,1.33 GSUtils.cpp,1.20,1.21

[Laszlo T. <ave...@us...>]

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

Modified Files:
	Actions.cpp GSUtils.cpp 
Log Message:
fixed disabled mouse in textscreen


Index: GSUtils.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/GSUtils.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** GSUtils.cpp	6 Aug 2005 16:28:39 -0000	1.20
--- GSUtils.cpp	12 Aug 2005 19:14:35 -0000	1.21
***************
*** 559,567 ****
  
  	if (flags &EA_DESTROY) {
! 		src->AddActionInFront( GenerateAction("DestroySelf()") );
  	} else {
  		sprintf( Tmp, "JumpToPoint(\"%s\",[%hd.%hd])", resref, enter.x, enter.y );
- 		src->AddActionInFront( GenerateAction( Tmp, true ) );
  	}
  	sprintf( Tmp, "MoveToPoint([%hd.%hd])", exit.x, exit.y );
  	src->AddActionInFront( GenerateAction( Tmp, true ) );
--- 559,568 ----
  
  	if (flags &EA_DESTROY) {
! 		//this must be put into a non-const variable
! 		sprintf( Tmp, "DestroySelf()" );
  	} else {
  		sprintf( Tmp, "JumpToPoint(\"%s\",[%hd.%hd])", resref, enter.x, enter.y );
  	}
+ 	src->AddActionInFront( GenerateAction( Tmp, true ) );
  	sprintf( Tmp, "MoveToPoint([%hd.%hd])", exit.x, exit.y );
  	src->AddActionInFront( GenerateAction( Tmp, true ) );

Index: Actions.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Actions.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Actions.cpp	6 Aug 2005 16:28:39 -0000	1.32
--- Actions.cpp	12 Aug 2005 19:14:35 -0000	1.33
***************
*** 2488,2491 ****
--- 2488,2492 ----
  	strnuprcpy(core->GetGame()->LoadMos, parameters->string0Parameter,8);
  	core->GetGUIScriptEngine()->RunFunction( "StartTextScreen" );
+ 	core->GetVideoDriver()->DisableMouse = false;
  }