[Evolution-commits] CVS: evolutionlejeu/Evolution/Ulysses GameScreen.cpp,1.89,1.90

[Greg <evo...@us...>]

Update of /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Ulysses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4353/Evolution/Ulysses

Modified Files:
	GameScreen.cpp 
Log Message:
FIX : Compilation issue in release (name collision)

Index: GameScreen.cpp
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Ulysses/GameScreen.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** GameScreen.cpp	20 Oct 2005 16:43:28 -0000	1.89
--- GameScreen.cpp	16 Dec 2005 16:20:13 -0000	1.90
***************
*** 913,921 ****
  {
  	Kernel *pKernel = Kernel::LockKernel();
! 	evoTime tOld = pKernel->kronos.TimeLine().GetCurrentTime();
  
  	OnJumpNextEvent();
  
! 	evoTime tNew = pKernel->kronos.TimeLine().GetCurrentTime();
  
  	pKernel->Unlock();
--- 913,921 ----
  {
  	Kernel *pKernel = Kernel::LockKernel();
! 	evoTime tOld = pKernel->kronos.TimeLine().CurrentTime();
  
  	OnJumpNextEvent();
  
! 	evoTime tNew = pKernel->kronos.TimeLine().CurrentTime();
  
  	pKernel->Unlock();