[Gcblue-commits] gcb_wx/src/database tcDatabase.cpp,1.21,1.22 tcLauncherDBObject.cpp,1.11,1.12

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

Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20399/src/database

Modified Files:
	tcDatabase.cpp tcLauncherDBObject.cpp 
Log Message:
Sonar work, passive sonar, torpedoes

Index: tcLauncherDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcLauncherDBObject.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcLauncherDBObject.cpp	29 Nov 2004 03:55:04 -0000	1.11
--- tcLauncherDBObject.cpp	5 Dec 2004 02:49:47 -0000	1.12
***************
*** 246,251 ****
  			maChildClass[mnConfigurations] = entry.GetString(s.GetBuffer()).c_str();
  
! 			if (maCapacity[mnConfigurations] && 
! 				(strlen(maChildClass[mnConfigurations].mz) > 0))
  			{
  				mnConfigurations++;
--- 246,250 ----
  			maChildClass[mnConfigurations] = entry.GetString(s.GetBuffer()).c_str();
  
! 			if (strlen(maChildClass[mnConfigurations].mz) > 0)
  			{
  				mnConfigurations++;

Index: tcDatabase.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** tcDatabase.cpp	2 Dec 2004 04:17:24 -0000	1.21
--- tcDatabase.cpp	5 Dec 2004 02:49:47 -0000	1.22
***************
*** 49,52 ****
--- 49,53 ----
  #include "tcBallisticDBObject.h"
  #include "tcStoresDBObject.h"
+ #include "tcTorpedoDBObject.h"
  #include "tcDatabaseIterator.h"
  #include "common/tinyxml.h"
***************
*** 309,313 ****
  		else serializer.Save();
  	}
! 
  	BuildDictionaries();
  }
--- 310,320 ----
  		else serializer.Save();
  	}
! 	// tcTorpedoDBObject
! 	{
! 		tcDBObjSerializerSql<tcTorpedoDBObject> 
! 			serializer(this, sqlConnection, "torpedo");
! 		if (load) serializer.Load();
! 		else serializer.Save();
! 	}
  	BuildDictionaries();
  }