[Gcblue-commits] gcb_wx/include/database tcDBObjSerializerSql.h, 1.8, 1.9 tcDatabaseObject.h, 1.30, 1.31 tcMissileDBObject.h, 1.24, 1.25 tcSqlReader.h, 1.6, 1.7

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/database
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21395/include/database

Modified Files:
	tcDBObjSerializerSql.h tcDatabaseObject.h tcMissileDBObject.h 
	tcSqlReader.h 
Log Message:
Update for server name change

Index: tcDatabaseObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseObject.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** tcDatabaseObject.h	18 Jun 2006 00:47:51 -0000	1.30
--- tcDatabaseObject.h	17 Aug 2006 01:27:10 -0000	1.31
***************
*** 63,66 ****
--- 63,67 ----
  #define PTYPE_SMALLSURFACE 0x0011
  #define PTYPE_LARGESURFACE 0x0012
+ #define PTYPE_CARRIER 0x0014
  #define PTYPE_AIR 0x0020
  #define PTYPE_FIXEDWING 0x0021
***************
*** 72,75 ****
--- 73,77 ----
  #define PTYPE_SONOBUOY 0x0084
  #define PTYPE_FIXED 0x0100
+ #define PTYPE_AIRFIELD 0x0101
  #define PTYPE_BALLISTIC 0x0200
      
***************
*** 144,147 ****
--- 146,150 ----
          
          static void AttachDatabase(tcDatabase *db) {database = db;}
+ 		const char* GetName() const; ///< returns name of this instance
          virtual const char* GetClassName() {return "Object";} ///< returns class name of database object
          float GetCost() const {return cost;}

Index: tcSqlReader.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSqlReader.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcSqlReader.h	22 Mar 2006 01:23:28 -0000	1.6
--- tcSqlReader.h	17 Aug 2006 01:27:10 -0000	1.7
***************
*** 64,67 ****
--- 64,69 ----
  		std::string GetString(const std::string& field);
  		std::string GetString(const char* fmt, ...);
+ 		
+ 		bool GetStringError() const;
  
  		bool Read();

Index: tcDBObjSerializerSql.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBObjSerializerSql.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcDBObjSerializerSql.h	18 Jun 2006 00:47:51 -0000	1.8
--- tcDBObjSerializerSql.h	17 Aug 2006 01:27:10 -0000	1.9
***************
*** 122,129 ****
                  // if the obj already exists, delete the old and add the new (update)
                  // (doesn't work for duplicates within database since BuildDictionaries needs to be called)
!                 if (database->ObjectExists(obj->GetClassName()))
                  {
!                     fprintf(stdout, "Updating database class: %s\n", obj->GetClassName());
!                     tcDatabaseObject* oldObj = database->GetObject(obj->GetClassName());
                      wxASSERT(oldObj != 0);
                      
--- 122,129 ----
                  // if the obj already exists, delete the old and add the new (update)
                  // (doesn't work for duplicates within database since BuildDictionaries needs to be called)
!                 if (database->ObjectExists(obj->GetName()))
                  {
!                     fprintf(stdout, "Updating database class: %s\n", obj->GetName());
!                     tcDatabaseObject* oldObj = database->GetObject(obj->GetName());
                      wxASSERT(oldObj != 0);
                      

Index: tcMissileDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcMissileDBObject.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** tcMissileDBObject.h	18 Jun 2006 00:47:51 -0000	1.24
--- tcMissileDBObject.h	17 Aug 2006 01:27:10 -0000	1.25
***************
*** 142,146 ****
        teWeaponLaunchMode GetLaunchMode();
        long GetSensorKey();
!       float GetSeekerFOV();
  	  bool HasAllEmitters(std::vector<long>& emitters);
  	  bool NeedsFireControl() const;
--- 142,146 ----
        teWeaponLaunchMode GetLaunchMode();
        long GetSensorKey();
!       float GetSeekerFOV(); ///< @returns FOV in radians
  	  bool HasAllEmitters(std::vector<long>& emitters);
  	  bool NeedsFireControl() const;