--- vegastrike-0.4.3/objconv/trisort.h~ 2002-11-29 21:07:44.000000000 +0100
+++ vegastrike-0.4.3/objconv/trisort.h 2006-06-14 00:59:20.000000000 +0200
@@ -38,8 +38,8 @@
};
class Mesh {
void processline (char * line);
- Index Mesh::processfacevertex(char * chunk) const;
- Face Mesh::processface( char * line)const;
+ Index processfacevertex(char * chunk) const;
+ Face processface( char * line)const;
std::vector <Vector> p;
std::vector <Vector> n;
std::vector <Vector> t;//tex coords i=s j=t
--- vegastrike-0.4.3/src/cmd/script/flightgroup.h~ 2004-02-07 11:41:28.000000000 +0100
+++ vegastrike-0.4.3/src/cmd/script/flightgroup.h 2006-06-14 00:40:39.000000000 +0200
@@ -81,7 +81,7 @@
Flightgroup (Flightgroup & other) {
*this = other;
}
- Flightgroup& Flightgroup::operator = (Flightgroup & other);
+ Flightgroup& operator = (Flightgroup & other);
~Flightgroup();
};
--- vegastrike-0.4.3/src/cmd/collection.h~ 2004-04-25 11:51:05.000000000 +0200
+++ vegastrike-0.4.3/src/cmd/collection.h 2006-06-14 00:39:55.000000000 +0200
@@ -59,7 +59,7 @@
GetNextValidUnit();
}
UnitIterator( const UnitIterator& orig ) : pos(orig.pos) { }
- UnitIterator& UnitIterator::operator=( const UnitIterator& orig ) {
+ UnitIterator& operator=( const UnitIterator& orig ) {
pos = orig.pos; return *this;
}
~UnitIterator() {
@@ -93,7 +93,7 @@
ConstIterator(const UnitListNode *start):pos(start) {
GetNextValidUnit();
}
- ConstIterator& ConstIterator::operator=( const ConstIterator& orig ) {
+ ConstIterator& operator=( const ConstIterator& orig ) {
pos = orig.pos;
return *this;
}
--- vegastrike-0.4.3/src/cmd/weapon_xml.h~ 2004-03-18 09:58:46.000000000 +0100
+++ vegastrike-0.4.3/src/cmd/weapon_xml.h 2006-06-14 00:40:15.000000000 +0200
@@ -32,7 +32,7 @@
void Type (enum WEAPON_TYPE typ) {type=typ;switch(typ) {case BOLT:file=string("");break;case BEAM:file=string("beamtexture.bmp");break;case BALL:file=string("ball.ani");break;case PROJECTILE:file=string("missile.bfxm");break;default:break;}}
void MntSize(enum MOUNT_SIZE size) {this->size = size;}
weapon_info(enum WEAPON_TYPE typ) {init();Type(typ);}
- weapon_info::weapon_info(const weapon_info &tmp) {*this = tmp;}
+ weapon_info(const weapon_info &tmp) {*this = tmp;}
// weapon_info& operator = (const weapon_info &tmp);
void netswap();
};
--- vegastrike-0.4.3/src/cmd/base.h~ 2004-12-06 07:14:54.000000000 +0100
+++ vegastrike-0.4.3/src/cmd/base.h 2006-06-14 00:43:08.000000000 +0200
@@ -200,7 +200,7 @@
// static void BaseInterface::beginElement(void *userData, const XML_Char *names, const XML_Char **atts);
// void BaseInterface::beginElement(const string &name, const AttributeList attributes);
// static void BaseInterface::endElement(void *userData, const XML_Char *name);
- void BaseInterface::Load(const char * filename, const char * time_of_day, const char * faction);
+ void Load(const char * filename, const char * time_of_day, const char * faction);
static void ClickWin (int x, int y, int button, int state);
void Click (int x, int y, int button, int state);
static void PassiveMouseOverWin (int x, int y);
--- vegastrike-0.4.3/src/cmd/nebula_generic.h~ 2003-06-12 07:16:56.000000000 +0200
+++ vegastrike-0.4.3/src/cmd/nebula_generic.h 2006-06-14 00:45:16.000000000 +0200
@@ -4,7 +4,7 @@
class Nebula: public Unit {
protected:
- static void Nebula::beginElement (void * Userdata,const XML_Char * name, const XML_Char ** atts);
+ static void beginElement (void * Userdata,const XML_Char * name, const XML_Char ** atts);
Vector color;
float Density;
float fognear;
--- vegastrike-0.4.3/src/gfx/nav/navpath.h~ 2005-01-18 09:03:16.000000000 +0100
+++ vegastrike-0.4.3/src/gfx/nav/navpath.h 2006-06-14 00:42:05.000000000 +0200
@@ -83,7 +83,7 @@
void addNewPath();
bool update();
- bool NavPath::isNeighborPath(unsigned system, unsigned neighbor);
+ bool isNeighborPath(unsigned system, unsigned neighbor);
NavPath();
~NavPath();
--- vegastrike-0.4.3/src/gfx/vsimage.h~ 2005-01-31 11:59:01.000000000 +0100
+++ vegastrike-0.4.3/src/gfx/vsimage.h 2006-06-14 00:42:44.000000000 +0200
@@ -121,10 +121,10 @@
//const static int SIZEOF_RGBQUAD;
LOCALCONST_DECL(int,SIZEOF_RGBQUAD,sizeof(BYTE)*4)
- VSImage::VSImage();
+ VSImage();
// f2 is needed for bmp loading
- VSImage::VSImage( VSFile * f, textureTransform * t=NULL, bool strip=false, VSFile * f2 = NULL);
- VSImage::~VSImage();
+ VSImage( VSFile * f, textureTransform * t=NULL, bool strip=false, VSFile * f2 = NULL);
+ ~VSImage();
// f2 is needed for bmp loading
unsigned char* ReadImage( VSFile * f, textureTransform * t=NULL, bool strip=false, VSFile * f2 = NULL);
--- vegastrike-0.4.3/src/star_system.h~ 2004-02-07 11:41:13.000000000 +0100
+++ vegastrike-0.4.3/src/star_system.h 2006-06-14 00:43:24.000000000 +0200
@@ -34,7 +34,7 @@
Texture *LightMap[6];
//vector <class MissileEffect *> dischargedMissiles;
public:
- GameStarSystem::GameStarSystem(const char * filename, const Vector & centr=Vector(0,0,0),const float timeofyear=0);
+ GameStarSystem(const char * filename, const Vector & centr=Vector(0,0,0),const float timeofyear=0);
~GameStarSystem();
//void UpdateUnitPhysics(bool firstframe);
//class CollideTable *collidetable;