[Gemrb-commits] gemrb/gemrb/plugins/Core Game.cpp, 1.128, 1.129 Particles.cpp, 1.2, 1.3

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

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

Modified Files:
	Game.cpp Particles.cpp 
Log Message:
fixed a non-initialized value in the weather code


Index: Particles.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Particles.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Particles.cpp	5 Nov 2006 11:11:45 -0000	1.2
--- Particles.cpp	6 Nov 2006 19:15:41 -0000	1.3
***************
*** 93,96 ****
--- 93,97 ----
  	}
  	size = last_insert = s;
+ 	phase = P_FADE;
  }
  

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Game.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** Game.cpp	15 Oct 2006 09:49:31 -0000	1.128
--- Game.cpp	6 Nov 2006 19:15:41 -0000	1.129
***************
*** 1319,1322 ****
--- 1319,1325 ----
  void Game::DrawWeather(Region &screen, bool update)
  {
+ 	if (!weather) {
+ 		return;
+ 	}
  	if (!area->HasWeather()) {
  		return;
***************
*** 1333,1337 ****
  		}
  	}
! 	if (weather && (GameTime&1) ) {
  		int drawn = weather->Update();
  		if (drawn) {
--- 1336,1340 ----
  		}
  	}
! 	if (GameTime&1) {
  		int drawn = weather->Update();
  		if (drawn) {