timewarp-commit — Shows each and every CVS commit - high volume

[Timewarp-commit] source/melee mshpdata.cpp,1.21,1.22

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

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

Modified Files:
	mshpdata.cpp 
Log Message:
added support for relative filenames

Index: mshpdata.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshpdata.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mshpdata.cpp	16 Mar 2006 22:07:18 -0000	1.21
--- mshpdata.cpp	23 Apr 2006 09:47:07 -0000	1.22
***************
*** 27,30 ****
--- 27,76 ----
  
  
+ char *create_filename(const char *base_directory, const char *file_name)
+ {
+ 	static char result[512];
+ 
+ 	if (file_name[0] == '/')
+ 	{
+ 		// skip the '/' character
+ 		++file_name;
+ 
+ 		// use "absolute" path, wrt the game root
+ 		// i.e., ignore the current custom base_directory.
+ 		strcpy(result, file_name);
+ 
+ 	} else if (file_name[0] == '.' && file_name[1] == '.' && file_name[2] == '/')
+ 	{
+ 		// relative path
+ 		char tmp_dir[512];
+ 		strcpy(tmp_dir, base_directory);
+ 
+ 		while (file_name[0] == '.' && file_name[1] == '.' && file_name[2] == '/')
+ 		{
+ 			// skip the ../ part
+ 			file_name += 3;
+ 
+ 			// also reduce the base-dir:
+ 			char *tmp = strrchr(tmp_dir, '/');
+ 			if (tmp)
+ 				*tmp = 0;
+ 		}
+ 
+ 		// finally, combine the two:
+ 		strcpy(result, tmp_dir);
+ 		strcat(result, "/");
+ 		strcat(result, file_name);
+ 
+ 	} else {
+ 		// normal path
+ 		strcpy(result, base_directory);
+ 		strcat(result, "/");
+ 		strcat(result, file_name);
+ 	}
+ 
+ 	return result;
+ }
+ 
+ 
  // for debugging ...
  void test_pointers()
***************
*** 414,420 ****
  	// the first argument is the base of the filename.
  	char base_filename[512];
! 	strcpy(base_filename, dirname);
! 	strcat(base_filename, "/");
! 	strcat(base_filename, argv[0]);
  
  	// the second is the number of files that you should read.
--- 460,464 ----
  	// the first argument is the base of the filename.
  	char base_filename[512];
! 	strcpy(base_filename, create_filename(dirname, argv[0]));
  
  	// the second is the number of files that you should read.
***************
*** 509,515 ****
  	// base name
  	char base_filename[512];
! 	strcpy(base_filename, dirname);
! 	strcat(base_filename, "/");
! 	strcat(base_filename, argv[0]);
  
  	// load weapon samples
--- 553,557 ----
  	// base name
  	char base_filename[512];
! 	strcpy(base_filename, create_filename(dirname, argv[0]));
  
  	// load weapon samples
***************
*** 829,834 ****
  	// initialize ship victory ditty
  	
! 	char modfilename[512];
! 	strcpy(modfilename, get_config_string("Objects", "Ditty", ""));
  	moduleVictory = load_mod(modfilename);
  
--- 871,876 ----
  	// initialize ship victory ditty
  	
! 	char *modfilename;
! 	modfilename = create_filename(dirname, get_config_string("Objects", "Ditty", ""));
  	moduleVictory = load_mod(modfilename);
  

[Timewarp-commit] source/interface GameSessionConfiguration.cpp,1.2,NONE GameSessionConfiguration.h,1.2,NONE HostGameMenu.cpp,1.2,NONE HostGameMenu.h,1.3,NONE Interface.cpp,1.6,NONE Interface.h,1.5,NONE MainMenu.cpp,1.2,NONE MainMenu.h,1.5,NONE OptionsMenu.cpp,1.4,NONE OptionsMenu.h,1.4,NONE OverlayMenu.cpp,1.1,NONE OverlayMenu.h,1.2,NONE PlayLocalMenu.cpp,1.7,NONE PlayLocalMenu.h,1.8,NONE PlayOnlineMenu.cpp,1.2,NONE PlayOnlineMenu.h,1.4,NONE SettingsPage.cpp,1.5,NONE SettingsPage.h,1.4,NONE

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

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

Removed Files:
	GameSessionConfiguration.cpp GameSessionConfiguration.h 
	HostGameMenu.cpp HostGameMenu.h Interface.cpp Interface.h 
	MainMenu.cpp MainMenu.h OptionsMenu.cpp OptionsMenu.h 
	OverlayMenu.cpp OverlayMenu.h PlayLocalMenu.cpp 
	PlayLocalMenu.h PlayOnlineMenu.cpp PlayOnlineMenu.h 
	SettingsPage.cpp SettingsPage.h 
Log Message:
removal of masking dependencies

--- GameSessionConfiguration.h DELETED ---

--- OptionsMenu.cpp DELETED ---

--- MainMenu.cpp DELETED ---

--- MainMenu.h DELETED ---

--- PlayLocalMenu.h DELETED ---

--- OptionsMenu.h DELETED ---

--- PlayLocalMenu.cpp DELETED ---

--- HostGameMenu.h DELETED ---

--- PlayOnlineMenu.h DELETED ---

--- PlayOnlineMenu.cpp DELETED ---

--- Interface.h DELETED ---

--- SettingsPage.h DELETED ---

--- OverlayMenu.cpp DELETED ---

--- HostGameMenu.cpp DELETED ---

--- Interface.cpp DELETED ---

--- SettingsPage.cpp DELETED ---

--- GameSessionConfiguration.cpp DELETED ---

--- OverlayMenu.h DELETED ---

[Timewarp-commit] include MASkinG.h,1.2,NONE

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

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

Removed Files:
	MASkinG.h 
Log Message:
removed masking lib

--- MASkinG.h DELETED ---

[Timewarp-commit] include/MASkinG accelerator.h,1.1,NONE animator.h,1.1,NONE bitmap.h,1.2,NONE button.h,1.2,NONE checkbox.h,1.2,NONE clearscreen.h,1.2,NONE color.h,1.1,NONE colorsel.h,1.1,NONE combobox.h,1.1,NONE cursor.h,1.1,NONE defines.h,1.2,NONE dialog.h,1.1,NONE doublebuffer.h,1.1,NONE drs.h,1.1,NONE editbox.h,1.2,NONE error.h,1.1,NONE fileselect.h,1.2,NONE font.h,1.1,NONE fps.h,1.2,NONE gldialog.h,1.1,NONE gldriver.h,1.1,NONE global.h,1.1,NONE glviewport.h,1.1,NONE groupbox.h,1.1,NONE hypertext.h,1.2,NONE image.h,1.2,NONE label.h,1.2,NONE license.txt,1.1,NONE listbox.h,1.2,NONE menu.h,1.1,NONE messagebox.h,1.1,NONE mouse.h,1.1,NONE pageflipping.h,1.1,NONE panel.h,1.1,NONE point.h,1.1,NONE progress.h,1.1,NONE radiobutton.h,1.2,NONE rect.h,1.1,NONE sample.h,1.1,NONE screenupdate.h,1.1,NONE scrollbox.h,1.2,NONE scroller.h,1.1,NONE scrollobj.h,1.1,NONE separator.h,1.1,NONE settings.h,1.1,NONE shortcut.h,1.1,NONE size.h,1.1,NONE skin.h,1.1,NONE slider.h,1.1,NONE spinbox.h,1.2,NONE splitter.h,1.1,NONE tabpanel.h,1.1,NONE textarea.h,1.2,NONE timer.h,1.2,NONE tooltip.h,1.1,NONE triplebuffer.h,1.1,NONE wallpaper.h,1.2,NONE widget.h,1.1,NONE window.h,1.1,NONE

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

Update of /cvsroot/timewarp/include/MASkinG
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1612/include/MASkinG

Removed Files:
	accelerator.h animator.h bitmap.h button.h checkbox.h 
	clearscreen.h color.h colorsel.h combobox.h cursor.h defines.h 
	dialog.h doublebuffer.h drs.h editbox.h error.h fileselect.h 
	font.h fps.h gldialog.h gldriver.h global.h glviewport.h 
	groupbox.h hypertext.h image.h label.h license.txt listbox.h 
	menu.h messagebox.h mouse.h pageflipping.h panel.h point.h 
	progress.h radiobutton.h rect.h sample.h screenupdate.h 
	scrollbox.h scroller.h scrollobj.h separator.h settings.h 
	shortcut.h size.h skin.h slider.h spinbox.h splitter.h 
	tabpanel.h textarea.h timer.h tooltip.h triplebuffer.h 
	wallpaper.h widget.h window.h 
Log Message:
removed masking lib

--- animator.h DELETED ---

--- cursor.h DELETED ---

--- combobox.h DELETED ---

--- screenupdate.h DELETED ---

--- tabpanel.h DELETED ---

--- spinbox.h DELETED ---

--- rect.h DELETED ---

--- panel.h DELETED ---

--- clearscreen.h DELETED ---

--- size.h DELETED ---

--- menu.h DELETED ---

--- hypertext.h DELETED ---

--- point.h DELETED ---

--- dialog.h DELETED ---

--- scrollobj.h DELETED ---

--- listbox.h DELETED ---

--- tooltip.h DELETED ---

--- label.h DELETED ---

--- timer.h DELETED ---

--- scrollbox.h DELETED ---

--- sample.h DELETED ---

--- skin.h DELETED ---

--- groupbox.h DELETED ---

--- font.h DELETED ---

--- triplebuffer.h DELETED ---

--- mouse.h DELETED ---

--- window.h DELETED ---

--- widget.h DELETED ---

--- editbox.h DELETED ---

--- radiobutton.h DELETED ---

--- settings.h DELETED ---

--- textarea.h DELETED ---

--- checkbox.h DELETED ---

--- doublebuffer.h DELETED ---

--- drs.h DELETED ---

--- defines.h DELETED ---

--- progress.h DELETED ---

--- gldriver.h DELETED ---

--- wallpaper.h DELETED ---

--- error.h DELETED ---

--- splitter.h DELETED ---

--- button.h DELETED ---

--- slider.h DELETED ---

--- fileselect.h DELETED ---

--- image.h DELETED ---

--- messagebox.h DELETED ---

--- separator.h DELETED ---

--- license.txt DELETED ---

--- scroller.h DELETED ---

--- glviewport.h DELETED ---

--- colorsel.h DELETED ---

--- color.h DELETED ---

--- accelerator.h DELETED ---

--- shortcut.h DELETED ---

--- gldialog.h DELETED ---

--- global.h DELETED ---

--- pageflipping.h DELETED ---

--- fps.h DELETED ---

--- bitmap.h DELETED ---

[Timewarp-commit] source/melee mcontrol.cpp,1.30,1.31 mgame.cpp,1.62,1.63

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

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

Modified Files:
	mcontrol.cpp mgame.cpp 
Log Message:
network bug-fix (still needs to be tested)

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** mgame.cpp	16 Mar 2006 21:52:32 -0000	1.62
--- mgame.cpp	22 Apr 2006 09:32:21 -0000	1.63
***************
*** 1451,1474 ****
  			int t = get_time();
  			
- 			NetLog *l = (NetLog*) glog;
- 			if (l->type == Log::log_net)
- 			{
- 				l->flush_noblock();
- 				
- 				l->recv_noblock();		// receive stuff, if you can
- 				
- 			}
- 			events.handle();	// this will read events. You send events during the game.
- 			// if all "start-iterations" are set, then they're all_ready.
- 			
- 			// Note, that the IF statement ensures, that you do not block the game by waiting
- 			// for (networked) input. This means, that graphics won't be blocked: otherwise,
- 			// graphics of this user can be delayed by graphics of another user, resulting in
- 			// a pretty slow framerate.
- 			
  			// wait till all events are ready...
  			int count_idle = 0;
  			while (!events.all_ready())
  			{
  				idle(1);
  				
--- 1451,1471 ----
  			int t = get_time();
  			
  			// wait till all events are ready...
  			int count_idle = 0;
+ 
  			while (!events.all_ready())
  			{
+ 				NetLog *l = (NetLog*) glog;
+ 				if (l->type == Log::log_net)
+ 				{
+ 					l->flush_noblock();		// send stuff, if you can.
+ 					
+ 					l->recv_noblock();		// receive stuff, if you can.
+ 					
+ 				}
+ 				events.handle();	// this will read events. You send events during the game.
+ 				// if all "start-iterations" are set, then they're all_ready.
+ 			
+ 			
  				idle(1);
  				
***************
*** 1647,1651 ****
  			// ALWAYS send/recv at end.
  			// this is the best place for this, in FRONT of the animation, cause
! 			// it's best to send data BEFORE an animation starts...
  			
  			// if you don't have to be careful about your connection speed.
--- 1644,1650 ----
  			// ALWAYS send/recv at end.
  			// this is the best place for this, in FRONT of the animation, cause
! 			// it's best to send data BEFORE an animation starts... so that the network can send data
! 			// to the other computers while the animation runs - then there's less waiting time when
! 			// the calculate starts.
  			
  			// if you don't have to be careful about your connection speed.

Index: mcontrol.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcontrol.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** mcontrol.cpp	3 Sep 2005 19:49:45 -0000	1.30
--- mcontrol.cpp	22 Apr 2006 09:32:21 -0000	1.31
***************
*** 206,209 ****
--- 206,222 ----
  
  			unload_datafile( data );
+ 		} else {
+ 			char tmp[512];
+ 			strcpy(tmp, type->data->file);
+ 			
+ 			char *dot = strrchr(tmp, '.');
+ 			if (dot)
+ 			{
+ 				*dot = 0;
+ 			}
+ 			
+ 			strcat(tmp, "/panel_01.bmp");
+ 			// it's a directory I suppose - load panel directly
+ 			panel = load_bitmap(tmp, 0);
  		}
  

[Timewarp-commit] source/newships shpastba.cpp,1.10,1.11 shpgahmo.cpp,1.11,1.12 shpimpka.cpp,1.18,1.19

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

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

Modified Files:
	shpastba.cpp shpgahmo.cpp shpimpka.cpp 
Log Message:
removed use of ::collide, which is obsolete in case of Lasers

Index: shpimpka.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpimpka.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** shpimpka.cpp	28 Aug 2005 20:34:08 -0000	1.18
--- shpimpka.cpp	22 Apr 2006 09:24:53 -0000	1.19
***************
*** 51,54 ****
--- 51,55 ----
    // blade. a laser that handles non-integer damage and splits victim in two after kill
  
+   double old_length;
    double res;
    ImperialKatana* katana;
***************
*** 59,63 ****
      bool osinc_angle = false );
  
-   virtual void collide( SpaceObject* other );
    virtual void inflict_damage( SpaceObject* other );
  };
--- 60,63 ----
***************
*** 387,404 ****
    double rel_y, bool osinc_angle ):
  Laser( creator, langle, lcolor, lrange, (int)ldamage, lfcount, opos, Vector2(rel_x,rel_y), osinc_angle ),
!   res( ldamage - (int)ldamage ), katana( creator ){
! }
  
! void ImperialBlade::collide( SpaceObject* other ){
! 	STACKTRACE
!   double old_length = length;
!   SpaceLine::collide( other );
!   length = old_length;
  }
  
! void ImperialBlade::inflict_damage( SpaceObject *other ){
! 	STACKTRACE
    if( !other->exists() ) return;
  
    katana->residualDamage += res;
    if( katana->residualDamage >= 1 ){
--- 387,405 ----
    double rel_y, bool osinc_angle ):
  Laser( creator, langle, lcolor, lrange, (int)ldamage, lfcount, opos, Vector2(rel_x,rel_y), osinc_angle ),
!   res( ldamage - (int)ldamage ), katana( creator )
! {
  
! 	// store original length (to undo length shortening on collision)
! 	old_length = length;
  }
  
! 
! void ImperialBlade::inflict_damage( SpaceObject *other )
! {
! 
! 	length = old_length;
    if( !other->exists() ) return;
  
+ 
    katana->residualDamage += res;
    if( katana->residualDamage >= 1 ){

Index: shpastba.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpastba.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpastba.cpp	28 Aug 2005 20:34:07 -0000	1.10
--- shpastba.cpp	22 Apr 2006 09:24:53 -0000	1.11
***************
*** 114,117 ****
--- 114,118 ----
  	double angle_range;
  	int oncolor, offcolor;
+ 	int len;
  
  protected:
***************
*** 120,124 ****
  public:
  	virtual void calculate();
! 	virtual void collide(SpaceObject *o);
  
  	BasiliskAimline::BasiliskAimline(AstromorphBasilisk *creator, double langle, 
--- 121,126 ----
  public:
  	virtual void calculate();
! 	//virtual void collide(SpaceObject *o);
! 	virtual void inflict_damage( SpaceObject* other );
  
  	BasiliskAimline::BasiliskAimline(AstromorphBasilisk *creator, double langle, 
***************
*** 138,141 ****
--- 140,145 ----
  	offcolor = ooffcolor;
  
+ 	len = length;
+ 
  	ship = creator;
  	
***************
*** 186,203 ****
  // ***************************************************************************
  
! void BasiliskAimline::collide(SpaceObject *o)
  {
! 	STACKTRACE;
! 
! 	if (  *(int*)(o) < 0x01000000 )
! 		tw_error("Error in pointer addresss...");
!   
! 	if((!canCollide(o)) || (!o->canCollide(this)))
! 		return;
  
! 	if(target == NULL && o->isShip())
! 		target = o;
  
- 	
  	return;
  }
--- 190,203 ----
  // ***************************************************************************
  
! void BasiliskAimline::inflict_damage( SpaceObject* other )
  {
! 	if(target == NULL && other->isShip())
! 	{
! 		target = other;
  
! 		// also restore laser length
! 		length = len;
! 	}
  
  	return;
  }

Index: shpgahmo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpgahmo.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpgahmo.cpp	28 Aug 2005 20:34:08 -0000	1.11
--- shpgahmo.cpp	22 Apr 2006 09:24:53 -0000	1.12
***************
*** 124,128 ****
  		int lfcount, SpaceLocation *opos, Vector2 rpos, bool osinc_angle);
  	virtual void inflict_damage(SpaceObject *other);
! 	virtual void collide(SpaceObject *other);
  	virtual void calculate();
  	GahmurMonitor* creator;
--- 124,130 ----
  		int lfcount, SpaceLocation *opos, Vector2 rpos, bool osinc_angle);
  	virtual void inflict_damage(SpaceObject *other);
! 
! 	virtual int canCollide(SpaceLocation *other);
! 
  	virtual void calculate();
  	GahmurMonitor* creator;
***************
*** 190,198 ****
  
  
! void GahmurTractor::collide(SpaceObject* other) {
! 	STACKTRACE;
! 	if(other->isShot()) return;
! 	if(other->isLine()) return;
! 	Laser::collide(other);
  }
  
--- 192,204 ----
  
  
! int GahmurTractor::canCollide(SpaceLocation *other)
! {
! 	if(other->isShot())
! 		return false;
! 
! 	if(other->isLine())
! 		return false;
! 
! 	return Laser::canCollide(other);
  }
  

[Timewarp-commit] source/sc3ships shpharra.cpp,1.7,1.8

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

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

Modified Files:
	shpharra.cpp 
Log Message:
removed use of ::collide, which is obsolete in case of Lasers

Index: shpharra.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpharra.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpharra.cpp	11 Jul 2005 00:25:59 -0000	1.7
--- shpharra.cpp	22 Apr 2006 09:24:54 -0000	1.8
***************
*** 58,62 ****
    public:
    virtual void calculate();
!   virtual void collide(SpaceObject *o);
    LassoLaser (LassoMissile *oLeft ,LassoMissile *oRight,Ship *oship);
  };
--- 58,63 ----
    public:
    virtual void calculate();
!   //virtual void collide(SpaceObject *o);
! 	virtual void inflict_damage( SpaceObject* other );   // does not inflict damage
    LassoLaser (LassoMissile *oLeft ,LassoMissile *oRight,Ship *oship);
  };
***************
*** 201,229 ****
  }
  
! void LassoLaser::collide(SpaceObject *o)
  {
!   double old_length = length;
!   double old_oldlen;
!   int collison = FALSE;
! 
!   if((!canCollide(o)) || (!o->canCollide(this)))
!     return;
!   for (int i=0; i < BCC ; i++) {
!   old_oldlen = o->collide_ray(Vector2(oldnx[i], oldny[i]), Vector2(oldnx[i] + oldex[i],
!     oldny[i] + oldey[i]), oldlen[i]);
!   collison = (collison || (old_oldlen != oldlen[i]));
!   }
!   length = o->collide_ray(normal_pos(), normal_pos() + edge(), length);
!   if ( (length == old_length) && (!collison) )
!     return;
! 
!   play_sound2(LeftMissile->data->sampleExtra[0]);
! 
!   if ((LeftMissile->exists()) && (LeftMissile->sameShip(this)) && (!snapped))
!     LeftMissile->changeDirection(normalize(LeftMissile->get_angle()+PI/2,PI2));
!   if ((RightMissile->exists()) && (RightMissile->sameShip(this)) && (!snapped))
!     RightMissile->changeDirection(normalize(RightMissile->get_angle()-PI/2,PI2));
!   state = 0;
!   snapped = TRUE;
  }
  
--- 202,221 ----
  }
  
! void LassoLaser::inflict_damage( SpaceObject* other )
  {
! 	Laser::inflict_damage(other);
! 	
! 	
! 	play_sound2(LeftMissile->data->sampleExtra[0]);
! 	
! 	if ((LeftMissile->exists()) && (LeftMissile->sameShip(this)) && (!snapped))
! 		LeftMissile->changeDirection(normalize(LeftMissile->get_angle()+PI/2,PI2));
! 	
! 	if ((RightMissile->exists()) && (RightMissile->sameShip(this)) && (!snapped))
! 		RightMissile->changeDirection(normalize(RightMissile->get_angle()-PI/2,PI2));
! 	
! 	die();
! 	
! 	snapped = TRUE;
  }
  

[Timewarp-commit] source/melee mframe.cpp,1.50,1.51 mframe.h,1.30,1.31

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

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

Modified Files:
	mframe.cpp mframe.h 
Log Message:
removed use of ::collide, which is obsolete in case of Lasers

Index: mframe.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mframe.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** mframe.h	15 Sep 2005 09:00:11 -0000	1.30
--- mframe.h	22 Apr 2006 09:24:53 -0000	1.31
***************
*** 431,435 ****
  
  	virtual void animate(Frame *space);
! 	virtual void collide(SpaceObject *o);
  	virtual void inflict_damage(SpaceObject *other);
  	virtual void calculate();
--- 431,435 ----
  
  	virtual void animate(Frame *space);
! 	//virtual void collide(SpaceObject *o);
  	virtual void inflict_damage(SpaceObject *other);
  	virtual void calculate();

Index: mframe.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mframe.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** mframe.cpp	5 Oct 2005 20:21:27 -0000	1.50
--- mframe.cpp	22 Apr 2006 09:24:53 -0000	1.51
***************
*** 1298,1312 ****
  }
  
  void SpaceLine::collide(SpaceObject *o)
  {
  	STACKTRACE;
  	double old_length = length;
- 	/*
-   
- 	if((!canCollide(o)) || (!o->canCollide(this)))
- 		return;
  
- 	length = o->collide_ray(normal_pos(), normal_pos() + edge(), length);
- 	*/
  	set_length(collide_testdistance(o));
  	if (length != old_length)
--- 1298,1307 ----
  }
  
+ /*
  void SpaceLine::collide(SpaceObject *o)
  {
  	STACKTRACE;
  	double old_length = length;
  
  	set_length(collide_testdistance(o));
  	if (length != old_length)
***************
*** 1314,1317 ****
--- 1309,1313 ----
  	return;
  }
+ */
  
  void Physics::destroy_all() {
***************
*** 2055,2071 ****
  
  	Query q;
! 	for (q.begin(l, center, OBJECT_LAYERS, 96 + distance/2, QUERY_OBJECT);
! 			q.currento && l->exists(); q.next())
  	{
! 		double d;
! 		d = l->collide_testdistance(q.currento);
! 		// this is the distance to the point of impact
! 
! 		// for long lines (eg chmmr laser), and several objects closeby, there can be >1 points of impact.
! 		// the point that's closest by makes most sense.s
! 		if (d < distance)
  		{
! 			o = q.currento;
! 			distance = d;
  		}
  	}
--- 2051,2071 ----
  
  	Query q;
! 	for (q.begin(l, center, OBJECT_LAYERS, 96 + distance/2, QUERY_OBJECT); q.currento && l->exists(); q.next())
  	{
! 		if (l->canCollide(q.currento))
  		{
! 			
! 			double d;
! 			d = l->collide_testdistance(q.currento);
! 			// this is the distance to the point of impact
! 			
! 			// for long lines (eg chmmr laser), and several objects closeby, there can be >1 points of impact.
! 			// the point that's closest by makes most sense.s
! 			if (d < distance)
! 			{
! 				o = q.currento;
! 				distance = d;
! 			}
! 			
  		}
  	}

[Timewarp-commit] source/masking accelerator.cpp,1.2,NONE animator.cpp,1.2,NONE bitmap.cpp,1.2,NONE button.cpp,1.2,NONE checkbox.cpp,1.2,NONE clearscreen.cpp,1.2,NONE color.cpp,1.2,NONE colorsel.cpp,1.2,NONE combobox.cpp,1.2,NONE cursor.cpp,1.2,NONE dialog.cpp,1.2,NONE doublebuffer.cpp,1.2,NONE drs.cpp,1.2,NONE editbox.cpp,1.2,NONE error.cpp,1.2,NONE fileselect.cpp,1.2,NONE font.cpp,1.2,NONE fps.cpp,1.2,NONE gldialog.cpp,1.2,NONE gldriver.cpp,1.2,NONE glviewport.cpp,1.2,NONE groupbox.cpp,1.2,NONE hypertext.cpp,1.2,NONE image.cpp,1.2,NONE label.cpp,1.2,NONE listbox.cpp,1.2,NONE masking.cpp,1.2,NONE menu.cpp,1.2,NONE messagebox.cpp,1.2,NONE mouse.cpp,1.2,NONE pageflipping.cpp,1.2,NONE panel.cpp,1.2,NONE point.cpp,1.2,NONE progress.cpp,1.2,NONE radiobutton.cpp,1.2,NONE rect.cpp,1.2,NONE sample.cpp,1.2,NONE screenupdate.cpp,1.2,NONE scrollbox.cpp,1.2,NONE scroller.cpp,1.2,NONE scrollobj.cpp,1.2,NONE separator.cpp,1.2,NONE settings.cpp,1.2,NONE shortcut.cpp,1.2,NONE size.cpp,1.2,NONE skin.cpp,1.2,NONE slider.cpp,1.2,NONE spinbox.cpp,1.3,NONE splitter.cpp,1.2,NONE tabpanel.cpp,1.2,NONE textarea.cpp,1.2,NONE timer.cpp,1.2,NONE tooltip.cpp,1.2,NONE triplebuffer.cpp,1.2,NONE wallpaper.cpp,1.2,NONE widget.cpp,1.2,NONE window.cpp,1.2,NONE

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

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

Removed Files:
	accelerator.cpp animator.cpp bitmap.cpp button.cpp 
	checkbox.cpp clearscreen.cpp color.cpp colorsel.cpp 
	combobox.cpp cursor.cpp dialog.cpp doublebuffer.cpp drs.cpp 
	editbox.cpp error.cpp fileselect.cpp font.cpp fps.cpp 
	gldialog.cpp gldriver.cpp glviewport.cpp groupbox.cpp 
	hypertext.cpp image.cpp label.cpp listbox.cpp masking.cpp 
	menu.cpp messagebox.cpp mouse.cpp pageflipping.cpp panel.cpp 
	point.cpp progress.cpp radiobutton.cpp rect.cpp sample.cpp 
	screenupdate.cpp scrollbox.cpp scroller.cpp scrollobj.cpp 
	separator.cpp settings.cpp shortcut.cpp size.cpp skin.cpp 
	slider.cpp spinbox.cpp splitter.cpp tabpanel.cpp textarea.cpp 
	timer.cpp tooltip.cpp triplebuffer.cpp wallpaper.cpp 
	widget.cpp window.cpp 
Log Message:


--- screenupdate.cpp DELETED ---

--- listbox.cpp DELETED ---

--- size.cpp DELETED ---

--- triplebuffer.cpp DELETED ---

--- combobox.cpp DELETED ---

--- masking.cpp DELETED ---

--- tooltip.cpp DELETED ---

--- colorsel.cpp DELETED ---

--- panel.cpp DELETED ---

--- rect.cpp DELETED ---

--- timer.cpp DELETED ---

--- groupbox.cpp DELETED ---

--- point.cpp DELETED ---

--- scrollobj.cpp DELETED ---

--- bitmap.cpp DELETED ---

--- label.cpp DELETED ---

--- separator.cpp DELETED ---

--- color.cpp DELETED ---

--- gldriver.cpp DELETED ---

--- textarea.cpp DELETED ---

--- doublebuffer.cpp DELETED ---

--- pageflipping.cpp DELETED ---

--- checkbox.cpp DELETED ---

--- fileselect.cpp DELETED ---

--- gldialog.cpp DELETED ---

--- animator.cpp DELETED ---

--- scrollbox.cpp DELETED ---

--- accelerator.cpp DELETED ---

--- error.cpp DELETED ---

--- dialog.cpp DELETED ---

--- spinbox.cpp DELETED ---

--- messagebox.cpp DELETED ---

--- shortcut.cpp DELETED ---

--- tabpanel.cpp DELETED ---

--- mouse.cpp DELETED ---

--- widget.cpp DELETED ---

--- glviewport.cpp DELETED ---

--- scroller.cpp DELETED ---

--- button.cpp DELETED ---

--- splitter.cpp DELETED ---

--- cursor.cpp DELETED ---

--- progress.cpp DELETED ---

--- drs.cpp DELETED ---

--- wallpaper.cpp DELETED ---

--- menu.cpp DELETED ---

--- font.cpp DELETED ---

--- clearscreen.cpp DELETED ---

--- hypertext.cpp DELETED ---

--- fps.cpp DELETED ---

--- editbox.cpp DELETED ---

--- image.cpp DELETED ---

--- sample.cpp DELETED ---

--- settings.cpp DELETED ---

--- window.cpp DELETED ---

--- slider.cpp DELETED ---

--- radiobutton.cpp DELETED ---

--- skin.cpp DELETED ---

[Timewarp-commit] ships/ppi/shpscain content.ini,1.2,1.3

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

Update of /cvsroot/timewarp/ships/ppi/shpscain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22105/ships/ppi/shpscain

Modified Files:
	content.ini 
Log Message:
panel bitmaps renamed

Index: content.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/ppi/shpscain/content.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** content.ini	20 Feb 2006 23:28:00 -0000	1.2
--- content.ini	22 Apr 2006 09:19:17 -0000	1.3
***************
*** 10,14 ****
  ExtraExplosion   = 
  
! PanelBitmaps     = SHIP_P 7
  
  Ditty            = victory.jgm
--- 10,14 ----
  ExtraExplosion   = 
  
! PanelBitmaps     = panel_ 7
  
  Ditty            = victory.jgm

[Timewarp-commit] ships/ppi/shpscain panel_01.bmp,NONE,1.1 panel_02.bmp,NONE,1.1 panel_03.bmp,NONE,1.1 panel_04.bmp,NONE,1.1 panel_05.bmp,NONE,1.1 panel_06.bmp,NONE,1.1 panel_07.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/ships/ppi/shpscain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21489/ships/ppi/shpscain

Added Files:
	panel_01.bmp panel_02.bmp panel_03.bmp panel_04.bmp 
	panel_05.bmp panel_06.bmp panel_07.bmp 
Log Message:
changing panel bitmap name (panel_01 is used now for ship display in the melee ship-selection menu).

--- NEW FILE: panel_05.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: panel_06.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: panel_01.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: panel_02.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: panel_07.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: panel_03.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: panel_04.bmp ---
(This appears to be a binary file; contents omitted.)

[Timewarp-commit] source melee.h,1.33,1.34

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

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

Modified Files:
	melee.h 
Log Message:
removing more obsolete stuff, related to mip-mapping

Index: melee.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** melee.h	16 Mar 2006 22:07:18 -0000	1.33
--- melee.h	16 Mar 2006 22:30:29 -0000	1.34
***************
*** 430,442 ****
  	static int mip_min, mip_max, mip_bias;
  protected:
- 	enum { MAX_MIP_LEVELS = 8 };
  	int         count, count_base, count_rotations;
  	char bpp;
- 	char highest_mip;
  	int originaltype;
  //	int         w;
  //	int         h;
  	struct PMASK **smask;
! 	Surface **sbitmap[MAX_MIP_LEVELS];
  
  	//char *type;
--- 430,440 ----
  	static int mip_min, mip_max, mip_bias;
  protected:
  	int         count, count_base, count_rotations;
  	char bpp;
  	int originaltype;
  //	int         w;
  //	int         h;
  	struct PMASK **smask;
! 	Surface **sbitmap;
  
  	//char *type;
***************
*** 465,469 ****
  
  //methods for direct access:
! 	Surface     *get_bitmap(int index, int miplevel = 0);
  //	Surface     *get_bitmap_readonly(int index);
  	PMASK *get_pmask(int index);
--- 463,467 ----
  
  //methods for direct access:
! 	Surface     *get_bitmap(int index);
  //	Surface     *get_bitmap_readonly(int index);
  	PMASK *get_pmask(int index);

[Timewarp-commit] source/newships shpbogce.cpp,1.10,1.11 shptaumc.cpp,1.12,1.13

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

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

Modified Files:
	shpbogce.cpp shptaumc.cpp 
Log Message:
removing more obsolete stuff, related to mip-mapping

Index: shpbogce.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpbogce.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpbogce.cpp	28 Aug 2005 20:34:07 -0000	1.10
--- shpbogce.cpp	16 Mar 2006 22:30:32 -0000	1.11
***************
*** 277,281 ****
  {
          BITMAP *bmp;
!         bmp = sprite->get_bitmap(64, 0);
          clear_to_color( bmp, makecol(255,0,255));
  
--- 277,281 ----
  {
          BITMAP *bmp;
!         bmp = sprite->get_bitmap(64);
          clear_to_color( bmp, makecol(255,0,255));
  

Index: shptaumc.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaumc.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shptaumc.cpp	16 Mar 2006 22:07:18 -0000	1.12
--- shptaumc.cpp	16 Mar 2006 22:30:32 -0000	1.13
***************
*** 194,198 ****
          turret_index = get_index(ra);//((int)(ra / 5.625) + 16) & 63;
          //ra *= ANGLE_RATIO;
!         bmp = data->spriteShip->get_bitmap(64, 0);
          clear_to_color(bmp, makecol(255,0,255));
          sprite->draw(0, 0, sprite_index, bmp);
--- 194,198 ----
          turret_index = get_index(ra);//((int)(ra / 5.625) + 16) & 63;
          //ra *= ANGLE_RATIO;
!         bmp = data->spriteShip->get_bitmap(64);
          clear_to_color(bmp, makecol(255,0,255));
          sprite->draw(0, 0, sprite_index, bmp);

[Timewarp-commit] source/melee msprite.cpp,1.35,1.36

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

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

Modified Files:
	msprite.cpp 
Log Message:
removing more obsolete stuff, related to mip-mapping

Index: msprite.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/msprite.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** msprite.cpp	16 Mar 2006 22:07:18 -0000	1.35
--- msprite.cpp	16 Mar 2006 22:30:31 -0000	1.36
***************
*** 286,304 ****
  
  void SpaceSprite::change_color_depth(int newbpp) {STACKTRACE
! 	int i, l;
! 	for (l = 0; l <= highest_mip; l += 1) {
! 		for (i = 0; i < count; i += 1) {
! 			if (sbitmap[l][i])
! 			{
! 				BITMAP *tmp = create_bitmap_ex(newbpp, width(i), height(i));
! 
! 				convert_bitmap(sbitmap[l][i], tmp, (general_attributes & MASKED) ? AA_MASKED : 0);
! 				
! //				if (attributes[i] & DEALLOCATE_IMAGE)
! //					destroy_bitmap(sbitmap[l][i]);
  
! //				attributes[i] |= DEALLOCATE_IMAGE;
! 				sbitmap[l][i] = tmp;
! 			}
  		}
  	}
--- 286,300 ----
  
  void SpaceSprite::change_color_depth(int newbpp) {STACKTRACE
! 	int i;
  
! 	for (i = 0; i < count; i += 1)
! 	{
! 		if (sbitmap[i])
! 		{
! 			BITMAP *tmp = create_bitmap_ex(newbpp, width(i), height(i));
! 			
! 			convert_bitmap(sbitmap[i], tmp, (general_attributes & MASKED) ? AA_MASKED : 0);
! 			
! 			sbitmap[i] = tmp;
  		}
  	}
***************
*** 397,404 ****
  
  	references = 0;
! 	highest_mip = 0;
! 	for (i = 1; i < MAX_MIP_LEVELS; i += 1) {
! 		sbitmap[i] = 0;
! 	}
  
  	general_attributes = _attributes;
--- 393,397 ----
  
  	references = 0;
! 	sbitmap = 0;
  
  	general_attributes = _attributes;
***************
*** 420,425 ****
  
  	smask = new PMASK*[count];
! 	sbitmap[0] = new BITMAP*    [count];
! //	attributes  = new char [count];
  
  	for(i = 0; i < sprite_count; i += 1)
--- 413,417 ----
  
  	smask = new PMASK*[count];
! 	sbitmap = new BITMAP*    [count];
  
  	for(i = 0; i < sprite_count; i += 1)
***************
*** 522,532 ****
  //			m[j + (i * rotations)] = create_allegro_pmask(tmp);
  			
! 			sbitmap[0][index] = 0;//tmp;
! //			attributes[j + (i * rotations)] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  			}
  		int index = i * rotations;
  		smask[index] = 0;
  //		m[(i * rotations)] = create_allegro_pmask(bmp);
! 		sbitmap[0][index] = bmp;
  //		attributes[index] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  		}
--- 514,523 ----
  //			m[j + (i * rotations)] = create_allegro_pmask(tmp);
  			
! 			sbitmap[index] = 0;//tmp;
  			}
  		int index = i * rotations;
  		smask[index] = 0;
  //		m[(i * rotations)] = create_allegro_pmask(bmp);
! 		sbitmap[index] = bmp;
  //		attributes[index] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  		}
***************
*** 541,545 ****
  
  
! 	if (!sbitmap[0][0])
  	{
  		tw_error("Basic sprite shape expected, but doesn't exist");
--- 532,536 ----
  
  
! 	if (!sbitmap[0])
  	{
  		tw_error("Basic sprite shape expected, but doesn't exist");
***************
*** 550,563 ****
  SpaceSprite::SpaceSprite(SpaceSprite &old) {
  	STACKTRACE
! 	int i, l;
  	BITMAP *bmp;
  	count = old.count;
  	bpp = old.bpp;
- 	highest_mip = old.highest_mip;
  	originaltype = -1;
  //	w = old.w;
  //	h = old.h;
  	smask = new PMASK*[count];
! 	sbitmap[0] = new BITMAP*    [count];
  
  	references = 0;
--- 541,553 ----
  SpaceSprite::SpaceSprite(SpaceSprite &old) {
  	STACKTRACE
! 	int i;
  	BITMAP *bmp;
  	count = old.count;
  	bpp = old.bpp;
  	originaltype = -1;
  //	w = old.w;
  //	h = old.h;
  	smask = new PMASK*[count];
! 	sbitmap = new BITMAP*    [count];
  
  	references = 0;
***************
*** 570,608 ****
  	for(i = 0; i < count; i++)
  	{
! 		if (old.sbitmap[0][i])
  		{
! 			bmp = create_bitmap(old.sbitmap[0][i]->w, old.sbitmap[0][i]->h);
! 			blit(old.sbitmap[0][i], bmp, 0, 0, 0, 0, old.sbitmap[0][i]->w, old.sbitmap[0][i]->h);
! 			sbitmap[0][i] = bmp;
  		} else {
! 			sbitmap[0][i] = 0;
  		}
  
  		smask[i] = 0;//create_allegro_pmask(bmp);
- //		attributes[i] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
- 		}
- 	for (l = 1; l < MAX_MIP_LEVELS; l += 1)
- 	{
- 		if (old.sbitmap[l])
- 		{
- 			sbitmap[l] = new BITMAP* [count];
- 			
- 			for(i = 0; i < count; i++)
- 			{
- 				if (old.sbitmap[l][i])
- 				{
- 					bmp = create_bitmap(old.sbitmap[l][i]->w, old.sbitmap[l][i]->h);
- 					blit(old.sbitmap[l][i], bmp, 0, 0, 0, 0, old.sbitmap[l][i]->w, old.sbitmap[l][i]->h);
- 					sbitmap[l][i] = bmp;
- 				} else {
- 					sbitmap[l][i] = 0;
- 				}
- 			}
- 		} else {
- 			sbitmap[l] = 0;
- 		}
  	}
  
! 	if (!sbitmap[0][0])
  	{
  		tw_error("Basic sprite shape expected, but doesn't exist");
--- 560,577 ----
  	for(i = 0; i < count; i++)
  	{
! 		if (old.sbitmap[i])
  		{
! 			bmp = create_bitmap(old.sbitmap[i]->w, old.sbitmap[i]->h);
! 			blit(old.sbitmap[i], bmp, 0, 0, 0, 0, old.sbitmap[i]->w, old.sbitmap[i]->h);
! 			sbitmap[i] = bmp;
  		} else {
! 			sbitmap[i] = 0;
  		}
  
  		smask[i] = 0;//create_allegro_pmask(bmp);
  	}
  
! 
! 	if (!sbitmap[0])
  	{
  		tw_error("Basic sprite shape expected, but doesn't exist");
***************
*** 612,616 ****
  void SpaceSprite::lock() {
  	STACKTRACE
- 	highest_mip = 0;
  	return;
  }
--- 581,584 ----
***************
*** 619,627 ****
  {
  	STACKTRACE
- 	int i, j;
- 	for (i = 0; i < MAX_MIP_LEVELS; i += 1) {
- 		if (sbitmap[i])
- 			j = i;
- 	}
  	return;
  }
--- 587,590 ----
***************
*** 630,634 ****
  SpaceSprite::~SpaceSprite() {
  	STACKTRACE
! 	int i, l;
  
  	for(i = 0; i < count; i++) {
--- 593,597 ----
  SpaceSprite::~SpaceSprite() {
  	STACKTRACE
! 	int i;
  
  	for(i = 0; i < count; i++) {
***************
*** 641,662 ****
  	if (smask)
  		delete[] smask;
  	smask = 0;
  
! 	for (l = 0; l <= highest_mip; l += 1)
  	{
! 		if (sbitmap[l])
! 		{
! 			for(i = 0; i < count; i++) {
! 				//xxx why is this conditional ?? It never borrows, that's too messy...
! 				//if (attributes[i] & DEALLOCATE_IMAGE)
! 				if (sbitmap[l][i])
! 					destroy_bitmap(sbitmap[l][i]);
! 			}
! 
! 			delete[] sbitmap[l];
! 			sbitmap[l] = 0;
  		}
  	}
  
  //	delete[] attributes;
  //	attributes = 0;
--- 604,624 ----
  	if (smask)
  		delete[] smask;
+ 
  	smask = 0;
  
! 	if (sbitmap)
  	{
! 		for(i = 0; i < count; i++) {
! 			//xxx why is this conditional ?? It never borrows, that's too messy...
! 			//if (attributes[i] & DEALLOCATE_IMAGE)
! 			if (sbitmap[i])
! 				destroy_bitmap(sbitmap[i]);
  		}
+ 		
+ 		delete[] sbitmap;
+ 		sbitmap = 0;
  	}
  
+ 
  //	delete[] attributes;
  //	attributes = 0;
***************
*** 746,751 ****
  	if (index < 0) {tw_error("SpaceSprite::get_bitmap - index %d < 0 (count %d)", index, count); index = 0;}
  	int ix, iy, iw, ih;
! 	int mip = find_mip_level(size.x / this->width(index), highest_mip);
! 	BITMAP *bmp = get_bitmap(index, mip);//b[mip][index];
  	aa_set_mode(find_aa_mode(general_attributes));
  	if (tw_aa_mode & AA_NO_ALIGN) {
--- 708,714 ----
  	if (index < 0) {tw_error("SpaceSprite::get_bitmap - index %d < 0 (count %d)", index, count); index = 0;}
  	int ix, iy, iw, ih;
! 
! 	BITMAP *bmp = get_bitmap(index);
! 
  	aa_set_mode(find_aa_mode(general_attributes));
  	if (tw_aa_mode & AA_NO_ALIGN) {
***************
*** 784,792 ****
  	//if (iy >= frame->frame->h) return;
  	
- 	int mip = find_mip_level(size.x / this->width(index), highest_mip);
- 
  	BITMAP *bmp;
  
! 	bmp = get_bitmap(index, mip);//b[mip][index];
  	if (!bmp) return;
  
--- 747,753 ----
  	//if (iy >= frame->frame->h) return;
  	
  	BITMAP *bmp;
  
! 	bmp = get_bitmap(index);
  	if (!bmp) return;
  
***************
*** 1011,1020 ****
  
  
! BITMAP *SpaceSprite::get_bitmap(int index, int miplevel)
  {STACKTRACE
- 	if (miplevel != 0) 
- 	{
- 		tw_error ("get_bitmap on undefined mipmap level");
- 	}
  
  	if (index >= count)
--- 972,977 ----
  
  
! BITMAP *SpaceSprite::get_bitmap(int index)
  {STACKTRACE
  
  	if (index >= count)
***************
*** 1031,1069 ****
  	// changed ROB
  
! 	if (!sbitmap[miplevel][index])
  	{
! 		if (!sbitmap[miplevel])
  		{
! 			tw_error("The pointer array for the mipmapped bitmaps hasn't been defined for this level!");
  		}
! 
! 		// generate a derived image...
! 		if (!sbitmap[0][index])
  		{
! 			// generate the unscaled image
! 			int irot = index % count_rotations;	// which rotation
! 			int ipic = index - irot;			// basic pic
! 
! 			if (ipic < 0 || ipic >= count || irot < 0 || irot >= count_rotations)
! 			{
! 				tw_error("Accessing invalid base picture");
! 			}
! 
! 			BITMAP *bmp = sbitmap[0][ipic];
! 			if (!bmp)
! 			{
! 				tw_error("Basic sprite shape doesn't exist, cannot rotate");
! 			}
! 			BITMAP *tmp = create_bitmap_ex(bpp, bmp->w, bmp->h);
! 			clear_to_color(tmp, bitmap_mask_color(tmp));
! 			rotate_sprite(tmp, bmp, 0, 0, irot * ((1<<24)/count_rotations));
! 
! 			sbitmap[0][index] = tmp;
! 
  		}
! 
  	}
  
! 	return sbitmap[miplevel][index];
  }
  
--- 988,1023 ----
  	// changed ROB
  
! 	if (!sbitmap)
  	{
! 		tw_error("The pointer array for the mipmapped bitmaps hasn't been defined for this level!");
! 	}
! 	
! 	// generate a derived image...
! 	if (!sbitmap[index])
! 	{
! 		// generate the unscaled image
! 		int irot = index % count_rotations;	// which rotation
! 		int ipic = index - irot;			// basic pic
! 		
! 		if (ipic < 0 || ipic >= count || irot < 0 || irot >= count_rotations)
  		{
! 			tw_error("Accessing invalid base picture");
  		}
! 		
! 		BITMAP *bmp = sbitmap[ipic];
! 		if (!bmp)
  		{
! 			tw_error("Basic sprite shape doesn't exist, cannot rotate");
  		}
! 		BITMAP *tmp = create_bitmap_ex(bpp, bmp->w, bmp->h);
! 		clear_to_color(tmp, bitmap_mask_color(tmp));
! 		rotate_sprite(tmp, bmp, 0, 0, irot * ((1<<24)/count_rotations));
! 		
! 		sbitmap[index] = tmp;
! 		
  	}
+ 	
  
! 	return sbitmap[index];
  }
  
***************
*** 1086,1093 ****
  
  	references = 0;
! 	highest_mip = 0;
! 	for (i = 1; i < MAX_MIP_LEVELS; i += 1) {
! 		sbitmap[i] = 0;
! 	}
  
  	general_attributes = _attributes;
--- 1040,1044 ----
  
  	references = 0;
! 	sbitmap = 0;
  
  	general_attributes = _attributes;
***************
*** 1102,1106 ****
  
  	smask = new PMASK*[count];
! 	sbitmap[0] = new BITMAP*    [count];
  //	attributes  = new char [count];
  
--- 1053,1057 ----
  
  	smask = new PMASK*[count];
! 	sbitmap = new BITMAP*    [count];
  //	attributes  = new char [count];
  
***************
*** 1143,1148 ****
  			smask[index] = 0;
  			
! 			sbitmap[0][index] = 0;//tmp;
! //			attributes[index] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  		}
  
--- 1094,1098 ----
  			smask[index] = 0;
  			
! 			sbitmap[index] = 0;
  		}
  
***************
*** 1150,1160 ****
  		smask[index] = 0;
  
! 		sbitmap[0][index] = bmp;
! //		attributes[index] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  
  	}
  
  
! 	if (!sbitmap[0][0])
  	{
  		tw_error("Basic sprite shape expected, but doesn't exist");
--- 1100,1109 ----
  		smask[index] = 0;
  
! 		sbitmap[index] = bmp;
  
  	}
  
  
! 	if (!sbitmap[0])
  	{
  		tw_error("Basic sprite shape expected, but doesn't exist");

[Timewarp-commit] source/other planet3d.cpp,1.26,1.27

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

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

Modified Files:
	planet3d.cpp 
Log Message:
removing more obsolete stuff, related to mip-mapping

Index: planet3d.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/planet3d.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** planet3d.cpp	16 Mar 2006 21:52:32 -0000	1.26
--- planet3d.cpp	16 Mar 2006 22:30:33 -0000	1.27
***************
*** 35,51 ****
  
  	references = 0;
! 	highest_mip = 0;
! 	for (i = 1; i < MAX_MIP_LEVELS; i += 1) {
! 		sbitmap[i] = NULL;
! 	}
  
  	bpp = 32;//videosystem.bpp;
  
  	smask = new PMASK*			[count];
! 	sbitmap[0] = new BITMAP*		[count];
! //	attributes = new char	[count];
! 
! 	//w = image->w;
! 	//h = image->h;
  
  	bmp = create_bitmap_ex ( bpp, image->w, image->h);
--- 35,44 ----
  
  	references = 0;
! 	sbitmap = 0;
  
  	bpp = 32;//videosystem.bpp;
  
  	smask = new PMASK*			[count];
! 	sbitmap = new BITMAP*		[count];
  
  	bmp = create_bitmap_ex ( bpp, image->w, image->h);
***************
*** 55,62 ****
  	color_correct_bitmap(bmp, general_attributes & MASKED);
  	smask[i] = create_allegro_pmask(bmp);
! 	sbitmap[0][i] = bmp;
! //	attributes[i] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  
! 	if (!sbitmap[0][0])
  	{
  		tw_error("Basic sprite shape expected, but doesn't exist");
--- 48,54 ----
  	color_correct_bitmap(bmp, general_attributes & MASKED);
  	smask[i] = create_allegro_pmask(bmp);
! 	sbitmap[i] = bmp;
  
! 	if (!sbitmap[0])
  	{
  		tw_error("Basic sprite shape expected, but doesn't exist");

[Timewarp-commit] source/melee mcbodies.cpp,1.21,1.22 mshpdata.cpp,1.20,1.21 msprite.cpp,1.34,1.35

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

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

Modified Files:
	mcbodies.cpp mshpdata.cpp msprite.cpp 
Log Message:
and, removing another obsolete sprite attribute

Index: msprite.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/msprite.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** msprite.cpp	16 Mar 2006 21:52:32 -0000	1.34
--- msprite.cpp	16 Mar 2006 22:07:18 -0000	1.35
***************
*** 31,41 ****
  	if (!s) return a;
  
- 	if (strstr(s, "+mipmap")) {
- 		a |= SpaceSprite::MIPMAPED;
- 	}
- 	if (strstr(s, "-mipmap")) {
- 		a &=~SpaceSprite::MIPMAPED;
- 	}
- 
  	if (strstr(s, "+masked")) {
  		a |= SpaceSprite::MASKED;
--- 31,34 ----
***************
*** 291,366 ****
  	}
  
- /** this simply scales the sprite and puts it in a buffer. */
- void SpaceSprite::generate_mipmap(int level, int index, int bpp)
- {
- 	int i = index;
- 
- 	int lw, lh;
- 	lw = iround(width(index) * pow(0.5, level));
- 	lh = iround(height(index) * pow(0.5, level));
- 
- 	BITMAP *src = get_bitmap(i, 0);//b[0][i];
- 	
- 	if ( level < 0 || level > highest_mip || level > MAX_MIP_LEVELS)
- 	{
- 		tw_error("Illegal mipmap used...");
- 	}
- 
- 	sbitmap[level][i] = create_bitmap_ex(bpp, lw, lh);
- 
- 	BITMAP *dest = sbitmap[level][i];
- 	if (general_attributes & MASKED)
- 		clear_to_color(dest, bitmap_mask_color(dest));
- 	
- 	int a = find_aa_mode(general_attributes);
- 	if (a & AA_ALPHA)
- 		a |= AA_RAW_ALPHA;
- 	
- 	a |= AA_MASKED_DEST;
- 	a &=~AA_BLEND;
- 	aa_set_mode( a );
- 
- 	aa_stretch_blit(src, dest, 0,0,src->w,src->h, 0,0,dest->w, dest->h );
- 
- }
- 
- void SpaceSprite::generate_mipmaps()
- {
- 	// NOTE:
- 	// for some unknown reason, this causes a crash when the star sprites are deleted in 16-bit mode.
- 	// so, I've disabled the use of these cached sprites.
- 	STACKTRACE;
- 
- #ifdef _USE_MIPMAP
- 	int bpp, level, i;
- 	if (general_attributes & MIPMAPED)
- 	{
- 		bpp = bitmap_color_depth(sbitmap[0][0]);
- 
- 		for (level = 1; level < MAX_MIP_LEVELS; level += 1)
- 		{
- 			int lw, lh;
- 			lw = iround(width(0) * pow(0.5, level));
- 			lh = iround(height(0) * pow(0.5, level));
- 			
- 			if ((lw < 8) || (lh < 8))
- 				break;
- 
- 			if (sbitmap[level])
- 			{
- 				tw_error("new mipmap level: already defined!");
- 			}
- 
- 			highest_mip = level;
- 			sbitmap[level] = new BITMAP*[count];
- 
- 			for (i = 0; i < count; i += 1)
- 			{
- 				sbitmap[level][i] = 0;//generate_mipmap(level, i, bpp);
- 			}
- 		}
- 	}
- #endif
- }
  
  void SpaceSprite::change_color_depth(int newbpp) {STACKTRACE
--- 284,287 ----
***************
*** 486,490 ****
  	general_attributes |= SpaceSprite::NO_AA;
  	general_attributes |= SpaceSprite::ALPHA;
! 	general_attributes |= SpaceSprite::DITHER;
  
  	// this is moved lower...
--- 407,411 ----
  	general_attributes |= SpaceSprite::NO_AA;
  	general_attributes |= SpaceSprite::ALPHA;
! //	general_attributes |= SpaceSprite::DITHER;
  
  	// this is moved lower...
***************
*** 617,626 ****
  //	}
  
! #ifdef _USE_MIPMAP
! 	if (general_attributes & MIPMAPED)
! 	{
! 		generate_mipmaps();
! 	}
! #endif
  
  
--- 538,542 ----
  //	}
  
! 
  
  
***************
*** 708,713 ****
  			j = i;
  	}
- 	//We aught to rebuild mipmaps	but too much work, so for now we do nothing
- 	//highest_mip = j;
  	return;
  }
--- 624,627 ----
***************
*** 776,780 ****
  	STACKTRACE
  	int x, y;
- 	if (general_attributes & MIPMAPED) {tw_error ("overlay on a mipmaped sprite!  oh no!");}
  	if (index1 > count) {tw_error("SpaceSprite::overlay - index1 %d > count %d", index1, count);}
  	if (index2 > count) {tw_error("SpaceSprite::overlay - index2 %d > count %d", index2, count);}
--- 690,693 ----
***************
*** 1100,1112 ****
  BITMAP *SpaceSprite::get_bitmap(int index, int miplevel)
  {STACKTRACE
! 	// changed ROB
! 	//if (general_attributes & MIPMAPED) if (highest_mip > 0) 
! 	//	{tw_error ("get_bitmap on a mipmaped sprite!\n(retry likely to work)");}
! 	if (general_attributes & MIPMAPED)
  	{
! 		if (miplevel > highest_mip) 
! 		{
! 			tw_error ("get_bitmap on undefined mipmap level");
! 		}
  	}
  
--- 1013,1019 ----
  BITMAP *SpaceSprite::get_bitmap(int index, int miplevel)
  {STACKTRACE
! 	if (miplevel != 0) 
  	{
! 		tw_error ("get_bitmap on undefined mipmap level");
  	}
  
***************
*** 1156,1161 ****
  		}
  
- 		if (miplevel > 0)
- 			generate_mipmap(miplevel, index, bpp);
  	}
  
--- 1063,1066 ----
***************
*** 1250,1258 ****
  	}
  
- #ifdef _USE_MIPMAP
- 	if (general_attributes & MIPMAPED) {
- 		generate_mipmaps();
- 	}
- #endif
  
  	if (!sbitmap[0][0])
--- 1155,1158 ----

Index: mshpdata.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshpdata.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mshpdata.cpp	16 Mar 2006 21:52:32 -0000	1.20
--- mshpdata.cpp	16 Mar 2006 22:07:18 -0000	1.21
***************
*** 783,787 ****
  
  	int basic_attrib = SpaceSprite::MASKED;
- 	// and mipmapped? nah.
  
  	// load the ship panel sprites.
--- 783,786 ----

Index: mcbodies.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcbodies.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mcbodies.cpp	16 Mar 2006 21:52:32 -0000	1.21
--- mcbodies.cpp	16 Mar 2006 22:07:18 -0000	1.22
***************
*** 301,306 ****
  		else for (i = 0; (stardat[i].type == DAT_RLE_SPRITE) || (stardat[i].type == DAT_BITMAP); i += 1) ;
  		starpics = new SpaceSprite(stardat, i, 
! 			SpaceSprite::MASKED | 
! 			SpaceSprite::MIPMAPED
  		);
  		unload_datafile(stardat);
--- 301,305 ----
  		else for (i = 0; (stardat[i].type == DAT_RLE_SPRITE) || (stardat[i].type == DAT_BITMAP); i += 1) ;
  		starpics = new SpaceSprite(stardat, i, 
! 			SpaceSprite::MASKED
  		);
  		unload_datafile(stardat);
***************
*** 453,458 ****
  		pic[i] = new SpaceSprite(&stardat[i], 1, 
  			SpaceSprite::ALPHA | 
! 			SpaceSprite::MASKED | 
! 			SpaceSprite::MIPMAPED
  		);
  	}
--- 452,456 ----
  		pic[i] = new SpaceSprite(&stardat[i], 1, 
  			SpaceSprite::ALPHA | 
! 			SpaceSprite::MASKED
  		);
  	}

[Timewarp-commit] source/gamex gameplanetmission.cpp,1.7,1.8

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

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

Modified Files:
	gameplanetmission.cpp 
Log Message:
and, removing another obsolete sprite attribute

Index: gameplanetmission.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetmission.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gameplanetmission.cpp	16 Mar 2006 21:52:32 -0000	1.7
--- gameplanetmission.cpp	16 Mar 2006 22:07:18 -0000	1.8
***************
*** 477,481 ****
  	if (!tmpdat){tw_error("no data file object moon");}
  
! 	sprite = new SpaceSprite(tmpdat, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 1);
  	
  	o = new SpaceObject(NULL, opos, 0.0, sprite);
--- 477,481 ----
  	if (!tmpdat){tw_error("no data file object moon");}
  
! 	sprite = new SpaceSprite(tmpdat, 1, SpaceSprite::MASKED, 1);
  	
  	o = new SpaceObject(NULL, opos, 0.0, sprite);
***************
*** 506,510 ****
  	}
  
! 	sprite = new SpaceSprite(tmpdat, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	
  	o = new SpaceObject_ext(NULL, opos, 0.0, sprite);
--- 506,510 ----
  	}
  
! 	sprite = new SpaceSprite(tmpdat, 1, SpaceSprite::MASKED, 64);
  	
  	o = new SpaceObject_ext(NULL, opos, 0.0, sprite);

[Timewarp-commit] source melee.h,1.32,1.33

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

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

Modified Files:
	melee.h 
Log Message:
and, removing another obsolete sprite attribute

Index: melee.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** melee.h	16 Mar 2006 21:52:32 -0000	1.32
--- melee.h	16 Mar 2006 22:07:18 -0000	1.33
***************
*** 447,454 ****
  	unsigned int general_attributes;
  	enum {
! 		MIPMAPED            = 0x004, 
! 
! 		MASKED              = 0x100, 
! 		ALPHA               = 0x200, 
  		DITHER              = 0x400,
  		NO_AA               = 0x800,
--- 447,452 ----
  	unsigned int general_attributes;
  	enum {
! 		MASKED              = 0x100,
! 		ALPHA               = 0x200,
  		DITHER              = 0x400,
  		NO_AA               = 0x800,
***************
*** 466,471 ****
  
  
- 	void generate_mipmap(int level, int index, int bpp);
- 
  //methods for direct access:
  	Surface     *get_bitmap(int index, int miplevel = 0);
--- 464,467 ----
***************
*** 496,502 ****
  	void draw_character(int x, int y, int w, int h, int index, int color, Frame *space);
  
- 	void generate_mipmaps();
- 	void regenerate_mipmaps();
- 
  	//void permanent_phase_shift ( int index );
  
--- 492,495 ----
***************
*** 517,521 ****
  };
  
! int string_to_sprite_attributes ( const char *s, int recommended = SpaceSprite::MASKED | SpaceSprite::MIPMAPED) ;
  
  
--- 510,514 ----
  };
  
! int string_to_sprite_attributes ( const char *s, int recommended = SpaceSprite::MASKED) ;
  
  

[Timewarp-commit] source/newships shptaumc.cpp,1.11,1.12

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

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

Modified Files:
	shptaumc.cpp 
Log Message:
and, removing another obsolete sprite attribute

Index: shptaumc.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaumc.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shptaumc.cpp	28 Aug 2005 20:34:08 -0000	1.11
--- shptaumc.cpp	16 Mar 2006 22:07:18 -0000	1.12
***************
*** 194,198 ****
          turret_index = get_index(ra);//((int)(ra / 5.625) + 16) & 63;
          //ra *= ANGLE_RATIO;
!         bmp = data->spriteShip->get_bitmap(64, 0);	// get from mipmap level 0
          clear_to_color(bmp, makecol(255,0,255));
          sprite->draw(0, 0, sprite_index, bmp);
--- 194,198 ----
          turret_index = get_index(ra);//((int)(ra / 5.625) + 16) & 63;
          //ra *= ANGLE_RATIO;
!         bmp = data->spriteShip->get_bitmap(64, 0);
          clear_to_color(bmp, makecol(255,0,255));
          sprite->draw(0, 0, sprite_index, bmp);

[Timewarp-commit] source/other gconfig.cpp,1.6,1.7

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

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

Modified Files:
	gconfig.cpp 
Log Message:
and, removing another obsolete sprite attribute

Index: gconfig.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gconfig.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gconfig.cpp	28 Aug 2005 20:32:16 -0000	1.6
--- gconfig.cpp	16 Mar 2006 22:07:18 -0000	1.7
***************
*** 257,261 ****
    tmpdata = load_datafile_object(file.c_str(), pic.c_str());
    if (!tmpdata) error( "couldn't find gob.dat#station0sprite");
!   SpaceSprite * stationSprite = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
    unload_datafile_object(tmpdata);
    stationSprite->permanent_phase_shift(8);
--- 257,261 ----
    tmpdata = load_datafile_object(file.c_str(), pic.c_str());
    if (!tmpdata) error( "couldn't find gob.dat#station0sprite");
!   SpaceSprite * stationSprite = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED, 64);
    unload_datafile_object(tmpdata);
    stationSprite->permanent_phase_shift(8);

[Timewarp-commit] source/games ggob.cpp,1.43,1.44 gmissions_objects.cpp,1.12,1.13

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

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

Modified Files:
	ggob.cpp gmissions_objects.cpp 
Log Message:
and, removing another obsolete sprite attribute

Index: gmissions_objects.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions_objects.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gmissions_objects.cpp	14 Aug 2005 16:14:32 -0000	1.12
--- gmissions_objects.cpp	16 Mar 2006 22:07:18 -0000	1.13
***************
*** 62,66 ****
  
  	// I'm assuming here it contains only 1 image (should be changed!)
! 	return new SpaceSprite(bmpdata, Nbmp, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, Nrot);
  
  	unload_datafile_object(d_raw);
--- 62,66 ----
  
  	// I'm assuming here it contains only 1 image (should be changed!)
! 	return new SpaceSprite(bmpdata, Nbmp, SpaceSprite::MASKED, Nrot);
  
  	unload_datafile_object(d_raw);
***************
*** 133,153 ****
  }
  
- /*
- SpaceSprite *MissionShip::gensprite(char *datafilename, char *dataobjectname)
- {
- 	DATAFILE *d;
- 
- 	// here should be analysis of a text file to see how many sprites there are ...
- 
- 	// d should be a data file itself, containing the ship bitmaps
- 	d = (DATAFILE*) load_datafile_object(datafilename, dataobjectname)->dat;
- 				
- 	// I'm assuming here it contains only 1 image (should be changed!)
- 	return new SpaceSprite(&d[0], 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
- 
- 	unload_datafile_object(d);
- }
- */
- 
  
  
--- 133,136 ----

Index: ggob.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** ggob.cpp	15 Mar 2006 13:04:37 -0000	1.43
--- ggob.cpp	16 Mar 2006 22:07:18 -0000	1.44
***************
*** 153,157 ****
  	tmpdata = load_datafile_object("gob.dat", "station0sprite");
  	if (!tmpdata) error( "couldn't find gob.dat#station0sprite");
! 	stationSprite[0] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	unload_datafile_object(tmpdata);
  //	stationSprite[0]->permanent_phase_shift(8);
--- 153,157 ----
  	tmpdata = load_datafile_object("gob.dat", "station0sprite");
  	if (!tmpdata) error( "couldn't find gob.dat#station0sprite");
! 	stationSprite[0] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED, 64);
  	unload_datafile_object(tmpdata);
  //	stationSprite[0]->permanent_phase_shift(8);
***************
*** 159,163 ****
  	tmpdata = load_datafile_object("gob.dat", "station1sprite");
  	if (!tmpdata) error ("couldn't find gob.dat#station1sprite");
! 	stationSprite[1] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	unload_datafile_object(tmpdata);
  //	stationSprite[1]->permanent_phase_shift(8);
--- 159,163 ----
  	tmpdata = load_datafile_object("gob.dat", "station1sprite");
  	if (!tmpdata) error ("couldn't find gob.dat#station1sprite");
! 	stationSprite[1] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED, 64);
  	unload_datafile_object(tmpdata);
  //	stationSprite[1]->permanent_phase_shift(8);
***************
*** 165,169 ****
  	tmpdata = load_datafile_object("gob.dat", "station2sprite");
  	if (!tmpdata) error ("couldn't find gob.dat#station2sprite");
! 	stationSprite[2] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED, 64);
  	unload_datafile_object(tmpdata);
  //	stationSprite[2]->permanent_phase_shift(8);
--- 165,169 ----
  	tmpdata = load_datafile_object("gob.dat", "station2sprite");
  	if (!tmpdata) error ("couldn't find gob.dat#station2sprite");
! 	stationSprite[2] = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED, 64);
  	unload_datafile_object(tmpdata);
  //	stationSprite[2]->permanent_phase_shift(8);
***************
*** 171,175 ****
  	tmpdata = load_datafile_object("gob.dat", "defender");
  	if (!tmpdata) error ("couldn't find gob.dat#defender");
! 	defenderSprite = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED | SpaceSprite::MIPMAPED);
  	unload_datafile_object(tmpdata);
  
--- 171,175 ----
  	tmpdata = load_datafile_object("gob.dat", "defender");
  	if (!tmpdata) error ("couldn't find gob.dat#defender");
! 	defenderSprite = new SpaceSprite(tmpdata, 1, SpaceSprite::MASKED);
  	unload_datafile_object(tmpdata);
  

[Timewarp-commit] source/melee mcbodies.cpp,1.20,1.21 mgame.cpp,1.61,1.62 mshpdata.cpp,1.19,1.20 msprite.cpp,1.33,1.34

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

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

Modified Files:
	mcbodies.cpp mgame.cpp mshpdata.cpp msprite.cpp 
Log Message:
cleaning up useless/obsolete attributes

Index: msprite.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/msprite.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** msprite.cpp	16 Mar 2006 16:11:13 -0000	1.33
--- msprite.cpp	16 Mar 2006 21:52:32 -0000	1.34
***************
*** 38,48 ****
  	}
  
- 	if (strstr(s, "+irregular")) {
- 		a |= SpaceSprite::IRREGULAR;
- 	}
- 	if (strstr(s, "-irregular")) {
- 		a &=~SpaceSprite::IRREGULAR;
- 	}
- 
  	if (strstr(s, "+masked")) {
  		a |= SpaceSprite::MASKED;
--- 38,41 ----
***************
*** 381,388 ****
  				convert_bitmap(sbitmap[l][i], tmp, (general_attributes & MASKED) ? AA_MASKED : 0);
  				
! 				if (attributes[i] & DEALLOCATE_IMAGE)
! 					destroy_bitmap(sbitmap[l][i]);
  
! 				attributes[i] |= DEALLOCATE_IMAGE;
  				sbitmap[l][i] = tmp;
  			}
--- 374,381 ----
  				convert_bitmap(sbitmap[l][i], tmp, (general_attributes & MASKED) ? AA_MASKED : 0);
  				
! //				if (attributes[i] & DEALLOCATE_IMAGE)
! //					destroy_bitmap(sbitmap[l][i]);
  
! //				attributes[i] |= DEALLOCATE_IMAGE;
  				sbitmap[l][i] = tmp;
  			}
***************
*** 426,431 ****
  Vector2 SpaceSprite::size(int i)
  {
- 	// in case the sprite is irregular, you cannot return a default size, but must check
- 	// each bitmap size.
  
  	BITMAP *b;
--- 419,422 ----
***************
*** 493,496 ****
--- 484,491 ----
  	bpp = videosystem.bpp;
  
+ 	general_attributes |= SpaceSprite::NO_AA;
+ 	general_attributes |= SpaceSprite::ALPHA;
+ 	general_attributes |= SpaceSprite::DITHER;
+ 
  	// this is moved lower...
  //	if (obpp != bpp)
***************
*** 505,509 ****
  	smask = new PMASK*[count];
  	sbitmap[0] = new BITMAP*    [count];
! 	attributes  = new char [count];
  
  	for(i = 0; i < sprite_count; i += 1)
--- 500,504 ----
  	smask = new PMASK*[count];
  	sbitmap[0] = new BITMAP*    [count];
! //	attributes  = new char [count];
  
  	for(i = 0; i < sprite_count; i += 1)
***************
*** 607,611 ****
  			
  			sbitmap[0][index] = 0;//tmp;
! 			attributes[j + (i * rotations)] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  			}
  		int index = i * rotations;
--- 602,606 ----
  			
  			sbitmap[0][index] = 0;//tmp;
! //			attributes[j + (i * rotations)] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  			}
  		int index = i * rotations;
***************
*** 613,617 ****
  //		m[(i * rotations)] = create_allegro_pmask(bmp);
  		sbitmap[0][index] = bmp;
! 		attributes[index] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  		}
  
--- 608,612 ----
  //		m[(i * rotations)] = create_allegro_pmask(bmp);
  		sbitmap[0][index] = bmp;
! //		attributes[index] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  		}
  
***************
*** 635,700 ****
  	}
  
- /*	THE MAIN ROUTINE IS GENERALIZED, BECAUSE A MIX OF 2 TYPES JUST CONFUSING, AND NOT NEEDED ANYMORE
- 	return;//end of normal/masked/autorotated
- 
- 	irregular:
- 
- 	if (rotations != 1) {tw_error (" irregular SpaceSprites are not permitted to be autorotated");}
- 
- 	smask = new PMASK*[count];
- 	sbitmap[0] = new BITMAP*    [count];
- 	attributes  = new char [count];
- 
- 	for(i = 0; i < sprite_count; i += 1) {
- 		switch (images[i].type) {
- 			case DAT_RLE_SPRITE: {
- 				w = ((RLE_SPRITE *)images[i].dat)->w;
- 				h = ((RLE_SPRITE *)images[i].dat)->h;
- 				obpp = ((RLE_SPRITE *)images[i].dat)->color_depth;
- 				if (!tmp) tmp = create_bitmap_ex ( obpp, w, h);
- 				if (general_attributes & MASKED) clear_to_color(tmp, bitmap_mask_color(tmp));
- 				draw_rle_sprite(tmp, (RLE_SPRITE *)(images[i].dat), 0, 0);
- 				if (general_attributes & ALPHA) handle_alpha_load(tmp);
- 				if (bpp == obpp) {
- 					bmp = tmp;
- 					tmp = NULL;
- 				}
- 				else {
- 					bmp = create_bitmap_ex ( bpp, w, h);
- 
- 					// added, otherwise maybe the "convert" skips masked parts in
- 					// tmp, and those are then undefined in bmp.
- 					if (general_attributes & MASKED)
- 						clear_to_color(bmp, bitmap_mask_color(bmp));
- 
- 					convert_bitmap(tmp, bmp, (general_attributes & MASKED) ? AA_MASKED : 0);
- 					destroy_bitmap(tmp);
- 					tmp = NULL;
- 					}
- 				}
- 			break;
- 			case DAT_BITMAP: {
- 				if (general_attributes & ALPHA) handle_alpha_load((BITMAP *)(images[i].dat));
- 				w = ((BITMAP *)images[i].dat)->w;
- 				h = ((BITMAP *)images[i].dat)->h;
- 				bmp = create_bitmap_ex ( bpp, w, h);
- 				convert_bitmap((BITMAP *)images[i].dat, bmp, general_attributes & MASKED);
- 				}
- 			break;
- 			}
- 		color_correct_bitmap(bmp, general_attributes & MASKED);
- 		smask[(i * rotations)] = 0;//create_allegro_pmask(bmp);
- 		sbitmap[0][(i * rotations)] = bmp;
- 		attributes[(i * rotations)] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
- 		}
- 
- 	if (tmp)
- 	{
- 		destroy_bitmap(tmp);
- 		tmp = 0;
- 	}
- 
- 	return;//end of irregular/masked
- 	*/
  }
  
--- 630,633 ----
***************
*** 713,717 ****
  
  	references = 0;
! 	attributes  = new char [count];
  	general_attributes = old.general_attributes;
  
--- 646,650 ----
  
  	references = 0;
! //	attributes  = new char [count];
  	general_attributes = old.general_attributes;
  
***************
*** 731,735 ****
  
  		smask[i] = 0;//create_allegro_pmask(bmp);
! 		attributes[i] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  		}
  	for (l = 1; l < MAX_MIP_LEVELS; l += 1)
--- 664,668 ----
  
  		smask[i] = 0;//create_allegro_pmask(bmp);
! //		attributes[i] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  		}
  	for (l = 1; l < MAX_MIP_LEVELS; l += 1)
***************
*** 812,817 ****
  	}
  
! 	delete[] attributes;
! 	attributes = 0;
  	return;
  }
--- 745,750 ----
  	}
  
! //	delete[] attributes;
! //	attributes = 0;
  	return;
  }
***************
*** 1265,1269 ****
  	smask = new PMASK*[count];
  	sbitmap[0] = new BITMAP*    [count];
! 	attributes  = new char [count];
  
  	for ( i = 0; i < sprite_count; ++i )
--- 1198,1202 ----
  	smask = new PMASK*[count];
  	sbitmap[0] = new BITMAP*    [count];
! //	attributes  = new char [count];
  
  	for ( i = 0; i < sprite_count; ++i )
***************
*** 1306,1310 ****
  			
  			sbitmap[0][index] = 0;//tmp;
! 			attributes[j + (i * rotations)] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  		}
  
--- 1239,1243 ----
  			
  			sbitmap[0][index] = 0;//tmp;
! //			attributes[index] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  		}
  
***************
*** 1313,1317 ****
  
  		sbitmap[0][index] = bmp;
! 		attributes[index] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  
  	}
--- 1246,1250 ----
  
  		sbitmap[0][index] = bmp;
! //		attributes[index] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  
  	}

Index: mshpdata.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshpdata.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** mshpdata.cpp	15 Mar 2006 13:04:42 -0000	1.19
--- mshpdata.cpp	16 Mar 2006 21:52:32 -0000	1.20
***************
*** 670,674 ****
  	if (num_panel_bitmaps < 2)
  		tw_error("Too few ship panel bitmaps");
! 	spritePanel = new SpaceSprite(&data[index], num_panel_bitmaps, SpaceSprite::IRREGULAR);
  	index += num_panel_bitmaps;
  
--- 670,674 ----
  	if (num_panel_bitmaps < 2)
  		tw_error("Too few ship panel bitmaps");
! 	spritePanel = new SpaceSprite(&data[index], num_panel_bitmaps);
  	index += num_panel_bitmaps;
  
***************
*** 785,790 ****
  	// and mipmapped? nah.
  
! 	// load the ship panel sprites. This sprite are irregular by default, because the bitmaps have different sizes.
! 	spritePanel = load_sprite("PanelBitmaps", dirname, basic_attrib | SpaceSprite::IRREGULAR);
  
  	// load ship sprites
--- 785,790 ----
  	// and mipmapped? nah.
  
! 	// load the ship panel sprites.
! 	spritePanel = load_sprite("PanelBitmaps", dirname, basic_attrib);
  
  	// load ship sprites

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** mgame.cpp	15 Mar 2006 13:04:41 -0000	1.61
--- mgame.cpp	16 Mar 2006 21:52:32 -0000	1.62
***************
*** 230,245 ****
  	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);
  	meleedata.hotspotSprite           = new SpaceSprite(&melee[MELEE_HOTSPOT], HOTSPOT_FRAMES,
! 		SpaceSprite::ALPHA | SpaceSprite::MASKED);// | SpaceSprite::MIPMAPED);
  	meleedata.sparkSprite             = new SpaceSprite(&melee[MELEE_SPARK], SPARK_FRAMES,
! 		SpaceSprite::ALPHA | SpaceSprite::MASKED /*| SpaceSprite::MIPMAPED*/);
  	meleedata.asteroidExplosionSprite = new SpaceSprite(&melee[MELEE_ASTEROIDEXPLOSION], ASTEROIDEXPLOSION_FRAMES);
  	meleedata.asteroidSprite          = new SpaceSprite(&melee[MELEE_ASTEROID], ASTEROID_FRAMES);
  	meleedata.planetSprite            = new SpaceSprite(&melee[MELEE_PLANET], PLANET_FRAMES);
  	meleedata.xpl1Sprite              = new SpaceSprite(&melee[MELEE_XPL1], XPL1_FRAMES,
! 		SpaceSprite::ALPHA | SpaceSprite::MASKED);// | SpaceSprite::MIPMAPED);
  
  	planet_victory = (Music*) (melee[MELEE_PLANET+PLANET_FRAMES].dat);
--- 230,245 ----
  	if (!melee) tw_error("Error loading melee data\n");
  
! 	meleedata.panelSprite             = new SpaceSprite(&melee[MELEE_PANEL], PANEL_FRAMES);
  	meleedata.kaboomSprite            = new SpaceSprite(&melee[MELEE_KABOOM], KABOOM_FRAMES,
! 		SpaceSprite::ALPHA | SpaceSprite::MASKED);
  	meleedata.hotspotSprite           = new SpaceSprite(&melee[MELEE_HOTSPOT], HOTSPOT_FRAMES,
! 		SpaceSprite::ALPHA | SpaceSprite::MASKED);
  	meleedata.sparkSprite             = new SpaceSprite(&melee[MELEE_SPARK], SPARK_FRAMES,
! 		SpaceSprite::ALPHA | SpaceSprite::MASKED);
  	meleedata.asteroidExplosionSprite = new SpaceSprite(&melee[MELEE_ASTEROIDEXPLOSION], ASTEROIDEXPLOSION_FRAMES);
  	meleedata.asteroidSprite          = new SpaceSprite(&melee[MELEE_ASTEROID], ASTEROID_FRAMES);
  	meleedata.planetSprite            = new SpaceSprite(&melee[MELEE_PLANET], PLANET_FRAMES);
  	meleedata.xpl1Sprite              = new SpaceSprite(&melee[MELEE_XPL1], XPL1_FRAMES,
! 		SpaceSprite::ALPHA | SpaceSprite::MASKED);
  
  	planet_victory = (Music*) (melee[MELEE_PLANET+PLANET_FRAMES].dat);

Index: mcbodies.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcbodies.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mcbodies.cpp	27 Sep 2005 22:03:55 -0000	1.20
--- mcbodies.cpp	16 Mar 2006 21:52:32 -0000	1.21
***************
*** 302,306 ****
  		starpics = new SpaceSprite(stardat, i, 
  			SpaceSprite::MASKED | 
- 			SpaceSprite::IRREGULAR | 
  			SpaceSprite::MIPMAPED
  		);
--- 302,305 ----
***************
*** 455,459 ****
  			SpaceSprite::ALPHA | 
  			SpaceSprite::MASKED | 
- 			SpaceSprite::IRREGULAR | 
  			SpaceSprite::MIPMAPED
  		);
--- 454,457 ----

[Timewarp-commit] source/other planet3d.cpp,1.25,1.26

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

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

Modified Files:
	planet3d.cpp 
Log Message:
cleaning up useless/obsolete attributes

Index: planet3d.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/planet3d.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** planet3d.cpp	15 Mar 2006 13:04:42 -0000	1.25
--- planet3d.cpp	16 Mar 2006 21:52:32 -0000	1.26
***************
*** 44,48 ****
  	smask = new PMASK*			[count];
  	sbitmap[0] = new BITMAP*		[count];
! 	attributes = new char	[count];
  
  	//w = image->w;
--- 44,48 ----
  	smask = new PMASK*			[count];
  	sbitmap[0] = new BITMAP*		[count];
! //	attributes = new char	[count];
  
  	//w = image->w;
***************
*** 56,60 ****
  	smask[i] = create_allegro_pmask(bmp);
  	sbitmap[0][i] = bmp;
! 	attributes[i] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  
  	if (!sbitmap[0][0])
--- 56,60 ----
  	smask[i] = create_allegro_pmask(bmp);
  	sbitmap[0][i] = bmp;
! //	attributes[i] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
  
  	if (!sbitmap[0][0])
***************
*** 198,202 ****
  		k = planetlist[tw_random(Nplanets)];
  		
! 		color_map  = new SpaceSprite(&rawdata[k], 1, SpaceSprite::IRREGULAR | SpaceSprite::MASKED );
  
  		// first, determine the spec map name from the color name, by
--- 198,202 ----
  		k = planetlist[tw_random(Nplanets)];
  		
! 		color_map  = new SpaceSprite(&rawdata[k], 1, SpaceSprite::MASKED );
  
  		// first, determine the spec map name from the color name, by
***************
*** 214,218 ****
  		}
  		// create a sprite
! 		spec_map = new SpaceSprite(datapart, 1, SpaceSprite::IRREGULAR);
  		
  		unload_datafile(rawdata);
--- 214,218 ----
  		}
  		// create a sprite
! 		spec_map = new SpaceSprite(datapart, 1);
  		
  		unload_datafile(rawdata);
***************
*** 239,243 ****
  			image32bit->w/2 - 2, makecol(255,255,255));
  		
! 	    dummy  = new SpaceSprite(image32bit, SpaceSprite::IRREGULAR | SpaceSprite::MASKED);
  		
  		double tilt, spin, sun_hangle, sun_vangle;
--- 239,243 ----
  			image32bit->w/2 - 2, makecol(255,255,255));
  		
! 	    dummy  = new SpaceSprite(image32bit, SpaceSprite::MASKED);
  		
  		double tilt, spin, sun_hangle, sun_vangle;

[Timewarp-commit] source/gamex gamehyper.cpp,1.14,1.15 gameplanetmission.cpp,1.6,1.7 gameplanetscan.cpp,1.15,1.16

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

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

Modified Files:
	gamehyper.cpp gameplanetmission.cpp gameplanetscan.cpp 
Log Message:
cleaning up useless/obsolete attributes

Index: gamehyper.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamehyper.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gamehyper.cpp	24 Mar 2004 23:51:36 -0000	1.14
--- gamehyper.cpp	16 Mar 2006 21:52:32 -0000	1.15
***************
*** 607,611 ****
  		bool vidmem = true;	// try to store the sprites in video-memory, for speed
  		// too bad; true or false makes no difference...
! 		spr[i] = create_sprite( sprname, SpaceSprite::MASKED | SpaceSprite::IRREGULAR, 1, 32, sprscale, vidmem );
  		
  
--- 607,611 ----
  		bool vidmem = true;	// try to store the sprites in video-memory, for speed
  		// too bad; true or false makes no difference...
! 		spr[i] = create_sprite( sprname, SpaceSprite::MASKED, 1, 32, sprscale, vidmem );
  		
  

Index: gameplanetscan.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetscan.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** gameplanetscan.cpp	24 Mar 2004 23:51:36 -0000	1.15
--- gameplanetscan.cpp	16 Mar 2006 21:52:32 -0000	1.16
***************
*** 973,982 ****
  		image32bit->w/2 - 2, makecol(255,255,255));
  	
! 	dummy  = new SpaceSprite(image32bit, SpaceSprite::IRREGULAR | SpaceSprite::MASKED | SpaceSprite::NO_AA);
  		
  	Vector2 opos = 0.5 * map_size;
  	SpaceSprite *color_map, *spec_map;
  
! 	color_map  = new SpaceSprite(map_bmp, SpaceSprite::IRREGULAR | SpaceSprite::MASKED );
  
  	spec_map = 0;
--- 973,982 ----
  		image32bit->w/2 - 2, makecol(255,255,255));
  	
! 	dummy  = new SpaceSprite(image32bit, SpaceSprite::MASKED | SpaceSprite::NO_AA);
  		
  	Vector2 opos = 0.5 * map_size;
  	SpaceSprite *color_map, *spec_map;
  
! 	color_map  = new SpaceSprite(map_bmp, SpaceSprite::MASKED );
  
  	spec_map = 0;

Index: gameplanetmission.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetmission.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gameplanetmission.cpp	1 Aug 2005 10:46:32 -0000	1.6
--- gameplanetmission.cpp	16 Mar 2006 21:52:32 -0000	1.7
***************
*** 288,309 ****
  
  	text_mode(-1);
- 	/*
- 	if (!melee) melee = load_datafile("melee.dat");
- 	if (!melee) tw_error("Error loading melee data\n");
- 
- 	panelSprite             = new SpaceSprite(&melee[MELEE_PANEL], PANEL_FRAMES, SpaceSprite::IRREGULAR);
- 	kaboomSprite            = new SpaceSprite(&melee[MELEE_KABOOM], KABOOM_FRAMES,
- 		SpaceSprite::ALPHA | SpaceSprite::MASKED | SpaceSprite::MATCH_SCREEN_FORMAT | SpaceSprite::MIPMAPED);
- 	hotspotSprite           = new SpaceSprite(&melee[MELEE_HOTSPOT], HOTSPOT_FRAMES,
- 		SpaceSprite::ALPHA | SpaceSprite::MASKED | SpaceSprite::MATCH_SCREEN_FORMAT | SpaceSprite::MIPMAPED);
- 	sparkSprite             = new SpaceSprite(&melee[MELEE_SPARK], SPARK_FRAMES,
- 		SpaceSprite::ALPHA | SpaceSprite::MASKED | SpaceSprite::MATCH_SCREEN_FORMAT | SpaceSprite::MIPMAPED);
- 	asteroidExplosionSprite = new SpaceSprite(&melee[MELEE_ASTEROIDEXPLOSION], ASTEROIDEXPLOSION_FRAMES);
- 	asteroidSprite          = new SpaceSprite(&melee[MELEE_ASTEROID], ASTEROID_FRAMES);
- 	planetSprite            = new SpaceSprite(&melee[MELEE_PLANET], PLANET_FRAMES);
- 	xpl1Sprite              = new SpaceSprite(&melee[MELEE_XPL1], XPL1_FRAMES,
- 		SpaceSprite::ALPHA | SpaceSprite::MASKED | SpaceSprite::MATCH_SCREEN_FORMAT | SpaceSprite::MIPMAPED);
- 	planet_victory = (Music*) (melee[MELEE_PLANET+PLANET_FRAMES].dat);
- 	*/
  
  	set_config_file("client.ini");
--- 288,291 ----

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

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

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

Modified Files:
	melee.h 
Log Message:
cleaning up useless/obsolete attributes

Index: melee.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** melee.h	15 Mar 2006 13:04:37 -0000	1.31
--- melee.h	16 Mar 2006 21:52:32 -0000	1.32
***************
*** 442,451 ****
  	//char *type;
  	int references;
! 	char *attributes;
  	enum { DEALLOCATE_IMAGE = 0x01, DEALLOCATE_MASK = 0x02 };
  public:
  	unsigned int general_attributes;
  	enum {
- 		IRREGULAR           = 0x002, 
  		MIPMAPED            = 0x004, 
  
--- 442,450 ----
  	//char *type;
  	int references;
! //	char *attributes;
  	enum { DEALLOCATE_IMAGE = 0x01, DEALLOCATE_MASK = 0x02 };
  public:
  	unsigned int general_attributes;
  	enum {
  		MIPMAPED            = 0x004,