[Timewarp-commit] source melee.h,1.30,1.31

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

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

Modified Files:
	melee.h 
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: melee.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** melee.h	29 Jan 2006 21:06:15 -0000	1.30
--- melee.h	15 Mar 2006 13:04:37 -0000	1.31
***************
*** 447,451 ****
  	unsigned int general_attributes;
  	enum {
- 		MATCH_SCREEN_FORMAT = 0x001, 
  		IRREGULAR           = 0x002, 
  		MIPMAPED            = 0x004, 
--- 447,450 ----
***************
*** 501,505 ****
  	void regenerate_mipmaps();
  
! 	void permanent_phase_shift ( int index );
  
  	virtual void change_color_depth(int dest);
--- 500,504 ----
  	void regenerate_mipmaps();
  
! 	//void permanent_phase_shift ( int index );
  
  	virtual void change_color_depth(int dest);
***************
*** 519,523 ****
  };
  
! int string_to_sprite_attributes ( const char *s, int recommended = SpaceSprite::MASKED | SpaceSprite::MATCH_SCREEN_FORMAT | SpaceSprite::MIPMAPED) ;
  
  
--- 518,522 ----
  };
  
! int string_to_sprite_attributes ( const char *s, int recommended = SpaceSprite::MASKED | SpaceSprite::MIPMAPED) ;