Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14891/src/database
Modified Files:
tcBallisticDBObject.cpp tcDatabase.cpp
Log Message:
Index: tcBallisticDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcBallisticDBObject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcBallisticDBObject.cpp 12 Aug 2004 01:14:28 -0000 1.4
--- tcBallisticDBObject.cpp 14 Sep 2004 02:01:46 -0000 1.5
***************
*** 147,151 ****
wxASSERT(node);
! TiXmlElement* localNode = node->InsertEndChild(TiXmlElement("sensor"))->ToElement();
//localNode->SetAttribute("maxRange_km" ,mfMaxRange_km);
--- 147,152 ----
wxASSERT(node);
! //TiXmlElement* localNode =
! node->InsertEndChild(TiXmlElement("sensor"))->ToElement();
//localNode->SetAttribute("maxRange_km" ,mfMaxRange_km);
Index: tcDatabase.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcDatabase.cpp 9 Aug 2004 02:35:15 -0000 1.15
--- tcDatabase.cpp 14 Sep 2004 02:01:46 -0000 1.16
***************
*** 291,301 ****
}
! int tcDatabase::Serialize(tcFile& file, bool mbLoad) {
! tnPoolIndex nMapSize, nKey, nPoolPos;
! tcDatabaseObject *pdbobj;
! tcGenericDBObject *pgeneric;
! tcLauncherDBObject *plauncher;
! tcMissileDBObject *pmissile;
! tcRadarDBObject *pradar;
UINT nClassID;
int nResult;
--- 291,304 ----
}
! int tcDatabase::Serialize(tcFile& file, bool mbLoad)
! {
! long nMapSize = 0;
! long nKey = -1;
! long nPoolPos = -1;
! tcDatabaseObject *pdbobj = 0;
! tcGenericDBObject *pgeneric = 0;
! tcLauncherDBObject *plauncher = 0;
! tcMissileDBObject *pmissile = 0;
! tcRadarDBObject *pradar = 0;
UINT nClassID;
int nResult;
***************
*** 907,910 ****
--- 910,915 ----
/**
* @return random database entry matching model type
+ *
+ * TODO fix this to guarantee return of object matching model type if one exists
*/
tcDatabaseObject* tcDatabase::GetRandomOfType(UINT model_type)
***************
*** 915,919 ****
tcDatabaseObject *pdata;
! while ((bSearching)&&(nTries++ < 128))
{
tnPoolIndex nKey = GetRandomKey();
--- 920,924 ----
tcDatabaseObject *pdata;
! while ((bSearching)&&(nTries++ < 256))
{
tnPoolIndex nKey = GetRandomKey();
***************
*** 1140,1144 ****
tnPoolIndex nMapSize, nKey, nPoolPos;
tcDatabaseObject *pdbobj;
- int bFound = 0;
nMapSize = mcObjectData.GetCount();
--- 1145,1148 ----
|
