[Timewarp-commit] source/melee mshpdata.cpp,1.17,1.18 msprite.cpp,1.30,1.31

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

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

Modified Files:
	mshpdata.cpp msprite.cpp 
Log Message:


Index: msprite.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/msprite.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** msprite.cpp	29 Jan 2006 16:14:34 -0000	1.30
--- msprite.cpp	29 Jan 2006 21:06:15 -0000	1.31
***************
*** 1381,1382 ****
--- 1381,1403 ----
  }
  
+ 
+ 
+ 
+ 
+ 
+ BITMAP* copybmp( BITMAP* src )
+ {
+ 	STACKTRACE;
+ 
+ 	BITMAP *dest;
+ 
+ 	// copied from vanguard
+ 	dest = create_bitmap_ex(bitmap_color_depth(screen), src->w, src->h);	//Create a new bitmap
+ 	if(!dest) return NULL;							//If failed, return NULL
+ 
+ 	blit(src, dest, 0, 0, 0, 0, src->w, src->h);	//Copy bitmap from datafile
+ 
+ 	return dest;
+ }
+ 
+ 

Index: mshpdata.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshpdata.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** mshpdata.cpp	29 Jan 2006 16:14:34 -0000	1.17
--- mshpdata.cpp	29 Jan 2006 21:06:15 -0000	1.18
***************
*** 756,762 ****
  	else sampleExtra = NULL;
  
- 	shipdatas_loaded += 1;
- 	status = LOADED_FULL;
- 
  	// all data is copied, so now, you can discard the original data file !
  	pop_config_state();
--- 756,759 ----
***************
*** 844,850 ****
  	
  
- 	shipdatas_loaded += 1;
- 	status = LOADED_FULL;
- 
  	// all data is copied, so now, you can discard the original data file !
  	pop_config_state();
--- 841,844 ----
***************
*** 876,879 ****
--- 870,875 ----
  	}
  
+ 	shipdatas_loaded += 1;
+ 	status = LOADED_FULL;
  }