[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.102,1.103 tcAIData.cpp,1.6,1.7 tcAero.cpp,1.5,1.6 tcAeroA
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.102,1.103 tcAIData.cpp,1.6,1.7 tcAero.cpp,1.5,1.6 tcAeroAirObject.cpp,1.6,1.7 tcAirObject.cpp,1.11,1.12 tcAirfieldObject.cpp,1.2,1.3 tcBallisticWeapon.cpp,1.5,1.6 tcCarrierObject.cpp,1.8,1.9 tcCommandObject.cpp,1.1,1.2 tcDemTileReader.cpp,1.1,1.2 tcDirector.cpp,1.9,1.10 tcDirectorEvent.cpp,1.11,1.12 tcESMSensor.cpp,1.7,1.8 tcEngagementData.cpp,1.2,1.3 tcFlightOpsObject.cpp,1.4,1.5 tcFlightPort.cpp,1.11,1.12 tcGameObjIterator.cpp,1.4,1.5 tcGameObject.cpp,1.22,1.23 tcGoal.cpp,1.5,1.6 tcGuidanceState.cpp,1.3,1.4 tcHeloObject.cpp,1.1,1.2 tcLaunchRequest.cpp,1.2,1.3 tcLauncher.cpp,1.4,1.5 tcLauncherState.cpp,1.19,1.20 tcMapData.cpp,1.13,1.14 tcMenu.cpp,1.8,1.9 tcMissileObject.cpp,1.17,1.18 tcObjectControl.cpp,1.18,1.19 tcPlatformObject.cpp,1.29,1.30 tcRadar.cpp,1.13,1.14 tcSensorMap.cpp,1.11,1.12 tcSensorState.cpp,1.10,1.11 tcSimState.cpp,1.54,1.55 tcSurfaceObject.cpp,1.12,1.13 tcTime.cpp,1.7,1.8 tcUserInfo.cpp,1.4,1.5 tcWeaponObject.cpp,1.8,1.9
Update of /cvsroot/gcblue/gcb_wx/src/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8917/src/sim Modified Files: Game.cpp tcAIData.cpp tcAero.cpp tcAeroAirObject.cpp tcAirObject.cpp tcAirfieldObject.cpp tcBallisticWeapon.cpp tcCarrierObject.cpp tcCommandObject.cpp tcDemTileReader.cpp tcDirector.cpp tcDirectorEvent.cpp tcESMSensor.cpp tcEngagementData.cpp tcFlightOpsObject.cpp tcFlightPort.cpp tcGameObjIterator.cpp tcGameObject.cpp tcGoal.cpp tcGuidanceState.cpp tcHeloObject.cpp tcLaunchRequest.cpp tcLauncher.cpp tcLauncherState.cpp tcMapData.cpp tcMenu.cpp tcMissileObject.cpp tcObjectControl.cpp tcPlatformObject.cpp tcRadar.cpp tcSensorMap.cpp tcSensorState.cpp tcSimState.cpp tcSurfaceObject.cpp tcTime.cpp tcUserInfo.cpp tcWeaponObject.cpp Log Message: A few more changes related to GDI+ replacement Index: tcUserInfo.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcUserInfo.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcUserInfo.cpp 8 Aug 2004 00:31:35 -0000 1.4 --- tcUserInfo.cpp 2 Nov 2004 04:23:57 -0000 1.5 *************** *** 27,30 **** --- 27,34 ---- #include "tcUserInfo.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + UINT8 tcUserInfo::GetOwnAlliance(void) { Index: tcMissileObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMissileObject.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** tcMissileObject.cpp 14 Sep 2004 02:01:47 -0000 1.17 --- tcMissileObject.cpp 2 Nov 2004 04:23:57 -0000 1.18 *************** *** 21,24 **** --- 21,25 ---- */ + #include "stdwx.h" #include "tcMissileObject.h" #include "common/tcStream.h" *************** *** 31,34 **** --- 32,39 ---- #include "tc3DPoint.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + /** * Load state from update stream Index: tcSensorMap.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSensorMap.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcSensorMap.cpp 1 Nov 2004 03:17:18 -0000 1.11 --- tcSensorMap.cpp 2 Nov 2004 04:23:57 -0000 1.12 *************** *** 18,24 **** */ - #ifdef WX_PRECOMP #include "stdwx.h" - #endif #include "tcSensorMap.h" --- 18,22 ---- *************** *** 29,32 **** --- 27,34 ---- #include "common/tcObjStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace Sensor; Index: tcMenu.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMenu.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcMenu.cpp 1 Nov 2004 03:17:18 -0000 1.8 --- tcMenu.cpp 2 Nov 2004 04:23:57 -0000 1.9 *************** *** 30,33 **** --- 30,36 ---- #include <osg/Geometry> + #ifdef _DEBUG + #define new DEBUG_NEW + #endif using namespace std; Index: tcCommandObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcCommandObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcCommandObject.cpp 24 May 2004 00:14:47 -0000 1.1 --- tcCommandObject.cpp 2 Nov 2004 04:23:56 -0000 1.2 *************** *** 30,33 **** --- 30,37 ---- #include "common/tcObjStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + bool tcCommandObject::clientMode = false; Index: tcLaunchRequest.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcLaunchRequest.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcLaunchRequest.cpp 8 Aug 2004 00:31:35 -0000 1.2 --- tcLaunchRequest.cpp 2 Nov 2004 04:23:56 -0000 1.3 *************** *** 18,23 **** --- 18,28 ---- */ + #include "stdwx.h" #include "tcLaunchRequest.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + tcLaunchRequest& tcLaunchRequest::operator= (tcLaunchRequest& lr) { Index: tcESMSensor.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcESMSensor.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcESMSensor.cpp 14 Sep 2004 02:01:47 -0000 1.7 --- tcESMSensor.cpp 2 Nov 2004 04:23:56 -0000 1.8 *************** *** 18,21 **** --- 18,23 ---- */ + #include "stdwx.h" + #include "tcESMSensor.h" #include "aerror.h" *************** *** 25,28 **** --- 27,34 ---- #include "common/tcStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + /** * Index: tcObjectControl.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcObjectControl.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** tcObjectControl.cpp 14 Sep 2004 02:01:47 -0000 1.18 --- tcObjectControl.cpp 2 Nov 2004 04:23:57 -0000 1.19 *************** *** 1,6 **** ! /* ! ** tcObjectControl.cpp ! ** ! ** Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,6 ---- ! /** ! ** @file tcObjectControl.cpp ! */ [...1818 lines suppressed...] { ! if (mpPen != NULL) {delete mpPen;} ! if (mpFont != NULL) {delete mpFont;} ! if (mpFontLarge != NULL) {delete mpFontLarge;} ! if (mpBrush != NULL) {delete mpBrush;} } --- 1619,1631 ---- mpUserInfo = NULL; msOCSymbolList.mnSymbols = 0; + + mpOptions = tcOptions::Get(); + InitControls(); } tcObjectControl::~tcObjectControl() { ! } Index: tcDemTileReader.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcDemTileReader.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcDemTileReader.cpp 24 Jun 2004 01:43:44 -0000 1.1 --- tcDemTileReader.cpp 2 Nov 2004 04:23:56 -0000 1.2 *************** *** 26,29 **** --- 26,33 ---- #include "tcDemTileReader.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + /** * Sets namestring to path + filename of 10 x 10 dem tile for northwest Index: tcTime.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcTime.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcTime.cpp 8 Aug 2004 00:31:35 -0000 1.7 --- tcTime.cpp 2 Nov 2004 04:23:57 -0000 1.8 *************** *** 27,30 **** --- 27,33 ---- #include "tcTime.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif /** Index: tcWeaponObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcWeaponObject.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcWeaponObject.cpp 14 Sep 2004 02:01:47 -0000 1.8 --- tcWeaponObject.cpp 2 Nov 2004 04:23:57 -0000 1.9 *************** *** 19,22 **** --- 19,23 ---- */ + #include "stdwx.h" // precompiled header file #include "tcWeaponObject.h" #include "tcGameObject.h" *************** *** 27,30 **** --- 28,34 ---- #include "common/tcObjStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif /** Index: tcAirfieldObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAirfieldObject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcAirfieldObject.cpp 9 Aug 2004 02:35:16 -0000 1.2 --- tcAirfieldObject.cpp 2 Nov 2004 04:23:56 -0000 1.3 *************** *** 20,23 **** --- 20,29 ---- */ + #include "stdwx.h" // precompiled header file + + #ifndef WX_PRECOMP + #include "wx/wx.h" + #endif + #include "tcAirfieldObject.h" #include "tcFlightOpsObject.h" *************** *** 25,28 **** --- 31,38 ---- #include "tcGenericDBObject.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + void tcAirfieldObject::Clear() { Index: tcAero.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAero.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcAero.cpp 8 Aug 2004 00:31:35 -0000 1.5 --- tcAero.cpp 2 Nov 2004 04:23:56 -0000 1.6 *************** *** 18,21 **** --- 18,26 ---- */ + #include "stdwx.h" // precompiled header file + + #ifndef WX_PRECOMP + #include "wx/wx.h" + #endif #include "tcAero.h" *************** *** 24,27 **** --- 29,36 ---- #include "common/tcStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + namespace Aero { Index: Game.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** Game.cpp 1 Nov 2004 03:17:18 -0000 1.102 --- Game.cpp 2 Nov 2004 04:23:56 -0000 1.103 *************** *** 950,954 **** objectControl->AttachCommandInterface(&mcCommandQueue); objectControl->AttachSimState(simState); - objectControl->AttachOptions(tcOptions::Get()); objectControl->AttachUserInfo(&mcUserInfo); --- 950,953 ---- *************** *** 1050,1053 **** --- 1049,1057 ---- popupControl = 0; + tacticalMap->ClearMapObjects(); + worldMap->ClearMapObjects(); + + briefingConsoleLeft->Clear(); + tcCustomControl::ReleaseGdi(); } Index: tcDirector.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcDirector.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcDirector.cpp 7 Oct 2004 22:01:47 -0000 1.9 --- tcDirector.cpp 2 Nov 2004 04:23:56 -0000 1.10 *************** *** 34,37 **** --- 34,40 ---- #include "wxcommands.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif /** Index: tcDirectorEvent.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcDirectorEvent.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcDirectorEvent.cpp 21 Oct 2004 04:11:00 -0000 1.11 --- tcDirectorEvent.cpp 2 Nov 2004 04:23:56 -0000 1.12 *************** *** 38,41 **** --- 38,45 ---- #include <osg/Vec3> // tc3DTextEvent + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using MapView::tcMapView; *************** *** 90,93 **** --- 94,98 ---- tcMapEvent::~tcMapEvent() { + if (mapObject) delete mapObject; } Index: tcMapData.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMapData.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcMapData.cpp 14 Sep 2004 02:01:47 -0000 1.13 --- tcMapData.cpp 2 Nov 2004 04:23:57 -0000 1.14 *************** *** 20,26 **** */ - #ifdef WX_PRECOMP #include "stdwx.h" - #endif #include "tcMapData.h" --- 20,24 ---- *************** *** 31,34 **** --- 29,36 ---- #include "tcDemTileReader.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + /********************************************************************/ /** Index: tcAIData.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAIData.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcAIData.cpp 8 Aug 2004 00:31:35 -0000 1.6 --- tcAIData.cpp 2 Nov 2004 04:23:56 -0000 1.7 *************** *** 18,26 **** */ - #include "wx/wx.h" - #include "wx/msw/private.h" // for MS Windows specific definitions #include "tcAIData.h" using namespace std; using namespace AI; --- 18,33 ---- */ + #include "stdwx.h" // precompiled header file + + #ifndef WX_PRECOMP + #include "wx/wx.h" + #endif #include "tcAIData.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace std; using namespace AI; Index: tcAeroAirObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAeroAirObject.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcAeroAirObject.cpp 8 Aug 2004 00:31:35 -0000 1.6 --- tcAeroAirObject.cpp 2 Nov 2004 04:23:56 -0000 1.7 *************** *** 31,34 **** --- 31,38 ---- #include "math_constants.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace Database; Index: tcCarrierObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcCarrierObject.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcCarrierObject.cpp 18 Jul 2004 03:18:01 -0000 1.8 --- tcCarrierObject.cpp 2 Nov 2004 04:23:56 -0000 1.9 *************** *** 17,20 **** --- 17,25 ---- ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include "stdwx.h" + + #ifndef WX_PRECOMP + #include "wx/wx.h" + #endif #include "tcCarrierObject.h" *************** *** 24,27 **** --- 29,35 ---- #include "tcFlightOpsObject.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif Index: tcFlightPort.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcFlightPort.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcFlightPort.cpp 14 Sep 2004 02:01:47 -0000 1.11 --- tcFlightPort.cpp 2 Nov 2004 04:23:56 -0000 1.12 *************** *** 24,30 **** #ifndef WX_PRECOMP #include "wx/wx.h" - #ifdef WIN32 - #include "wx/msw/private.h" // for MS Windows specific definitions - #endif #endif --- 24,27 ---- *************** *** 36,39 **** --- 33,39 ---- #include "tcGenericDBObject.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif //---------------------------------------------------------------------------- *************** *** 580,582 **** --- 580,583 ---- tcFlightPort::~tcFlightPort() { + Clear(); } \ No newline at end of file Index: tcHeloObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcHeloObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcHeloObject.cpp 9 Aug 2004 02:35:17 -0000 1.1 --- tcHeloObject.cpp 2 Nov 2004 04:23:56 -0000 1.2 *************** *** 29,33 **** #include "tcGenericDBObject.h" ! void tcHeloObject::Clear() --- 29,35 ---- #include "tcGenericDBObject.h" ! #ifdef _DEBUG ! #define new DEBUG_NEW ! #endif void tcHeloObject::Clear() Index: tcGuidanceState.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGuidanceState.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcGuidanceState.cpp 8 Aug 2004 00:31:35 -0000 1.3 --- tcGuidanceState.cpp 2 Nov 2004 04:23:56 -0000 1.4 *************** *** 18,24 **** --- 18,30 ---- */ + #include "stdwx.h" // precompiled header file + #include "tcGuidanceState.h" #include "common/tcStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + /** * Index: tcAirObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAirObject.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcAirObject.cpp 9 Aug 2004 02:35:16 -0000 1.11 --- tcAirObject.cpp 2 Nov 2004 04:23:56 -0000 1.12 *************** *** 30,33 **** --- 30,37 ---- #include "common/tcObjStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + /******************************************************************************/ /****************************** tcAirObject *******************************/ Index: tcEngagementData.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcEngagementData.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcEngagementData.cpp 8 Aug 2004 00:31:35 -0000 1.2 --- tcEngagementData.cpp 2 Nov 2004 04:23:56 -0000 1.3 *************** *** 21,24 **** --- 21,28 ---- #include "tcEngagementData.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + tcEngagementData::tcEngagementData() { Index: tcLauncher.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcLauncher.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcLauncher.cpp 5 Aug 2004 02:22:35 -0000 1.4 --- tcLauncher.cpp 2 Nov 2004 04:23:56 -0000 1.5 *************** *** 19,22 **** --- 19,23 ---- */ + #include "stdwx.h" // precompiled header file #include "tcLauncher.h" #include "tcDatabase.h" *************** *** 29,32 **** --- 30,37 ---- #include "common/tcObjStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + /** * Index: tcGoal.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGoal.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcGoal.cpp 5 Sep 2004 02:38:45 -0000 1.5 --- tcGoal.cpp 2 Nov 2004 04:23:56 -0000 1.6 *************** *** 36,39 **** --- 36,42 ---- using namespace boost::python; + #ifdef _DEBUG + #define new DEBUG_NEW + #endif /** * Not sure how to best package this. Index: tcPlatformObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcPlatformObject.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** tcPlatformObject.cpp 6 Sep 2004 01:08:04 -0000 1.29 --- tcPlatformObject.cpp 2 Nov 2004 04:23:57 -0000 1.30 *************** *** 37,40 **** --- 37,44 ---- #include "common/tcObjStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace AI; Index: tcGameObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGameObject.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** tcGameObject.cpp 14 Sep 2004 02:01:47 -0000 1.22 --- tcGameObject.cpp 2 Nov 2004 04:23:56 -0000 1.23 *************** *** 32,35 **** --- 32,38 ---- #include "common/tcObjStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif /** Index: tcBallisticWeapon.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcBallisticWeapon.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcBallisticWeapon.cpp 12 Aug 2004 01:14:28 -0000 1.5 --- tcBallisticWeapon.cpp 2 Nov 2004 04:23:56 -0000 1.6 *************** *** 21,24 **** --- 21,30 ---- */ + #include "stdwx.h" + + #ifndef WX_PRECOMP + #include "wx/wx.h" + #endif + #include "tcBallisticWeapon.h" #include "tcBallisticDBObject.h" *************** *** 32,35 **** --- 38,45 ---- #include "tc3DPoint.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + /** * Load state from update stream Index: tcSimState.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSimState.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** tcSimState.cpp 14 Sep 2004 02:01:47 -0000 1.54 --- tcSimState.cpp 2 Nov 2004 04:23:57 -0000 1.55 *************** *** 50,53 **** --- 50,57 ---- #include "common/tcStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + using namespace Database; using namespace Aero; Index: tcFlightOpsObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcFlightOpsObject.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcFlightOpsObject.cpp 14 Sep 2004 02:01:47 -0000 1.4 --- tcFlightOpsObject.cpp 2 Nov 2004 04:23:56 -0000 1.5 *************** *** 21,24 **** --- 21,25 ---- */ + #include "stdwx.h" #include "tcFlightOpsObject.h" *************** *** 30,33 **** --- 31,39 ---- #include "tcFlightportDBObject.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + + Database::tcDatabase* tcFlightOpsObject::database = 0; Index: tcSensorState.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSensorState.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcSensorState.cpp 8 Aug 2004 00:31:35 -0000 1.10 --- tcSensorState.cpp 2 Nov 2004 04:23:57 -0000 1.11 *************** *** 18,21 **** --- 18,22 ---- */ + #include "stdwx.h" #include "tcSensorState.h" #include "aerror.h" *************** *** 24,27 **** --- 25,32 ---- #include "common/tcObjStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + tcSimState* tcSensorState::simState = NULL; Index: tcSurfaceObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSurfaceObject.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tcSurfaceObject.cpp 8 Aug 2004 00:31:35 -0000 1.12 --- tcSurfaceObject.cpp 2 Nov 2004 04:23:57 -0000 1.13 *************** *** 31,34 **** --- 31,37 ---- #include "tc3DModel.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif /******************************************************************************/ Index: tcLauncherState.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcLauncherState.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** tcLauncherState.cpp 1 Nov 2004 03:17:18 -0000 1.19 --- tcLauncherState.cpp 2 Nov 2004 04:23:56 -0000 1.20 *************** *** 20,23 **** --- 20,24 ---- */ + #include "stdwx.h" #include "tcLauncherState.h" #include "tcLauncher.h" *************** *** 33,36 **** --- 34,41 ---- #include "Game.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + tcDatabase* tcLauncherState::mpDatabase = NULL; tcSimState* tcLauncherState::simState = NULL; Index: tcRadar.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcRadar.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcRadar.cpp 1 Nov 2004 03:17:18 -0000 1.13 --- tcRadar.cpp 2 Nov 2004 04:23:57 -0000 1.14 *************** *** 18,21 **** --- 18,22 ---- */ + #include "stdwx.h" #include "aerror.h" #include "nsNav.h" *************** *** 34,37 **** --- 35,42 ---- #include "common/tcObjStream.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + // break up this file later Index: tcGameObjIterator.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGameObjIterator.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcGameObjIterator.cpp 8 Aug 2004 00:31:35 -0000 1.4 --- tcGameObjIterator.cpp 2 Nov 2004 04:23:56 -0000 1.5 *************** *** 32,35 **** --- 32,39 ---- #include "tcSimState.h" + #ifdef _DEBUG + #define new DEBUG_NEW + #endif + tcSimState* tcGameObjIterator::simState = NULL; |
