[Gcblue-commits] gcb_wx/include/sim tcCommandObject.h,1.2,1.3 tcLauncher.h,1.13,1.14 tcPlatformObjec
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-05-05 02:14:30
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv722/include/sim Modified Files: tcCommandObject.h tcLauncher.h tcPlatformObject.h tcSensorMap.h tcSimState.h Log Message: Index: tcLauncher.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcLauncher.h 29 Mar 2005 00:12:24 -0000 1.13 --- tcLauncher.h 5 May 2005 02:14:19 -0000 1.14 *************** *** 121,125 **** int GetErrorCode() const {return errorCode;} int GetLauncherStatus(); - int GetLauncherStatus() const; float GetSectorCenter() const; ///< returns center of engagement sector in radians float GetSectorWidth() const; ///< returns width of engagement sector in radians --- 121,124 ---- *************** *** 131,134 **** --- 130,134 ---- void SetChildQuantity(unsigned int quantity); void SetDamaged(bool state); + void SetLaunch(unsigned int quantity); void SetLoadState(bool state); void SetParent(tcGameObject *obj); *************** *** 137,141 **** bool IsItemCompatible(const std::string& item) const; ! static std::string TranslateStatus(int status); tcLauncher(); --- 137,144 ---- bool IsItemCompatible(const std::string& item) const; ! unsigned char GetStatus() const; ! void UpdateStatus(); ! ! static std::string TranslateStatus(int statusCode); tcLauncher(); *************** *** 145,148 **** --- 148,152 ---- tcGameObject* parent; bool isDamaged; + unsigned char status; static tcSimState* simState; Index: tcSimState.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** tcSimState.h 29 Apr 2005 18:52:02 -0000 1.38 --- tcSimState.h 5 May 2005 02:14:20 -0000 1.39 *************** *** 2,6 **** ** @file tcSimState.h */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** @file tcSimState.h */ ! /* Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 179,182 **** --- 179,183 ---- bool IsMultiplayerActive() const; bool IsMultiplayerClient() const; + bool IsMultiplayerServer() const; void SetScenarioDescription(std::string s); *************** *** 214,217 **** --- 215,219 ---- bool IsDetectedESM(tcESMSensor* apESM, const tcRadar* apEmitterRadar, float& rfAz_rad); void PerformAutoEngage(tcGameObject* apGameObj, double afTime); + void PlayEntitySoundEffect(tcGameObject* obj, const std::string& effect); void ProcessRadarDetection(tcGameObject *apRadarPlat,tcGameObject *apTarget, tcRadar *apRadarSS); Index: tcSensorMap.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorMap.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tcSensorMap.h 5 Mar 2005 22:37:51 -0000 1.12 --- tcSensorMap.h 5 May 2005 02:14:20 -0000 1.13 *************** *** 184,188 **** static bool autoKillAssess; ///< set to true to automatically mark destroyed tracks enum {TRACK_STALE = 1, TRACK_DESTROYED = 2}; ! unsigned int sensorFlags; ///< 1 - stale, 2 - destroyed void KillAssess(); --- 184,188 ---- static bool autoKillAssess; ///< set to true to automatically mark destroyed tracks enum {TRACK_STALE = 1, TRACK_DESTROYED = 2}; ! unsigned char sensorFlags; ///< 1 - stale, 2 - destroyed void KillAssess(); Index: tcCommandObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCommandObject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcCommandObject.h 17 Apr 2005 22:35:00 -0000 1.2 --- tcCommandObject.h 5 May 2005 02:14:19 -0000 1.3 *************** *** 42,46 **** void LoadCommandParam(tcCommandStream& stream, float& param, int flag); void LoadCommandParam(tcCommandStream& stream, int& param, int flag); - void LoadCommandParam(tcCommandStream& stream, tcLauncher& param, int flag); void SetNewCommand(int flag); --- 42,45 ---- Index: tcPlatformObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** tcPlatformObject.h 29 Apr 2005 18:52:02 -0000 1.27 --- tcPlatformObject.h 5 May 2005 02:14:20 -0000 1.28 *************** *** 77,81 **** UPDATE_LAUNCHERS = 0x02, UPDATE_SENSORS = 0x04, ! UPDATE_TASKS = 0x08 }; --- 77,81 ---- UPDATE_LAUNCHERS = 0x02, UPDATE_SENSORS = 0x04, ! UPDATE_AI = 0x08 }; |