[Gcblue-commits] gcb_wx/src/database tcWeaponDBObject.cpp,NONE,1.1 tcDatabase.cpp,1.11,1.12 tcMissil
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-07-27 00:16:34
|
Update of /cvsroot/gcblue/gcb_wx/src/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10427/src/database Modified Files: tcDatabase.cpp tcMissileDBObject.cpp Added Files: tcWeaponDBObject.cpp Log Message: --- NEW FILE: tcWeaponDBObject.cpp --- /** ** @file tcWeaponDBObject.cpp */ /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. ** This file is part of the Global Conflict Blue (GCB) program. ** GCB is free software; you can redistribute it and/or modify ** it under the terms of version 2 of the GNU General Public License as ** published by the Free Software Foundation. ** GCB is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. ** You should have received a copy of the GNU General Public License ** along with GCB; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "stdwx.h" #if _MSC_VER > 1000 #pragma warning(disable:4786) // suppress warning for STL bug in VC6, see Q167355 in the MSDN Library. #endif // _MSC_VER > 1000 #include "tcWeaponDBObject.h" #include "math_constants.h" #include "randfn.h" #include "CsvTranslator.h" #include "common/tinyxml.h" using namespace std; namespace Database { void tcWeaponDBObject::PrintToFile(tcFile& file) { char zBuff[128]; tcDatabaseObject::PrintToFile(file); sprintf(zBuff," damage: %.1f \n", mfDamage); file.WriteString(zBuff); } int tcWeaponDBObject::Serialize(tcFile& file, bool mbLoad, UINT32 anVersion) { tcDatabaseObject::Serialize(file,mbLoad,anVersion); if (mbLoad) { file.Read(&mfDamage, sizeof(mfDamage)); } else { file.Write(&mfDamage, sizeof(mfDamage)); } return true; } int tcWeaponDBObject::SerializeCSV(CsvTranslator *csv, bool mbLoad) { tcDatabaseObject::SerializeCSV(csv, mbLoad); if (mbLoad) { *csv >> mfDamage; } else { *csv << mfDamage; // csv->WriteLine(); // do not writeline since this isn't a leaf class } return 1; } /** * Loads/saves XML data for database object * @param load true to load, false to save */ void tcWeaponDBObject::SerializeXml(TiXmlElement* node, bool load) { if (load) return; // write only for now wxASSERT(node); TiXmlElement* localNode = node->InsertEndChild(TiXmlElement("weapon"))->ToElement(); localNode->SetAttribute("mfDamage" , mfDamage); tcDatabaseObject::SerializeXml(node, load); } int tcWeaponDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { tcDatabaseObject::WriteCSVHeader(csv); *csv << "Damage"; return 1; } tcWeaponDBObject::tcWeaponDBObject() : tcDatabaseObject() { mzClass = "Default weapon"; mnClassID = DTYPE_WEAPON; mfDamage = 1.0; } tcWeaponDBObject::tcWeaponDBObject(tcWeaponDBObject& obj) : tcDatabaseObject(obj) { mfDamage = obj.mfDamage; } tcWeaponDBObject::~tcWeaponDBObject() { } } Index: tcMissileDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcMissileDBObject.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcMissileDBObject.cpp 30 Mar 2004 01:15:21 -0000 1.7 --- tcMissileDBObject.cpp 27 Jul 2004 00:16:23 -0000 1.8 *************** *** 1,6 **** /* ! ** tcMissileDBObject.cpp ! ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,7 ---- /* ! ** @file tcMissileDBObject.cpp ! */ ! /* ! ** Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 73,77 **** tcString s; ! tcDatabaseObject::PrintToFile(file); s.Format(" "); --- 74,78 ---- tcString s; ! tcWeaponDBObject::PrintToFile(file); s.Format(" "); *************** *** 81,85 **** int tcMissileDBObject::Serialize(tcFile& file, bool mbLoad, UINT32 anVersion) { ! tcDatabaseObject::Serialize(file,mbLoad,anVersion); if (mbLoad) { --- 82,87 ---- int tcMissileDBObject::Serialize(tcFile& file, bool mbLoad, UINT32 anVersion) { ! tcWeaponDBObject::Serialize(file, mbLoad, anVersion); ! if (mbLoad) { *************** *** 98,103 **** file.Read(&mfSustThrust_N,sizeof(mfSustThrust_N)); file.Read(&mfSustTime_s,sizeof(mfSustTime_s)); ! file.Read(&mfDamage,sizeof(mfDamage)); ! file.Read(&meDamageType,sizeof(meDamageType)); file.Read(&mfRcs_dbsm,sizeof(mfRcs_dbsm)); file.Read(&mfRange_km,sizeof(mfRange_km)); --- 100,105 ---- file.Read(&mfSustThrust_N,sizeof(mfSustThrust_N)); file.Read(&mfSustTime_s,sizeof(mfSustTime_s)); ! //file.Read(&mfDamage,sizeof(mfDamage)); ! //file.Read(&meDamageType,sizeof(meDamageType)); file.Read(&mfRcs_dbsm,sizeof(mfRcs_dbsm)); file.Read(&mfRange_km,sizeof(mfRange_km)); *************** *** 135,140 **** file.Write(&mfSustThrust_N,sizeof(mfSustThrust_N)); file.Write(&mfSustTime_s,sizeof(mfSustTime_s)); ! file.Write(&mfDamage,sizeof(mfDamage)); ! file.Write(&meDamageType,sizeof(meDamageType)); file.Write(&mfRcs_dbsm,sizeof(mfRcs_dbsm)); file.Write(&mfRange_km,sizeof(mfRange_km)); --- 137,142 ---- file.Write(&mfSustThrust_N,sizeof(mfSustThrust_N)); file.Write(&mfSustTime_s,sizeof(mfSustTime_s)); ! //file.Write(&mfDamage,sizeof(mfDamage)); ! //file.Write(&meDamageType,sizeof(meDamageType)); file.Write(&mfRcs_dbsm,sizeof(mfRcs_dbsm)); file.Write(&mfRange_km,sizeof(mfRange_km)); *************** *** 155,163 **** int tcMissileDBObject::SerializeCSV(Database::CsvTranslator *csv, bool mbLoad) { ! tcDatabaseObject::SerializeCSV(csv, mbLoad); if (mbLoad) { std::string s; ! int val; *csv >> mfMass_kg; --- 157,165 ---- int tcMissileDBObject::SerializeCSV(Database::CsvTranslator *csv, bool mbLoad) { ! tcWeaponDBObject::SerializeCSV(csv, mbLoad); if (mbLoad) { std::string s; ! // int val; *csv >> mfMass_kg; *************** *** 175,180 **** *csv >> mfSustThrust_N; *csv >> mfSustTime_s; ! *csv >> mfDamage; ! *csv >> val; meDamageType = (teDamageType)val; *csv >> mfRcs_dbsm; *csv >> mfRange_km; --- 177,182 ---- *csv >> mfSustThrust_N; *csv >> mfSustTime_s; ! //*csv >> mfDamage; ! //*csv >> val; meDamageType = (teDamageType)val; *csv >> mfRcs_dbsm; *csv >> mfRange_km; *************** *** 221,226 **** *csv << mfSustThrust_N; *csv << mfSustTime_s; ! *csv << mfDamage; ! *csv << long(meDamageType); *csv << mfRcs_dbsm; *csv << mfRange_km; --- 223,228 ---- *csv << mfSustThrust_N; *csv << mfSustTime_s; ! //*csv << mfDamage; ! //*csv << long(meDamageType); *csv << mfRcs_dbsm; *csv << mfRange_km; *************** *** 277,282 **** localNode->SetAttribute("sustThrust_N", mfSustThrust_N); localNode->SetAttribute("sustTime_s", mfSustTime_s); ! localNode->SetAttribute("damage", mfDamage); ! localNode->SetAttribute("damageType", (int)meDamageType); localNode->SetAttribute("rcs_dbsm", mfRcs_dbsm); localNode->SetAttribute("range_km", mfRange_km); --- 279,284 ---- localNode->SetAttribute("sustThrust_N", mfSustThrust_N); localNode->SetAttribute("sustTime_s", mfSustTime_s); ! //localNode->SetAttribute("damage", mfDamage); ! //localNode->SetAttribute("damageType", (int)meDamageType); localNode->SetAttribute("rcs_dbsm", mfRcs_dbsm); localNode->SetAttribute("range_km", mfRange_km); *************** *** 295,304 **** } ! tcDatabaseObject::SerializeXml(node, load); } int tcMissileDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { ! tcDatabaseObject::WriteCSVHeader(csv); csv->WriteField("Mass_kg"); csv->WriteField("DragArea_sm"); --- 297,307 ---- } ! tcWeaponDBObject::SerializeXml(node, load); } int tcMissileDBObject::WriteCSVHeader(Database::CsvTranslator *csv) { ! tcWeaponDBObject::WriteCSVHeader(csv); ! csv->WriteField("Mass_kg"); csv->WriteField("DragArea_sm"); *************** *** 315,320 **** csv->WriteField("SustThrust_N"); csv->WriteField("SustTime_s"); ! csv->WriteField("Damage"); ! csv->WriteField("DamageType"); csv->WriteField("Rcs_dbsm"); csv->WriteField("Range_km"); --- 318,323 ---- csv->WriteField("SustThrust_N"); csv->WriteField("SustTime_s"); ! //csv->WriteField("Damage"); ! //csv->WriteField("DamageType"); csv->WriteField("Rcs_dbsm"); csv->WriteField("Range_km"); *************** *** 343,347 **** tcMissileDBObject::tcMissileDBObject(tcMissileDBObject& obj) ! : tcDatabaseObject(obj) { mfMass_kg = obj.mfMass_kg; --- 346,350 ---- tcMissileDBObject::tcMissileDBObject(tcMissileDBObject& obj) ! : tcWeaponDBObject(obj) { mfMass_kg = obj.mfMass_kg; *************** *** 361,366 **** mfShutdownSpeed_mps = obj.mfShutdownSpeed_mps; ! mfDamage = obj.mfDamage; ! meDamageType = obj.meDamageType; mnTargetFlags = obj.mnTargetFlags; mfRcs_dbsm = obj.mfRcs_dbsm; --- 364,369 ---- mfShutdownSpeed_mps = obj.mfShutdownSpeed_mps; ! //mfDamage = obj.mfDamage; ! //meDamageType = obj.meDamageType; mnTargetFlags = obj.mnTargetFlags; mfRcs_dbsm = obj.mfRcs_dbsm; *************** *** 378,382 **** } ! tcMissileDBObject::tcMissileDBObject() : tcDatabaseObject() { mnClassID = DTYPE_MISSILE; --- 381,385 ---- } ! tcMissileDBObject::tcMissileDBObject() : tcWeaponDBObject() { mnClassID = DTYPE_MISSILE; *************** *** 399,404 **** mfSustTime_s = 60.0f; // other parameters ! mfDamage = 100.0f; ! meDamageType = DT_GENERIC; mfRcs_dbsm = 0.0f; mfRange_km = 123.4f; --- 402,407 ---- mfSustTime_s = 60.0f; // other parameters ! //mfDamage = 100.0f; ! //meDamageType = DT_GENERIC; mfRcs_dbsm = 0.0f; mfRange_km = 123.4f; Index: tcDatabase.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcDatabase.cpp 18 Jul 2004 03:18:00 -0000 1.11 --- tcDatabase.cpp 27 Jul 2004 00:16:23 -0000 1.12 *************** *** 496,500 **** // other parameters pmissile->mfDamage = 100.0f; ! pmissile->meDamageType = DT_GENERIC; pmissile->mfRcs_dbsm = 0.0f; pmissile->mfRange_km = 123.4f; --- 496,500 ---- // other parameters pmissile->mfDamage = 100.0f; ! //pmissile->meDamageType = DT_GENERIC; pmissile->mfRcs_dbsm = 0.0f; pmissile->mfRange_km = 123.4f; |