Menu
▾
▴
[Csp-commits] svn:csp r1411 - in trunk/CSP/CSPSim: . Include Source VisualStudio/CSPSimAppli VisualStudio/CSPSimDLL
|
From: <sv...@ww...> - 2004-12-18 11:48:20
|
Author: mkrose Date: 2004-12-18 03:48:11 -0800 (Sat, 18 Dec 2004) New Revision: 1411 Removed: trunk/CSP/CSPSim/Include/Message.h trunk/CSP/CSPSim/Source/Message.cpp Modified: trunk/CSP/CSPSim/CHANGES.current trunk/CSP/CSPSim/SConscript trunk/CSP/CSPSim/Source/Makefile.in trunk/CSP/CSPSim/Source/SConscript trunk/CSP/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj Log: Cleanup old Message files. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1411 Modified: trunk/CSP/CSPSim/CHANGES.current =================================================================== --- trunk/CSP/CSPSim/CHANGES.current 2004-12-18 11:39:57 UTC (rev 1410) +++ trunk/CSP/CSPSim/CHANGES.current 2004-12-18 11:48:11 UTC (rev 1411) @@ -14,6 +14,8 @@ * Hack upon hack to prevent engine cutoff when stationary in a light tailwind (AOA near 180 deg). + * Cleanup old Message files. + 2004-12-18: delta * Until we make a more accurate FCS, we'll use the animation binding to provide a better visual approximation of the animations of the "ailerons" Deleted: trunk/CSP/CSPSim/Include/Message.h =================================================================== --- trunk/CSP/CSPSim/Include/Message.h 2004-12-18 11:39:57 UTC (rev 1410) +++ trunk/CSP/CSPSim/Include/Message.h 2004-12-18 11:48:11 UTC (rev 1411) @@ -1,80 +0,0 @@ -// Combat Simulator Project - FlightSim Demo -// Copyright (C) 2002 The Combat Simulator Project -// http://csp.sourceforge.net -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program 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 this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -/** - * @file Message.h - * - **/ - -#ifndef __MESSAGE_H__ -#define __MESSAGE_H__ - - -#define COLLISION_MESSAGE 1 -#define SET_ALTITUDE_MESSAGE 2 -#define LOOK_FOR_ENEMIES_MESSAGE 10 -#define WEAPON_READY_MESSAGE 11 - -#define CHECK_GAME_STATUS_MESSAGE 100 -#define GENERATE_NEW_ENEMY_PLANES_MESSAGE 101 - - - -/** - * class Message - * - * @author unknown - */ -class Message -{ - - public: - - Message(); - virtual ~Message(); - Message(const Message &); - Message & operator=(const Message &); - - bool operator<(const Message & rhs) const; - bool operator>(const Message & rhs) const; - bool operator==(const Message &rhs) const; - - void dump(); - - unsigned int type; - unsigned int senderID; - unsigned int receiverID; - float sentTime; - float receiveTime; - int data; -}; - - -/** - * class messageComparison - * - * @author unknown - */ -struct messageComparison { - bool operator () (Message * left, Message * right) const - { return left->receiveTime > right->receiveTime; } -}; - -#endif // __MESSAGE_H__ - Modified: trunk/CSP/CSPSim/SConscript =================================================================== --- trunk/CSP/CSPSim/SConscript 2004-12-18 11:39:57 UTC (rev 1410) +++ trunk/CSP/CSPSim/SConscript 2004-12-18 11:48:11 UTC (rev 1411) @@ -69,4 +69,3 @@ build.BuildModules(env, MODULES) - Modified: trunk/CSP/CSPSim/Source/Makefile.in =================================================================== --- trunk/CSP/CSPSim/Source/Makefile.in 2004-12-18 11:39:57 UTC (rev 1410) +++ trunk/CSP/CSPSim/Source/Makefile.in 2004-12-18 11:48:11 UTC (rev 1411) @@ -55,7 +55,6 @@ BaseDynamics.cpp \ BaseScreen.cpp \ ChunkLodTerrain.cpp \ - ClientNode.cpp \ Collision.cpp \ Colorspace.cpp \ Config.cpp \ @@ -63,10 +62,8 @@ ConsoleCommands.cpp \ CSPSim.cpp \ DemeterTerrain.cpp \ - DispatchCenter.cpp \ DynamicObject.cpp \ DynamicalSystem.cpp \ - EchoServerNode.cpp \ Engine.cpp \ EventMapIndex.cpp \ EventMapping.cpp \ @@ -81,19 +78,9 @@ LandingGear.cpp \ LogoScreen.cpp \ MenuScreen.cpp \ - Message.cpp \ - SimNet/NetworkNode.cpp \ - SimNet/NetworkMessage.cpp \ - SimNet/ObjectUpdateMessage.cpp \ - SimNet/NetworkMessenger.cpp \ - SimNet/PrintMessageHandler.cpp \ - SimNet/RedirectMessageHandler.cpp \ - SimNet/EchoMessageHandler.cpp \ - SimNet/DispatchMessageHandler.cpp \ NumericalMethod.cpp \ ObjectModel.cpp \ PhysicsModel.cpp \ - RedirectServerNode.cpp \ ScreenInfo.cpp \ ScreenInfoManager.cpp \ SimpleSceneManager.cpp \ Deleted: trunk/CSP/CSPSim/Source/Message.cpp =================================================================== --- trunk/CSP/CSPSim/Source/Message.cpp 2004-12-18 11:39:57 UTC (rev 1410) +++ trunk/CSP/CSPSim/Source/Message.cpp 2004-12-18 11:48:11 UTC (rev 1411) @@ -1,90 +0,0 @@ -// Combat Simulator Project - FlightSim Demo -// Copyright (C) 2002 The Combat Simulator Project -// http://csp.sourceforge.net -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program 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 this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -/** - * @file Message.cpp - * - **/ - - -#include "Message.h" -#include <SimCore/Util/Log.h> - - -Message::Message() -{ - -} - -Message::~Message() -{ - -} - -Message::Message(const Message & message) -{ - type = message.type; - senderID = message.senderID; - receiverID = message.receiverID; - sentTime = message.sentTime; - receiveTime = message.receiveTime; - data = message.data; -} - -Message & Message::operator=(const Message & message) -{ - type = message.type; - senderID = message.senderID; - receiverID = message.receiverID; - sentTime = message.sentTime; - receiveTime = message.receiveTime; - data = message.data; - return *this; -} - -void Message::dump() -{ - CSP_LOG(APP, INFO, "Message) Type: " << type - << ", SenderID: " << senderID - << ", receiverID: " << receiverID - << ", sentTime: " << sentTime - << ", receiveTime: " << receiveTime );; - -} - -bool Message::operator<(const Message & rhs) const -{ - if ( receiveTime < rhs.receiveTime) - return true; - return false; - -} - -bool Message::operator>(const Message &rhs) const -{ - if (receiveTime > rhs.receiveTime) - return true; - return false; -} - -bool Message::operator==(const Message &rhs) const -{ - return (receiveTime == rhs.receiveTime); -} - Modified: trunk/CSP/CSPSim/Source/SConscript =================================================================== --- trunk/CSP/CSPSim/Source/SConscript 2004-12-18 11:39:57 UTC (rev 1410) +++ trunk/CSP/CSPSim/Source/SConscript 2004-12-18 11:48:11 UTC (rev 1411) @@ -54,7 +54,6 @@ 'LandingGear.cpp', 'LogoScreen.cpp', 'MenuScreen.cpp', - 'Message.cpp', 'NumericalMethod.cpp', 'ObjectModel.cpp', 'PhysicsModel.cpp', Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj =================================================================== --- trunk/CSP/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj 2004-12-18 11:39:57 UTC (rev 1410) +++ trunk/CSP/CSPSim/VisualStudio/CSPSimAppli/CSPSimAppli.vcproj 2004-12-18 11:48:11 UTC (rev 1411) @@ -261,9 +261,6 @@ RelativePath="..\..\Source\MenuScreen.cpp"> </File> <File - RelativePath="..\..\Source\Message.cpp"> - </File> - <File RelativePath="..\..\Source\NumericalMethod.cpp"> </File> <File @@ -458,9 +455,6 @@ RelativePath="..\..\Include\MenuScreen.h"> </File> <File - RelativePath="..\..\Include\Message.h"> - </File> - <File RelativePath="..\..\Include\NumericalMethod.h"> </File> <File Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj =================================================================== --- trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2004-12-18 11:39:57 UTC (rev 1410) +++ trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj 2004-12-18 11:48:11 UTC (rev 1411) @@ -285,9 +285,6 @@ RelativePath="..\..\Source\MenuScreen.cpp"> </File> <File - RelativePath="..\..\Source\Message.cpp"> - </File> - <File RelativePath="..\..\Source\NumericalMethod.cpp"> </File> <File @@ -524,9 +521,6 @@ RelativePath="..\..\Include\MenuScreen.h"> </File> <File - RelativePath="..\..\Include\Message.h"> - </File> - <File RelativePath="..\..\Include\NumericalMethod.h"> </File> <File |
