[Timewarp-commit] source/games ggob.cpp,1.42,1.43 gsamp2.cpp,1.11,1.12

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

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

Modified Files:
	ggob.cpp gsamp2.cpp 
Log Message:
sprite loading mistake (an attribitute wasn't properly set - I decided to remove that attribute completely to avoid future mistakes; it's a useless attribute. Also, a sprite-phaseshift removed (used in gob to rotate a starbase), because it wasn't compatible with the rotate-on-demand sprite method (which I introduced some time ago).

Index: ggob.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** ggob.cpp	28 Aug 2005 20:31:00 -0000	1.42
--- ggob.cpp	15 Mar 2006 13:04:37 -0000	1.43
***************
*** 155,159 ****
  	stationSprite[0] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	unload_datafile_object(tmpdata);
! 	stationSprite[0]->permanent_phase_shift(8);
  
  	tmpdata = load_datafile_object("gob.dat", "station1sprite");
--- 155,159 ----
  	stationSprite[0] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	unload_datafile_object(tmpdata);
! //	stationSprite[0]->permanent_phase_shift(8);
  
  	tmpdata = load_datafile_object("gob.dat", "station1sprite");
***************
*** 161,165 ****
  	stationSprite[1] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	unload_datafile_object(tmpdata);
! 	stationSprite[1]->permanent_phase_shift(8);
  
  	tmpdata = load_datafile_object("gob.dat", "station2sprite");
--- 161,165 ----
  	stationSprite[1] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	unload_datafile_object(tmpdata);
! //	stationSprite[1]->permanent_phase_shift(8);
  
  	tmpdata = load_datafile_object("gob.dat", "station2sprite");
***************
*** 167,171 ****
  	stationSprite[2] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	unload_datafile_object(tmpdata);
! 	stationSprite[2]->permanent_phase_shift(8);
  
  	tmpdata = load_datafile_object("gob.dat", "defender");
--- 167,171 ----
  	stationSprite[2] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	unload_datafile_object(tmpdata);
! //	stationSprite[2]->permanent_phase_shift(8);
  
  	tmpdata = load_datafile_object("gob.dat", "defender");

Index: gsamp2.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gsamp2.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gsamp2.cpp	14 Aug 2005 16:14:32 -0000	1.11
--- gsamp2.cpp	15 Mar 2006 13:04:37 -0000	1.12
***************
*** 218,222 ****
  	if (!tmpdata) error( "couldn't find gob.dat#station0sprite");
  	stationsprite = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED, 64);
! 	stationsprite->permanent_phase_shift(8);
  	unload_datafile_object(tmpdata);
  
--- 218,222 ----
  	if (!tmpdata) error( "couldn't find gob.dat#station0sprite");
  	stationsprite = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED, 64);
! //	stationsprite->permanent_phase_shift(8);
  	unload_datafile_object(tmpdata);