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

[Timewarp-commit] source/gamex gameplanetscan.cpp,1.9,1.10

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

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

Modified Files:
	gameplanetscan.cpp 
Log Message:
...

Index: gameplanetscan.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetscan.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gameplanetscan.cpp	7 Feb 2004 07:43:37 -0000	1.9
--- gameplanetscan.cpp	15 Feb 2004 13:18:27 -0000	1.10
***************
*** 12,15 ****
--- 12,17 ----
  #include "../melee/mitems.h"
  
+ #include "../melee/manim.h"
+ 
  #include "../scp.h"
  #include "../util/history.h"
***************
*** 20,23 ****
--- 22,27 ----
  #include "gameplanetscan.h"
  
+ #include "gamedialogue.h"
+ 
  #include "stuff/space_body.h"
  
***************
*** 31,35 ****
  
  
- 
  static bool useframe1 = true;//false;		// the big area with the planet
  static bool useframe2 = true;		// the smaller area: the scan surface
--- 35,38 ----
***************
*** 39,42 ****
--- 42,188 ----
  
  
+ class AnimatedObject : public Animation
+ {
+ public:
+ 
+ 	AnimatedObject(SpaceLocation *creator, Vector2 opos,
+ 					SpaceSprite *osprite, double frame_length);
+ 
+ 	virtual void animate(Frame *f);
+ 	virtual void inflict_damage(SpaceObject *other);
+ };
+ 
+ // spawns some object for a short time, can also "walk" a little.
+ class Spawner : public SpaceLocation
+ {
+ public:
+ 	SpaceSprite *spawnsprite;
+ 	double framelen;
+ 	Periodics *per_life, *per_spawn;
+ 
+ 	Spawner(SpaceLocation *creator, Vector2 lpos, double langle, SpaceSprite *aspawnsprite,
+ 					double frame_length, double alifetime, double aspawninterval);
+ 	void spawnit();
+ 	virtual void calculate();
+ 	virtual void animate(Frame *f);
+ };
+ 
+ 
+ 
+ 
+ AnimatedObject::AnimatedObject(SpaceLocation *creator, Vector2 opos,
+ 					SpaceSprite *osprite, double frame_length)
+ :
+ Animation(creator, opos, 
+ 	osprite, 0, osprite->frames(), frame_length, 
+ 	DEPTH_SHIPS, 1)
+ {
+ 
+ 	attributes &= ~(ATTRIB_UNDETECTABLE);
+ 
+ 	damage_factor = 0.1;
+ 
+ 	collide_flag_anyone = ALL_LAYERS;
+ 	collide_flag_sameship = 0;
+ 	collide_flag_sameteam = 0;
+ 
+ 	layer = LAYER_SHIPS;
+ 	set_depth(DEPTH_SHIPS);
+ }
+ 
+ 
+ void AnimatedObject::animate(Frame *f)
+ {
+ 	BITMAP *bmp;
+ 	bmp = sprite->get_bitmap(sprite_index);
+ 	Vector2 P;
+ 	P = corner(pos, size);
+ 	masked_blit(bmp, f->surface,
+ 		0, 0,
+ 		//pos.x - 0.5*bmp->w - space_center.x, pos.y - 0.5*bmp->h - space_center.y,
+ 		P.x, P.y,
+ 		bmp->w, bmp->h);
+ }
+ 
+ void AnimatedObject::inflict_damage(SpaceObject *other)
+ {
+ 	Animation::inflict_damage(other);
+ 	state = 0;
+ }
+ 
+ 
+ 
+ Spawner::Spawner(SpaceLocation *creator, Vector2 lpos, double langle, SpaceSprite *aspawnsprite,
+ 				 double frame_length, double alifetime, double aspawninterval)
+ :
+ SpaceLocation(creator, lpos, langle)
+ {
+ 	framelen = frame_length;
+ 	spawnsprite = aspawnsprite;
+ 	per_life = new Periodics(alifetime);
+ 	per_spawn = new Periodics(aspawninterval);
+ }
+ 
+ 
+ void Spawner::spawnit()
+ {
+ 	physics->add(new AnimatedObject(this, pos, spawnsprite, framelen));
+ }
+ 
+ void Spawner::calculate()
+ {
+ 	if (per_life->update())
+ 	{
+ 		state = 0;
+ 		return;
+ 	}
+ 
+ 	if (per_spawn->update())
+ 		spawnit();
+ }
+ 
+ void Spawner::animate(Frame *f)
+ {
+ 	// nothing
+ }
+ 
+ 
+ 
+ 
+ class FireStorm : public Spawner
+ {
+ public:
+ 
+ 	double v, Rran, Aran;
+ 
+ 	FireStorm(SpaceLocation *creator, Vector2 lpos, double langle, SpaceSprite *aspawn,
+ 				 double frame_length, double alifetime, double aspawninterval,
+ 				 double av, double aRran, double aAran);
+ 
+ 	virtual void calculate();
+ };
+ 
+ FireStorm::FireStorm(SpaceLocation *creator, Vector2 lpos, double langle,
+ 					SpaceSprite *aspawn,
+ 					double frame_length, double alifetime, double aspawninterval,
+ 					double av, double aRran, double aAran)
+ :
+ Spawner(creator, lpos, langle, aspawn, frame_length, alifetime, aspawninterval)
+ {
+ 	v = av;
+ 	Rran = aRran;	// scattered positioning
+ 	Aran = aAran;	// change in angle
+ }
+ 
+ void FireStorm::calculate()
+ {
+ 	Spawner::calculate();
+ 
+ 	pos += v * frame_time * unit_vector(angle) + Vector2(random(-Rran,Rran), random(-Rran,Rran));
+ 	angle += random(-Aran, Aran);
+ }
+ 
+ 
+ 
  
  /* Structure type:
***************
*** 47,50 ****
--- 193,198 ----
  */
  
+ const int ID_STRUCTURE = 0x06b03d8a1;
+ 
  class StructureType
  {
***************
*** 73,77 ****
  
  	sprintf(fname, "gamex/gamedata/structuretypes/%s_01.bmp", id);
! 	sprite = create_sprite( fname, SpaceSprite::MASKED, 1 );
  }
  
--- 221,225 ----
  
  	sprintf(fname, "gamex/gamedata/structuretypes/%s_01.bmp", id);
! 	sprite = create_sprite( fname, SpaceSprite::MASKED );
  }
  
***************
*** 102,105 ****
--- 250,263 ----
  
  
+ StructureType *get_structuretype(char *id)
+ {
+ 	int i;
+ 	i = structuretypelist->get_index(id, 0);
+ 
+ 	return structuretype[i];
+ }
+ 
+ 
+ 
  
  
***************
*** 151,155 ****
  	strcat(fname, id);
  	strcat(fname, "_01.bmp");
! 	sprite = create_sprite( fname, SpaceSprite::MASKED, 3 );
  
  }
--- 309,313 ----
  	strcat(fname, id);
  	strcat(fname, "_01.bmp");
! 	sprite = create_sprite( fname, SpaceSprite::MASKED );
  
  }
***************
*** 158,162 ****
  const int ID_LIFEFORM = 0x0a9e0b3fe;
  
- 
  class LifeformType
  {
--- 316,319 ----
***************
*** 206,210 ****
  	strcat(fname, id);
  	strcat(fname, "_01.bmp");
! 	sprite = create_sprite( fname, SpaceSprite::MASKED, 3 );
  
  }
--- 363,367 ----
  	strcat(fname, id);
  	strcat(fname, "_01.bmp");
! 	sprite = create_sprite( fname, SpaceSprite::MASKED );
  
  }
***************
*** 378,381 ****
--- 535,539 ----
  
  
+ /*
  Mineral *init_mineral(char *section, Vector2 pos)
  {
***************
*** 392,395 ****
--- 550,554 ----
  	return m;
  }
+ */
  
  
***************
*** 547,565 ****
  
  
- // SPECIAL STRUCTURES ON THE PLANET SURFACES
- // like ... what ?
- // Well, anything that spawns a dialog and can result in some special actions.
- 
  class Structure : public MapObj
  {
  public:
! 	double	damage;
! 	char	*type;
  
  	Structure(SpaceLocation *creator, Vector2 opos, double oangle, SpaceSprite *osprite);
  	virtual void calculate();
! 	virtual int handle_damage(SpaceLocation *source, double normal, double direct);
  };
  
  
  
--- 706,813 ----
  
  
  class Structure : public MapObj
  {
  public:
! 	StructureType	*type;
! 	GamePlanetscan *g;
  
  	Structure(SpaceLocation *creator, Vector2 opos, double oangle, SpaceSprite *osprite);
  	virtual void calculate();
! 	virtual void inflict_damage(SpaceObject *other);
! 
! 	void init(char *section, StructureType *t, GamePlanetscan *ag);
! 
! 	virtual void animate(Frame *f);
! 
  };
  
+ Structure::Structure(SpaceLocation *creator, Vector2 opos, double oangle, SpaceSprite *osprite)
+ :
+ MapObj(creator, opos, oangle, osprite)
+ {
+ 	id = ID_STRUCTURE;
+ 
+ 	layer = LAYER_SHIPS;
+ 	collide_flag_anyone = ALL_LAYERS;
+ 	collide_flag_sameteam = ALL_LAYERS;
+ 	collide_flag_sameship = ALL_LAYERS;
+ 
+ 	g = 0;
+ }
+ 
+ void Structure::init(char *section, StructureType *t, GamePlanetscan *ag)
+ {
+ 	g = ag;
+ 	type = t;
+ 	sprite_index = 0;
+ }
+ 
+ void Structure::calculate()
+ {
+ }
+ 
+ 
+ void Structure::inflict_damage(SpaceObject *other)
+ {
+ 	if (other == localplayer)
+ 	{
+ 		//damage_factor = 0;
+ 		//MapObj::inflict_damage(other);	// it's left to "other" to see if it's a structure through the ID
+ 
+ 		//localplayer->handle_mineral(this);
+ 		//state = 0;	// this is done by the localplayer.
+ 
+ 		char txt[512];
+ 		sprintf(txt, "gamex/gamedata/structuretypes/%s.dialog", type->id);
+ 
+ 		GameAliendialog *ad;
+ 		ad = new GameAliendialog();
+ 		ad->set_dialog(txt);
+ 		g->gamerequest = ad;
+ 
+ 		collide_flag_anyone = 0;
+ 		collide_flag_sameteam = 0;
+ 		collide_flag_sameship = 0;
+ 	}
+ }
+ 
+ 
+ void Structure::animate(Frame *f)
+ {
+ 	if (useframe1)
+ 		MapObj::animate(f);
+ 
+ 	// show the bitmap on the scan-map.
+ 	if (useframe2)
+ 	{
+ 		//MapObj::animate(frame2);
+ 		double s = bmpframe2->w / 400.0;
+ 		int x = pos.x * s / scalesurface - 0.5*sprite->get_bitmap(0)->w;
+ 		int y = pos.y * s / scalesurface - 0.5*sprite->get_bitmap(0)->h;
+ 		sprite->draw(x, y, sprite_index, bmpframe2);
+ 	}
+ }
+ 
+ /*
+ Structure *init_structure(char *section, Vector2 pos, GamePlanetscan *ag)
+ {
+ 	char s[512];
+ 	strcpy(s, get_config_string(section, "type", "common"));
+ 	StructureType	*type;
+ 	type = get_structuretype(s);
+ 
+ 	Structure *m;
+ 	m = new Structure(0, pos, 0, type->sprite);
+ 	
+ 	m->init(section, type, ag);	// handles the rest of the ini file ...
+ 
+ 	return m;
+ }
+ */
+ 
+ 
+ 
+ 
+ 
  
  
***************
*** 622,625 ****
--- 870,874 ----
  	init_mineraltypes();
  	init_lifeformtypes();
+ 	init_structuretypes();
  
  	//SpaceSprite *spr;
***************
*** 686,689 ****
--- 935,941 ----
  
  
+ 	team_player = new_team();
+ 	team_enemy  = new_team();
+ 	player->set_team(team_player);
  
  
***************
*** 764,767 ****
--- 1016,1050 ----
  
  
+ 	// read the structures
+ 	N = get_config_int("structures", "N", 0);
+ 
+ 	for ( i = 0; i < N; ++i )
+ 	{
+ 		char id[512];
+ 		char val[512];
+ 
+ 		sprintf(id, "structure%03i", i);
+ 		strcpy(val, get_config_string("structures", id, ""));
+ 
+ 		double x, y;
+ 		sscanf(val, "%lf %lf %s", &x, &y, id);
+ 
+ 		int k;
+ 		k = structuretypelist->get_index(id, 0);
+ 	
+ 		SpaceSprite *spr;
+ 		spr = structuretype[k]->sprite;
+ 
+ 		Structure *st;
+ 		st = new Structure(0, Vector2(x,y) * scalesurface, 0, spr);
+ 		st->type = structuretype[k];
+ 		st->g = this;
+ 
+ 		add(st);
+ 	}
+ 
+ 
+ 
+ 
  	// an extra window, with "random" buttons so that you can re-randomize the minerals
  	// and lifeform map (given the constraints in the surface.ini file)
***************
*** 784,787 ****
--- 1067,1078 ----
  
  	branmin->bind(new BEvent<GamePlanetscan>(this, &GamePlanetscan::handle_ranmin, 0));
+ 
+ 
+ 	// hazards ...
+ 	spr[0] = create_sprite("gamex/planetscan/hazards/fireball_01.bmp", SpaceSprite::MASKED);
+ 	spr[1] = create_sprite("gamex/planetscan/hazards/firewall_01.bmp", SpaceSprite::MASKED);
+ 	spr[2] = create_sprite("gamex/planetscan/hazards/lightning_01.bmp", SpaceSprite::MASKED);
+ 	spr[3] = create_sprite("gamex/planetscan/hazards/quake_01.bmp", SpaceSprite::MASKED);
+ 	spr[4] = create_sprite("gamex/planetscan/hazards/whirl_01.bmp", SpaceSprite::MASKED);
  }
  
***************
*** 806,809 ****
--- 1097,1103 ----
  void GamePlanetscan::calculate()
  {
+ 	if (next)
+ 		return;
+ 
  	// this viewtype needs no zoom, and always centers on the center of the planet system map.
  	double d, dmin;
***************
*** 843,846 ****
--- 1137,1143 ----
  void GamePlanetscan::animate(Frame *frame)
  {
+ 	if (next)
+ 		return;
+ 
  	// redraw the planet background.
  	blit(map_bmp, surf_area->backgr, 0, 0, 0, 0, map_bmp->w, map_bmp->h);
***************
*** 890,893 ****
--- 1187,1191 ----
  		vline(bmpframe2, iround(P.x), iround(P.y-d), iround(P.y+d), c);
  
+ 		handle_env();
  	}
  
***************
*** 1057,1058 ****
--- 1355,1452 ----
  
  }
+ 
+ 
+ 
+ 
+ //	Spawner(SpaceLocation *creator, Vector2 lpos, double langle, SpaceSprite *aspawnsprite,
+ //					double frame_length, double alifetime, double aspawninterval);
+ void GamePlanetscan::handle_env()
+ {
+ 	FireStorm *fs = 0;
+ 
+ 	// meteors
+ 	if (random(10) == 0)
+ 	{
+ 		
+ 		double a = random(0.1 * PI2, 0.2 * PI2);
+ 		double da = 1.0;
+ 		double ra = 1000.0;
+ 		double v = 0.2;
+ 
+ 
+ 		fs = new FireStorm(0, player->pos+Vector2(random(-400,400),random(-200,200)), 
+ 			a, spr[0], 75, 1.5, 0.05,
+ 			v, 1.0, 0.0);
+ 
+ 	}
+ 
+ 	// firewall
+ 	if (random(20) == 0)
+ 	{
+ 		
+ 		double a = random(PI2);
+ 		double da = 1.0;
+ 		double ra = 1000.0;
+ 		double v = 0.1;
+ 
+ 
+ 		fs = new FireStorm(player, player->pos+Vector2(random(-400,400),random(-200,200)), 
+ 			a, spr[1], 50, 3.0, 0.05,
+ 			v, 2.0, 0.1*PI);
+ 
+ 	}
+ 
+ 	// lightning
+ 	if (random(20) == 0)
+ 	{
+ 		
+ 		double a = random(PI2);
+ 		double da = 1.0;
+ 		double ra = 1000.0;
+ 		double v = 0;
+ 
+ 
+ 		fs = new FireStorm(player, player->pos+Vector2(random(-400,400),random(-200,200)), 
+ 			a, spr[2], 50, 0.5, 0.05,
+ 			v, 16.0, 0.0);
+ 	}
+ 
+ 	// quake
+ 	if (random(20) == 0)
+ 	{
+ 		
+ 		double a = random(PI2);
+ 		double da = 1.0;
+ 		double ra = 1000.0;
+ 		double v = 0.2;
+ 
+ 
+ 		fs = new FireStorm(player, player->pos+Vector2(random(-400,400),random(-200,200)), 
+ 			a, spr[3], 100, 2.0, 0.05,
+ 			v, 2.0, 0.1*PI);
+ 	}
+ 
+ 	// whirl
+ 	if (random(20) == 0)
+ 	{
+ 		
+ 		double a = random(PI2);
+ 		double da = 1.0;
+ 		double ra = 1000.0;
+ 		double v = 0.0;
+ 
+ 
+ 		fs = new FireStorm(player, player->pos+Vector2(random(-400,400),random(-200,200)), 
+ 			a, spr[4], 100, 0.55, 0.05,
+ 			v, 4.0, 0);
+ 
+ 	}
+ 
+ 	if (fs)
+ 	{
+ 		add(fs);
+ 		fs->set_team(team_enemy);
+ 	}
+ }
+ 
+ 

[Timewarp-commit] source/newships shpilwsp.cpp,1.10,1.11 shpxxxma.cpp,1.11,1.12

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

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

Modified Files:
	shpilwsp.cpp shpxxxma.cpp 
Log Message:
...

Index: shpilwsp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpilwsp.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpilwsp.cpp	29 Jan 2004 21:20:29 -0000	1.10
--- shpilwsp.cpp	15 Feb 2004 13:13:35 -0000	1.11
***************
*** 2,5 ****
--- 2,8 ----
  REGISTER_FILE
  
+ #include "shpilwsp.h"
+ 
+ /*
  #define ILWRATH_FIRE_ANIM_RATE           50
  #define ILWRATH_MINE_FIRST_WHIRL_INDEX   13
***************
*** 10,13 ****
--- 13,17 ----
  #define ILWRATH_SPECIAL_REL_X            0
  #define ILWRATH_SPECIAL_REL_Y            (-size.y * 0.3)
+ */
  
  class IlwrathSpider : public Ship {
***************
*** 34,37 ****
--- 38,42 ----
  };
  
+ /*
  class IlwrathSpiderMine : public SpaceObject {
      int    step;
***************
*** 56,59 ****
--- 61,65 ----
      virtual void calculate();
  };
+ */
  
  IlwrathSpider::IlwrathSpider(Vector2 opos, double shipAngle,
***************
*** 90,94 ****
  int IlwrathSpider::activate_special()
  {
! 	STACKTRACE
      double alpha = specialSpread / specialNumber;
      double beta = normalize( angle + PI - 0.5 * specialSpread + random(alpha), PI2 );
--- 96,100 ----
  int IlwrathSpider::activate_special()
  {
! 	STACKTRACE;
      double alpha = specialSpread / specialNumber;
      double beta = normalize( angle + PI - 0.5 * specialSpread + random(alpha), PI2 );

Index: shpxxxma.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpxxxma.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpxxxma.cpp	29 Jan 2004 21:20:30 -0000	1.11
--- shpxxxma.cpp	15 Feb 2004 13:13:35 -0000	1.12
***************
*** 6,10 ****
  #include "../melee/mview.h"
  
! class XXXManglerMine;
  
  class XXXMangler : public Ship {
--- 6,13 ----
  #include "../melee/mview.h"
  
! #include "shpilwsp.h"
! 
! 
! //class XXXManglerMine;
  
  class XXXMangler : public Ship {
***************
*** 26,36 ****
    double		weaponSuperSpeed;
    
!   double       specialLaunch;
!   double       specialRange;
!   double       specialVelocity;
!   int          specialDamage;
!   int          specialArmour;
!   int          specialArming;
!   XXXManglerMine **weaponObject;
  
    int          BodyFrames;
--- 29,45 ----
    double		weaponSuperSpeed;
    
! //  double       specialLaunch;
! //  double       specialRange;
! //  double       specialVelocity;
! //  int          specialDamage;
! //  int          specialArmour;
! //  int          specialArming;
! //  XXXManglerMine **weaponObject;
!     double       specialVelocity;
!     int          specialNumber;
!     double       specialSpread;
!     int          specialLifeTime;
!     double       specialRandomness;
!     int          specialStopTime;
  
    int          BodyFrames;
***************
*** 57,64 ****
    virtual void inflict_damage(SpaceObject *other);
    
!   int numSeeds;
!   int maxSeeds;
  };
  
  class XXXManglerMine : public AnimatedShot {
  
--- 66,77 ----
    virtual void inflict_damage(SpaceObject *other);
    
! //  int numSeeds;
! //  int maxSeeds;
  };
  
+ 
+ 
+ 
+ /*
  class XXXManglerMine : public AnimatedShot {
  
***************
*** 106,109 ****
--- 119,123 ----
    virtual void calculate();
  };
+ */
  
  
***************
*** 120,123 ****
--- 134,138 ----
    weaponSuperSpeed = scale_velocity(get_config_float("Weapon", "SuperSpeed", 0));
  
+   /*
    specialRange    = scale_range(get_config_float("Special", "Range", 0));
    specialVelocity = scale_velocity(get_config_float("Special", "Velocity", 0));
***************
*** 127,130 ****
--- 142,153 ----
    specialArming   = get_config_int("Special","Arming",0);
    specialLaunch   = scale_velocity(get_config_int("Special","Launch",0));
+   */
+   specialVelocity   = scale_velocity(get_config_float("Special", "Velocity", 0));
+   specialNumber     = get_config_int("Special", "Number", 0);
+   specialSpread     = get_config_float("Special", "Spread", 0) * ANGLE_RATIO;
+   specialLifeTime   = get_config_int("Special", "LifeTime", 0);
+   specialRandomness = get_config_float("Special", "Randomness", 0);
+   specialStopTime   = get_config_int("Special", "StopTime", 0);
+ 
    latched         = FALSE;
    grabbed         = NULL;
***************
*** 138,147 ****
  	SeparateSpit			= FALSE;
  
!   numSeeds=0;
!   maxSeeds=8;
!   weaponObject = new XXXManglerMine*[maxSeeds];
!   for (int i = 0; i < maxSeeds; i += 1) {
!     weaponObject[i] = NULL;
! 		}
  
  }
--- 161,170 ----
  	SeparateSpit			= FALSE;
  
! //  numSeeds=0;
! //  maxSeeds=8;
! //  weaponObject = new XXXManglerMine*[maxSeeds];
! //  for (int i = 0; i < maxSeeds; i += 1) {
! //    weaponObject[i] = NULL;
! //		}
  
  }
***************
*** 169,173 ****
  int XXXMangler::activate_special()
  {
! 	STACKTRACE
  	if (numSeeds == maxSeeds) {
  		weaponObject[0]->state = 0;
--- 192,198 ----
  int XXXMangler::activate_special()
  {
! 	STACKTRACE;
! 
! 	/*
  	if (numSeeds == maxSeeds) {
  		weaponObject[0]->state = 0;
***************
*** 184,187 ****
--- 209,229 ----
  	numSeeds += 1;
  	return(TRUE);
+ 	*/
+ 
+ 	double alpha = specialSpread / specialNumber;
+     double beta = normalize( angle + PI - 0.5 * specialSpread + random(alpha), PI2 );
+     double tx = cos( angle );
+     double ty = sin( angle );
+     double ox = pos.x + ILWRATH_SPECIAL_REL_Y * tx - ILWRATH_SPECIAL_REL_X * ty;
+     double oy = pos.y + ILWRATH_SPECIAL_REL_Y * ty + ILWRATH_SPECIAL_REL_X * tx;
+ 
+     int i;
+     for (i = 0; i < specialNumber; i++)
+     {
+ 	game->add( new IlwrathSpiderMine( this, ox, oy, beta + alpha * i, specialVelocity, specialLifeTime, specialRandomness, specialStopTime, data->spriteSpecial ));
+     }
+   
+     return i;
+ 
  }
  
***************
*** 246,257 ****
  			 }
  
!    int j = 0;
! 
!    for (int i = 0; i < numSeeds; i += 1) {
!     weaponObject[i-j] = weaponObject[i];
!     if (!weaponObject[i]->exists()) j += 1;
!       if (j) weaponObject[i] = NULL;
!     }
!     numSeeds -= j;
  
     Ship::calculate();
--- 288,299 ----
  			 }
  
! //   int j = 0;
! //
! //   for (int i = 0; i < numSeeds; i += 1) {
! //    weaponObject[i-j] = weaponObject[i];
! //    if (!weaponObject[i]->exists()) j += 1;
! //      if (j) weaponObject[i] = NULL;
! //    }
! //    numSeeds -= j;
  
     Ship::calculate();
***************
*** 341,344 ****
--- 383,388 ----
  }
  
+ 
+ /*
  XXXManglerMine::XXXManglerMine(Vector2 opos, double ov, double oangle, int odamage,
    int oarmour,XXXMangler *oship, SpaceSprite *osprite, int ofcount, int ofsize, double misv,
***************
*** 466,470 ****
  		SpaceObject::calculate();
  	}
! 
  
  
--- 510,514 ----
  		SpaceObject::calculate();
  	}
! */
  
  

[Timewarp-commit] source/melee mgame.cpp,1.31,1.32

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

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

Modified Files:
	mgame.cpp 
Log Message:
...

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** mgame.cpp	14 Feb 2004 13:18:37 -0000	1.31
--- mgame.cpp	15 Feb 2004 13:13:33 -0000	1.32
***************
*** 467,471 ****
  			
  			int is = s->state;
! 			Vector2 p = s->normal_pos();
  			Vector2 v = s->vel;
  			
--- 467,471 ----
  			
  			int is = s->state;
! 			Vector2 p = s->pos;
  			Vector2 v = s->vel;
  			

[Timewarp-commit] source/melee mframe.cpp,1.24,1.25 mframe.h,1.14,1.15

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

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

Modified Files:
	mframe.cpp mframe.h 
Log Message:
updating gamex

Index: mframe.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mframe.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** mframe.cpp	14 Feb 2004 13:18:37 -0000	1.24
--- mframe.cpp	15 Feb 2004 13:11:45 -0000	1.25
***************
*** 449,452 ****
--- 449,454 ----
  }
  
+ /*** Change a location by translation
+ */
  void SpaceLocation::change_pos(Vector2 dpos)
  {
***************
*** 454,457 ****
--- 456,466 ----
  }
  
+ /*** Change a location by scaling
+ */
+ void SpaceLocation::change_pos(double scale)
+ {
+ 	pos *= scale;
+ }
+ 
  void SpaceLocation::ship_died() {STACKTRACE
  	ship = NULL;
***************
*** 484,491 ****
  }
  
! TeamCode SpaceLocation::get_team() const {
  	return (ally_flag & team_mask) >> team_shift;
  }
  
  bool SpaceLocation::sameTeam(const SpaceLocation *other) const {
  	return !((ally_flag ^ other->ally_flag) & (team_mask));
--- 493,507 ----
  }
  
! TeamCode SpaceLocation::get_team() const
! {
  	return (ally_flag & team_mask) >> team_shift;
  }
  
+ void SpaceLocation::set_team(TeamCode k)
+ {
+ 	ally_flag &= ~team_mask;
+ 	ally_flag |= k << team_shift;
+ }
+ 
  bool SpaceLocation::sameTeam(const SpaceLocation *other) const {
  	return !((ally_flag ^ other->ally_flag) & (team_mask));

Index: mframe.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mframe.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mframe.h	14 Feb 2004 13:18:37 -0000	1.14
--- mframe.h	15 Feb 2004 13:11:45 -0000	1.15
***************
*** 216,219 ****
--- 216,220 ----
  	virtual bool sameTeam (const SpaceLocation *other) const;
  	TeamCode get_team() const;
+ 	void set_team(TeamCode k);
  
  	virtual void ship_died();
***************
*** 243,246 ****
--- 244,248 ----
  	virtual void change_vel(Vector2 dvel);
  	virtual void change_pos(Vector2 dpos);
+ 	virtual void change_pos(double scale);
  
  	SpaceLocation(SpaceLocation *creator, Vector2 lpos, double langle);

[Timewarp-commit] source/twgui twbutton.cpp,1.5,1.6 twbutton.h,1.2,1.3 twbuttontypes.cpp,1.6,1.7 twgui.cpp,1.19,1.20 twwindow.cpp,1.8,1.9

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

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

Modified Files:
	twbutton.cpp twbutton.h twbuttontypes.cpp twgui.cpp 
	twwindow.cpp 
Log Message:
updating gamex

Index: twbutton.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twbutton.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** twbutton.cpp	29 Jan 2004 21:20:31 -0000	1.5
--- twbutton.cpp	15 Feb 2004 13:08:57 -0000	1.6
***************
*** 624,627 ****
--- 624,636 ----
  
  
+ // obtain a bitmap using "absolute" path, so that it can come from anywhere...
+ BITMAP *GraphicButton::getbmp_nobutton(char *name)
+ {
+ 	// a background image is needed of course.
+ 	return mainwindow->bmp(name);
+ }
+ 
+ 
+ 
  
  void GraphicButton::init_pos_size(BITMAP **bmp_default, char *idstr)

Index: twbutton.h
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twbutton.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** twbutton.h	10 Jan 2004 22:27:59 -0000	1.2
--- twbutton.h	15 Feb 2004 13:08:57 -0000	1.3
***************
*** 151,154 ****
--- 151,155 ----
  
  	BITMAP *getbmp(char *name);
+ 	BITMAP *getbmp_nobutton(char *name);
  
  	virtual void animate();

Index: twbuttontypes.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twbuttontypes.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** twbuttontypes.cpp	29 Jan 2004 21:20:31 -0000	1.6
--- twbuttontypes.cpp	15 Feb 2004 13:08:57 -0000	1.7
***************
*** 92,96 ****
  {
  	BITMAP *newb;
! 	newb = getbmp(fname);
  
  	if (newb)
--- 92,97 ----
  {
  	BITMAP *newb;
! 	//newb = getbmp(fname);
! 	newb = getbmp_nobutton(fname);
  
  	if (newb)

Index: twgui.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twgui.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** twgui.cpp	29 Jan 2004 21:20:31 -0000	1.19
--- twgui.cpp	15 Feb 2004 13:08:57 -0000	1.20
***************
*** 227,230 ****
--- 227,232 ----
  
  	scroll.set(0, 0, 1, N , 1, Nshow);
+ 
+ 	text_color = color;
  }
  
***************
*** 346,350 ****
  		} else {
  			text_mode( makecol(0,0,0) );
! 			c = makecol(255,255,255);
  		}
  
--- 348,353 ----
  		} else {
  			text_mode( makecol(0,0,0) );
! 			//c = makecol(255,255,255);
! 			c = text_color;
  		}
  

Index: twwindow.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twwindow.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** twwindow.cpp	29 Jan 2004 21:20:31 -0000	1.8
--- twwindow.cpp	15 Feb 2004 13:08:57 -0000	1.9
***************
*** 387,391 ****
  
  	strcpy(objname, bmpname);
! 	strcat(objname, ".bmp");	// default extension for .bmp files.
  
  	tmpbmp = load_bitmap(objname, 0);
--- 387,395 ----
  
  	strcpy(objname, bmpname);
! 
! 	char *tmp;
! 	tmp = &objname[strlen(objname)-4];
! 	if (strcmp(tmp, ".bmp"))	// if the extension isn't already .bmp
! 		strcat(objname, ".bmp");	// default extension for .bmp files.
  
  	tmpbmp = load_bitmap(objname, 0);

[Timewarp-commit] source/gamex/general sprites.cpp,1.6,1.7

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

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

Modified Files:
	sprites.cpp 
Log Message:
updating gamex

Index: sprites.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/general/sprites.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sprites.cpp	29 Jan 2004 21:20:28 -0000	1.6
--- sprites.cpp	15 Feb 2004 13:08:57 -0000	1.7
***************
*** 124,127 ****
--- 124,131 ----
  
  			col = getpixel(bmp, ix, iy);
+ 
+ 			if (!col)
+ 				continue;
+ 
  			r = getr32(col);
  			g = getg32(col);

[Timewarp-commit] source/gamex/stuff space_body.cpp,1.8,1.9 space_body.h,1.8,1.9

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

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

Modified Files:
	space_body.cpp space_body.h 
Log Message:
updating gamex

Index: space_body.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/stuff/space_body.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** space_body.cpp	29 Jan 2004 21:20:29 -0000	1.8
--- space_body.cpp	15 Feb 2004 13:08:57 -0000	1.9
***************
*** 678,681 ****
--- 678,696 ----
  }
  
+ void SolarBody::change_pos(Vector2 dpos)
+ {
+ 	stayhere += dpos;
+ 	pos = stayhere;
+ 	ellipscenter += dpos;
+ }
+ 
+ void SolarBody::change_pos(double scale)
+ {
+ 	stayhere *= scale;
+ 	pos = stayhere;
+ 	ellipscenter *= scale;
+ 	ellipsR *= scale;
+ }
+ 
  void SolarBody::set_sprite(SpaceSprite *new_sprite)
  {

Index: space_body.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/stuff/space_body.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** space_body.h	29 Jan 2004 21:20:29 -0000	1.8
--- space_body.h	15 Feb 2004 13:08:57 -0000	1.9
***************
*** 141,144 ****
--- 141,147 ----
  	virtual void rem_sprite();
  	void drawshadow();
+ 
+ 	virtual void change_pos(Vector2 dpos);
+ 	virtual void change_pos(double scale);
  };
  

[Timewarp-commit] source/gamex/edit edit_dialogue.cpp,1.7,1.8 edit_dialogue.h,1.7,1.8

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

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

Modified Files:
	edit_dialogue.cpp edit_dialogue.h 
Log Message:
updating gamex

Index: edit_dialogue.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/edit/edit_dialogue.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** edit_dialogue.cpp	29 Jan 2004 21:20:28 -0000	1.7
--- edit_dialogue.cpp	15 Feb 2004 13:08:56 -0000	1.8
***************
*** 15,18 ****
--- 15,31 ----
  static int current_dialog_version = 0;
  
+ 
+ char *skiproot(char *ref, char *root)
+ {
+ 	if (!(ref  && root))
+ 		return 0;
+ 
+ 	int i = 0;
+ 	while (ref[i] == root[i] && root[i] != 0)
+ 		++i;
+ 
+ 	return &ref[i];
+ }
+ 
  // create a dialogue structure
  
***************
*** 31,34 ****
--- 44,62 ----
  }
  
+ 
+ void Dialo::init_default()
+ {
+ 	strcpy(T, "no convo yet");
+ 	
+ 	strcpy(racepic, "noraceyet");
+ 	version = 1;
+ 	mother = 0;
+ 	// branches of text (= new question list) spawned by the answer.
+ 	Nbranches = 0;
+ 	Ntriggers = 0;
+ 	// initial state
+ 	state = 1;
+ }
+ 
  void Dialo::read(FileStore *fs)
  {
***************
*** 37,50 ****
  	if (!mother && fs->size() == 0)
  	{
! 		strcpy(T, "noconvoyet");
! 		
! 		strcpy(racepic, "noraceyet");
! 		version = 1;
! 		mother = 0;
! 		// branches of text (= new question list) spawned by the answer.
! 		Nbranches = 0;
! 		Ntriggers = 0;
! 		// initial state
! 		state = 1;
  
  		return;
--- 65,69 ----
  	if (!mother && fs->size() == 0)
  	{
! 		init_default();
  
  		return;
***************
*** 234,237 ****
--- 253,257 ----
  	// find somewhere a list of all the available race-dialogue bitmaps
  
+ 	/*
  	FILE *f;
  	char txt[128];
***************
*** 253,256 ****
--- 273,277 ----
  		++Nracepiclist;
  	}
+ 	*/
  
  
***************
*** 309,316 ****
--- 330,339 ----
  	nodeid->set_textcolor(tcol);
  
+ 	/*
  	popupraceselect = new PopupList(raceselect, "gamex/interface/dialogeditor/raceselect",
  		"text/", -20, -20, usefont, 0);
  	popupraceselect->tbl->set_optionlist(racepiclist, Nracepiclist, makecol(255,255,128));
  	popupraceselect->hide();
+ 	*/
  
  	fb = new FileBrowser(bload, "gamex/interface/filebrowser", 0, 0, usefont);
***************
*** 319,322 ****
--- 342,351 ----
  	fb->set_ext("dialog");
  
+ 	
+ 	popupraceselect = new FileBrowser(raceselect, "gamex/interface/filebrowser", 0, 0, usefont);
+ 	popupraceselect->tbl->text_color = makecol(255,255,0);
+ 	popupraceselect->set_dir("gamex/gamedata/races");
+ 	popupraceselect->set_ext("bmp");
+ 
  
  	T->add(popupraceselect);
***************
*** 357,364 ****
--- 386,395 ----
  		delete Blist[i];
  
+ 	/*
  	for ( i = 0; i < Nracepiclist; ++i)
  	{
  		delete racepiclist[i];
  	}
+ 	*/
  
  	scare_mouse();
***************
*** 478,481 ****
--- 509,513 ----
  
  
+ 	/*
  	if (popupraceselect->returnvalueready)
  	{
***************
*** 488,491 ****
--- 520,531 ----
  		}
  	}
+ 	*/
+ 	if (popupraceselect->ready())
+ 	{
+ 		char *tmp;
+ 		tmp = skiproot(popupraceselect->fname, "gamex/gamedata/races/");
+ 		strcpy(dialo->racepic, tmp);
+ 		raceselect->set_text(dialo->racepic, makecol(255,255,128));
+ 	}
  
  
***************
*** 515,516 ****
--- 555,598 ----
  
  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ bool Dialo::check_state()
+ {
+ 	if (!state)
+ 		return false;
+ 	else
+ 	{
+ 		int i;
+ 		for ( i = 0; i < Nbranches; ++i )
+ 		{
+ 			if (branch[i]->state)
+ 				break;
+ 		}
+ 
+ 		if (i == Nbranches)
+ 			state = 0;
+ 
+ 		return state;
+ 	}
+ }
+ 
+ 
+ int Dialo::get_branch()
+ {
+ 	int i;
+ 	for ( i = 0; i < Nbranches; ++i )
+ 	{
+ 		if (branch[i]->state)
+ 			break;
+ 	}
+ 
+ 	if (i != Nbranches)
+ 		return i;
+ 	else
+ 		return 0;
+ }

Index: edit_dialogue.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/edit/edit_dialogue.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** edit_dialogue.h	29 Jan 2004 21:20:28 -0000	1.7
--- edit_dialogue.h	15 Feb 2004 13:08:56 -0000	1.8
***************
*** 26,32 ****
--- 26,35 ----
  	char racepic[128];
  
+ 	void init_default();
  	void read(FileStore *fs);
  	void write(FileStore *fs);
  
+ 	bool check_state();		// checks/changes state based on whether there are live branches or not
+ 	int get_branch();		// retrieves the first "live" branch
  
  	void enable();
***************
*** 71,75 ****
  	char *Blist[maxbranches];
  
! 	FileBrowser *fb;
  
  	virtual void init();
--- 74,78 ----
  	char *Blist[maxbranches];
  
! 	FileBrowser *fb, *popupraceselect;
  
  	virtual void init();
***************
*** 86,91 ****
  	void save_dialog();
  
! 	int Nracepiclist;
! 	char *racepiclist[maxracepiclist];
  	
  
--- 89,94 ----
  	void save_dialog();
  
! 	//int Nracepiclist;
! 	//char *racepiclist[maxracepiclist];
  	
  
***************
*** 98,102 ****
  
  	TextButton *raceselect;
! 	PopupList *popupraceselect;
  };
  
--- 101,105 ----
  
  	TextButton *raceselect;
! 	//PopupList *popupraceselect;
  };
  

[Timewarp-commit] gamex mapinfo.txt,1.5,1.6

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

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

Modified Files:
	mapinfo.txt 
Log Message:
updating gamex

Index: mapinfo.txt
===================================================================
RCS file: /cvsroot/timewarp/gamex/mapinfo.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mapinfo.txt	13 Jan 2004 01:15:26 -0000	1.5
--- mapinfo.txt	15 Feb 2004 13:07:19 -0000	1.6
***************
*** 0 ****
--- 1,37 ----
+ 1
+ 
+      Some region
+  empty_type
+  0.000000 0.000000 1
+  2
+ 
+ 	 Beta Wensicia
+ 	 small
+ 	 8.819304 5.500211 2
+ 	 4
+ 
+ 		 noname
+ 		 medium
+ 		 1940.026076 516.297262 3
+ 		 0
+ 
+ 		 noname
+ 		 small
+ 		 2033.898305 485.006519 4
+ 		 0
+ 
+ 		 noname
+ 		 dwarf
+ 		 2033.898305 547.588005 5
+ 		 0
+ 
+ 		 noname
+ 		 medium
+ 		 2232.073012 719.687093 6
+ 		 0
+ 
+ 	 Alpha Wensicia
+ 	 medium
+ 	 2.560443 3.793249 7
+ 	 0
+ 

[Timewarp-commit] gamex/planetscan surface_classM.ini,1.1.1.1,1.2 surface_medium_red.ini,1.1.1.1,1.2

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

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

Modified Files:
	surface_classM.ini surface_medium_red.ini 
Log Message:
updating gamex

Index: surface_classM.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_classM.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_classM.ini	4 Jan 2004 22:47:32 -0000	1.1.1.1
--- surface_classM.ini	15 Feb 2004 13:06:39 -0000	1.2
***************
*** 0 ****
--- 1,14 ----
+ 
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 0.5
+ base = 0.1
+ noble = 0.0
+ rare = 0.0
+ precious = 0.0
+ radioactive = 0.0
+ exotic = 0.0

Index: surface_medium_red.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/planetscan/surface_medium_red.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** surface_medium_red.ini	4 Jan 2004 22:48:34 -0000	1.1.1.1
--- surface_medium_red.ini	15 Feb 2004 13:06:39 -0000	1.2
***************
*** 0 ****
--- 1,14 ----
+ NumMin = 5
+ NumMax = 15
+ AvSize = 1
+ 
+ [fraction]
+ common = 1.0
+ corrosive = 1.0
+ base = 1.0
+ noble = 1.0
+ rare = 1.0
+ precious = 1.0
+ radioactive = 1.0
+ exotic = 1.0
+ 

[Timewarp-commit] gamex/hyperspace radar_big_01.bmp,NONE,1.1 radar_dwarf_01.bmp,NONE,1.1 radar_giant_01.bmp,NONE,1.1 radar_medium_01.bmp,NONE,1.1 radar_small_01.bmp,NONE,1.1 star_big_01.bmp,NONE,1.1 star_dwarf_01.bmp,NONE,1.1 star_giant_01.bmp,NONE,1.1 star_medium_01.bmp,NONE,1.1 star_small_01.bmp,NONE,1.1

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

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

Added Files:
	radar_big_01.bmp radar_dwarf_01.bmp radar_giant_01.bmp 
	radar_medium_01.bmp radar_small_01.bmp star_big_01.bmp 
	star_dwarf_01.bmp star_giant_01.bmp star_medium_01.bmp 
	star_small_01.bmp 
Log Message:
updating gamex

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

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

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

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

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

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

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

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

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

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

[Timewarp-commit] gamex/gamedata/mineraltypes noble.ini,NONE,1.1 noble_01.bmp,NONE,1.1 precious.ini,NONE,1.1 precious_01.bmp,NONE,1.1 radioactive.ini,NONE,1.1 radioactive_01.bmp,NONE,1.1 rare.ini,NONE,1.1 rare_01.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/gamedata/mineraltypes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26514/gamedata/mineraltypes

Added Files:
	noble.ini noble_01.bmp precious.ini precious_01.bmp 
	radioactive.ini radioactive_01.bmp rare.ini rare_01.bmp 
Log Message:
updating gamex

--- NEW FILE: noble.ini ---
value = 1

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

--- NEW FILE: precious.ini ---
value = 1

numnames = 3
name01 = gold
name02 = silver
name03 = platinum

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

--- NEW FILE: radioactive.ini ---
value = 1

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

--- NEW FILE: rare.ini ---
value = 1

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

[Timewarp-commit] gamex/player playerinfo.ini,1.4,1.5

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

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

Modified Files:
	playerinfo.ini 
Log Message:
updating gamex

Index: playerinfo.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/player/playerinfo.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** playerinfo.ini	10 Jan 2004 14:10:31 -0000	1.4
--- playerinfo.ini	15 Feb 2004 13:06:38 -0000	1.5
***************
*** 1,8 ****
  RU = 1200.000000
! Angle = 21.834066
  PlanetCode = -1
  Moon = -1
  Planet = -1
  Star = 0
! PosY = 542.372864
! PosX = 1966.101685
--- 1,8 ----
  RU = 1200.000000
! Angle = 15.079642
  PlanetCode = -1
  Moon = -1
  Planet = -1
  Star = 0
! PosY = 516.297241
! PosX = 1940.026123

[Timewarp-commit] gamex/planetscan/hazards lightning_01.bmp,NONE,1.1 lightning_02.bmp,NONE,1.1 lightning_03.bmp,NONE,1.1 lightning_04.bmp,NONE,1.1 lightning_05.bmp,NONE,1.1 lightning_06.bmp,NONE,1.1 lightning_07.bmp,NONE,1.1 lightning_08.bmp,NONE,1.1 quake_01.bmp,NONE,1.1 quake_02.bmp,NONE,1.1 quake_03.bmp,NONE,1.1 quake_04.bmp,NONE,1.1 quake_05.bmp,NONE,1.1 quake_06.bmp,NONE,1.1 quake_07.bmp,NONE,1.1 quake_08.bmp,NONE,1.1 whirl_01.bmp,NONE,1.1 whirl_02.bmp,NONE,1.1 whirl_03.bmp,NONE,1.1 whirl_04.bmp,NONE,1.1 whirl_05.bmp,NONE,1.1 whirl_06.bmp,NONE,1.1 whirl_07.bmp,NONE,1.1 whirl_08.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/planetscan/hazards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26514/planetscan/hazards

Added Files:
	lightning_01.bmp lightning_02.bmp lightning_03.bmp 
	lightning_04.bmp lightning_05.bmp lightning_06.bmp 
	lightning_07.bmp lightning_08.bmp quake_01.bmp quake_02.bmp 
	quake_03.bmp quake_04.bmp quake_05.bmp quake_06.bmp 
	quake_07.bmp quake_08.bmp whirl_01.bmp whirl_02.bmp 
	whirl_03.bmp whirl_04.bmp whirl_05.bmp whirl_06.bmp 
	whirl_07.bmp whirl_08.bmp 
Log Message:
updating gamex

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[Timewarp-commit] gamex/interface/planetscan/edit info.txt,NONE,1.1 ranl_default.bmp,NONE,1.1 ranm_default.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/interface/planetscan/edit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26514/interface/planetscan/edit

Added Files:
	info.txt ranl_default.bmp ranm_default.bmp 
Log Message:
updating gamex

--- NEW FILE: info.txt ---
gamex/interface/planetscan/edit/ranl_default_y = 11
gamex/interface/planetscan/edit/ranl_default_x = 168
gamex/interface/planetscan/edit/ranm_default_y = 10
gamex/interface/planetscan/edit/ranm_default_x = 14
res = 1600
autoplace = 1


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

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

[Timewarp-commit] gamex/planetscan/hazards fireball_01.bmp,NONE,1.1 fireball_02.bmp,NONE,1.1 fireball_03.bmp,NONE,1.1 fireball_04.bmp,NONE,1.1 fireball_05.bmp,NONE,1.1 fireball_06.bmp,NONE,1.1 fireball_07.bmp,NONE,1.1 fireball_08.bmp,NONE,1.1 firewall_01.bmp,NONE,1.1 firewall_02.bmp,NONE,1.1 firewall_03.bmp,NONE,1.1 firewall_04.bmp,NONE,1.1 firewall_05.bmp,NONE,1.1 firewall_06.bmp,NONE,1.1 firewall_07.bmp,NONE,1.1 firewall_08.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/planetscan/hazards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/planetscan/hazards

Added Files:
	fireball_01.bmp fireball_02.bmp fireball_03.bmp 
	fireball_04.bmp fireball_05.bmp fireball_06.bmp 
	fireball_07.bmp fireball_08.bmp firewall_01.bmp 
	firewall_02.bmp firewall_03.bmp firewall_04.bmp 
	firewall_05.bmp firewall_06.bmp firewall_07.bmp 
	firewall_08.bmp 
Log Message:
updating gamex

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[Timewarp-commit] gamex/gamedata/mineraltypes base.ini,NONE,1.1 base_01.bmp,NONE,1.1 corrosive.ini,NONE,1.1 corrosive_01.bmp,NONE,1.1 exotic.ini,NONE,1.1 exotic_01.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/gamedata/mineraltypes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/gamedata/mineraltypes

Added Files:
	base.ini base_01.bmp corrosive.ini corrosive_01.bmp exotic.ini 
	exotic_01.bmp 
Log Message:
updating gamex

--- NEW FILE: base.ini ---
value = 1

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

--- NEW FILE: corrosive.ini ---
value = 1

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

--- NEW FILE: exotic.ini ---
value = 1

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

[Timewarp-commit] gamex/gamedata/structuretypes default.dialog,NONE,1.1 default.ini,NONE,1.1 default_01.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/gamedata/structuretypes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/gamedata/structuretypes

Added Files:
	default.dialog default.ini default_01.bmp 
Log Message:
updating gamex

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

--- NEW FILE: default.ini ---

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

[Timewarp-commit] gamex/gamedata/races/earthling colony.dialog,1.1.1.1,1.2

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

Update of /cvsroot/timewarp/gamex/gamedata/races/earthling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/gamedata/races/earthling

Modified Files:
	colony.dialog 
Log Message:
updating gamex

Index: colony.dialog
===================================================================
RCS file: /cvsroot/timewarp/gamex/gamedata/races/earthling/colony.dialog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs33Gfn7 and /tmp/cvstW90Pm differ

[Timewarp-commit] gamex/interface/planetscan/edit backgr.bmp,NONE,1.1

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

Update of /cvsroot/timewarp/gamex/interface/planetscan/edit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/interface/planetscan/edit

Added Files:
	backgr.bmp 
Log Message:
updating gamex

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

[Timewarp-commit] gamex/gamedata/surface 00000003.ini,1.2,1.3

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

Update of /cvsroot/timewarp/gamex/gamedata/surface
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/gamedata/surface

Modified Files:
	00000003.ini 
Log Message:
updating gamex

Index: 00000003.ini
===================================================================
RCS file: /cvsroot/timewarp/gamex/gamedata/surface/00000003.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** 00000003.ini	10 Jan 2004 14:10:31 -0000	1.2
--- 00000003.ini	15 Feb 2004 13:05:02 -0000	1.3
***************
*** 9,10 ****
--- 9,32 ----
  radius = 0.000000
  atmo = 0.004408
+ 
+ [minerals]
+ N = 10
+ mineral000 = 98.334824 192.567488 rare
+ mineral001 = 140.523920 44.604262 radioactive
+ mineral002 = 147.637004 128.662626 exotic
+ mineral003 = 98.317281 17.461100 precious
+ mineral004 = 166.211167 108.841131 corrosive
+ mineral005 = 83.737590 119.623300 rare
+ mineral006 = 319.574897 163.327417 precious
+ mineral007 = 266.609143 3.923339 exotic
+ mineral008 = 27.097973 9.888274 base
+ mineral009 = 21.703106 90.541513 noble
+ mineral010 = 262.704610 71.927083 exotic
+ mineral011 = 382.604746 111.346619 common
+ mineral012 = 29.746200 56.428445 common
+ mineral013 = 370.291054 95.309334 exotic
+ 
+ [structures]
+ N = 1
+ structure000 = 100.000 100.000 default
+ 

[Timewarp-commit] gamex/planetscan/hazards - New directory

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

Update of /cvsroot/timewarp/gamex/planetscan/hazards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25844/hazards

Log Message:
Directory /cvsroot/timewarp/gamex/planetscan/hazards added to the repository

[Timewarp-commit] gamex/interface/planetscan/edit - New directory

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

Update of /cvsroot/timewarp/gamex/interface/planetscan/edit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25728/edit

Log Message:
Directory /cvsroot/timewarp/gamex/interface/planetscan/edit added to the repository

[Timewarp-commit] gamex/gamedata/structuretypes - New directory

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

Update of /cvsroot/timewarp/gamex/gamedata/structuretypes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25646/structuretypes

Log Message:
Directory /cvsroot/timewarp/gamex/gamedata/structuretypes added to the repository

[Timewarp-commit] twwin.dsp,1.29,1.30

[<or...@us...>]

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

Modified Files:
	twwin.dsp 
Log Message:
added /NODEFAULTLIB:LIBCMT ... not sure why that's necessary?