[Timewarp-commit] source/melee mgame.cpp,1.58,1.59 mshot.cpp,1.21,1.22

[Rob <geo...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv548/source/melee

Modified Files:
	mgame.cpp mshot.cpp 
Log Message:
don't remember, I think only changes due to bug-hunting, but no real changes to the game.

Index: mshot.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshot.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mshot.cpp	23 Aug 2005 22:21:16 -0000	1.21
--- mshot.cpp	5 Oct 2005 20:24:49 -0000	1.22
***************
*** 146,149 ****
--- 146,154 ----
  	SpaceLocation::scale_vel(scale);
  	v *= scale;
+ 
+ 	if (v < 0.01)
+ 		v = 0.01;
+ 	// prevent negative velocities!
+ 
  	range = d + (range - d) * scale;
  	// the remaining distance should also be scaled, otherwise it could live forever.

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** mgame.cpp	22 Sep 2005 07:24:31 -0000	1.58
--- mgame.cpp	5 Oct 2005 20:24:49 -0000	1.59
***************
*** 230,234 ****
  	if (!melee) tw_error("Error loading melee data\n");
  
! 	meleedata.panelSprite             = new SpaceSprite(&melee[MELEE_PANEL], PANEL_FRAMES, SpaceSprite::IRREGULAR);
  	meleedata.kaboomSprite            = new SpaceSprite(&melee[MELEE_KABOOM], KABOOM_FRAMES,
  		SpaceSprite::ALPHA | SpaceSprite::MASKED);// | SpaceSprite::MIPMAPED);
--- 230,234 ----
  	if (!melee) tw_error("Error loading melee data\n");
  
! 	meleedata.panelSprite             = new SpaceSprite(&melee[MELEE_PANEL], PANEL_FRAMES, SpaceSprite::IRREGULAR | SpaceSprite::MATCH_SCREEN_FORMAT);
  	meleedata.kaboomSprite            = new SpaceSprite(&melee[MELEE_KABOOM], KABOOM_FRAMES,
  		SpaceSprite::ALPHA | SpaceSprite::MASKED);// | SpaceSprite::MIPMAPED);