From: Tom H. <tom...@us...> - 2004-07-08 02:16:21
|
Update of /cvsroot/rccparser/rccserializer/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12868/src Modified Files: Makefile.am rcccoachserializer.cpp rcccoachserializer.hpp rccofflinecoachserializer.cpp rccofflinecoachserializer.hpp rcconlinecoachserializer.cpp rcconlinecoachserializer.hpp rccplayerserializer.cpp rccplayerserializer.hpp rccserializer.cpp rccserializer.hpp Log Message: 2003-10-02 Tom Howard <tom...@us...> * ./src/rccofflinecoachserializer.cpp Added patch from oliver, which fixed bug in offline coach's init Index: Makefile.am =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- Makefile.am 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 25,33 **** rcconlinecoachserializer.cpp ! librccserializer_la_LDFLAGS = -version-info 0:0:0 ! librccplayerserializer_la_LDFLAGS = -version-info 0:0:0 ! librcccoachserializer_la_LDFLAGS = -version-info 0:0:0 ! librccofflinecoachserializer_la_LDFLAGS = -version-info 0:0:0 ! librcconlinecoachserializer_la_LDFLAGS = -version-info 0:0:0 # 1. Start with version information of `0:0:0' for each libtool library. # --- 25,33 ---- rcconlinecoachserializer.cpp ! librccserializer_la_LDFLAGS = -version-info 1:0:1 ! librccplayerserializer_la_LDFLAGS = -version-info 1:0:1 ! librcccoachserializer_la_LDFLAGS = -version-info 1:0:1 ! librccofflinecoachserializer_la_LDFLAGS = -version-info 1:0:1 ! librcconlinecoachserializer_la_LDFLAGS = -version-info 1:0:1 # 1. Start with version information of `0:0:0' for each libtool library. # Index: rcccoachserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rcccoachserializer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rcccoachserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2 --- rcccoachserializer.cpp 8 Jul 2004 02:16:12 -0000 1.3 *************** *** 29,32 **** --- 29,36 ---- namespace rcc { + CoachSerializer::CoachSerializer() + : Serializer() + {} + CoachSerializer::CoachSerializer( std::ostream& o ) : Serializer( o ) Index: rcccoachserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rcccoachserializer.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rcccoachserializer.hpp 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- rcccoachserializer.hpp 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- { public: + CoachSerializer(); CoachSerializer( std::ostream& o ); Index: rccofflinecoachserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccofflinecoachserializer.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rccofflinecoachserializer.cpp 1 Oct 2003 23:01:33 -0000 1.3 --- rccofflinecoachserializer.cpp 8 Jul 2004 02:16:12 -0000 1.4 *************** *** 29,32 **** --- 29,36 ---- namespace rcc { + OfflineCoachSerializer::OfflineCoachSerializer() + : CoachSerializer() + {} + OfflineCoachSerializer::OfflineCoachSerializer( std::ostream& o ) : CoachSerializer( o ) Index: rccofflinecoachserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccofflinecoachserializer.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rccofflinecoachserializer.hpp 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- rccofflinecoachserializer.hpp 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- { public: + OfflineCoachSerializer(); OfflineCoachSerializer( std::ostream& o ); Index: rcconlinecoachserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rcconlinecoachserializer.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rcconlinecoachserializer.cpp 1 Oct 2003 01:56:14 -0000 1.3 --- rcconlinecoachserializer.cpp 8 Jul 2004 02:16:12 -0000 1.4 *************** *** 31,38 **** #endif namespace rcc { OnlineCoachSerializer::OnlineCoachSerializer( std::ostream& o ) ! : CoachSerializer( o ) {} --- 31,46 ---- #endif + #ifdef HAVE_LIBRCSSCLANGPARSER + #include <rcssserver/clangmsg.h> + #endif + namespace rcc { + OnlineCoachSerializer::OnlineCoachSerializer() + : CoachSerializer() + {} + OnlineCoachSerializer::OnlineCoachSerializer( std::ostream& o ) ! : CoachSerializer( o ) {} *************** *** 48,51 **** --- 56,67 ---- void + sayClang( const rcss::clang::Msg& msg ) + { + #ifdef HAVE_LIBRCSSCLANGPARSER + output() << "(say " << msg << ")" << std::ends << std::flush; + #endif + } + + void OnlineCoachSerializer::changePlayerType( UNumType unum, unsigned int type ) { Index: rcconlinecoachserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rcconlinecoachserializer.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rcconlinecoachserializer.hpp 1 Oct 2003 01:56:14 -0000 1.2 --- rcconlinecoachserializer.hpp 8 Jul 2004 02:16:12 -0000 1.3 *************** *** 22,33 **** #define RCCONLINECOACHSERIALIZER_HPP - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif #include "rcccoachserializer.hpp" - #ifdef HAVE_LIBRCSSCLANGPARSER - #include <rcssserver/clangmsg.h> namespace rcss { --- 22,28 ---- *************** *** 37,41 **** } } - #endif namespace rcc --- 32,35 ---- *************** *** 45,48 **** --- 39,43 ---- { public: + OnlineCoachSerializer(); OnlineCoachSerializer( std::ostream& o ); *************** *** 52,62 **** init( const std::string& team_name, int version ); ! #ifdef HAVE_LIBRCSSCLANGPARSER void sayClang( const rcss::clang::Msg& msg ); ! { ! output() << "(say " << msg << ")" << std::ends << std::flush; ! } ! #endif void --- 47,60 ---- init( const std::string& team_name, int version ); ! /* depracated */ void sayClang( const rcss::clang::Msg& msg ); ! ! template< typename CLANG_MSG > ! void ! sayClang( const CLANG_MSG& msg ) ! { ! output() << "(say " << msg << ")" << std::ends << std::flush; ! } void Index: rccplayerserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccplayerserializer.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rccplayerserializer.cpp 1 Oct 2003 01:56:14 -0000 1.3 --- rccplayerserializer.cpp 8 Jul 2004 02:16:12 -0000 1.4 *************** *** 29,32 **** --- 29,36 ---- namespace rcc { + PlayerSerializer::PlayerSerializer() + : Serializer() + {} + PlayerSerializer::PlayerSerializer( std::ostream& o ) : Serializer( o ) Index: rccplayerserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccplayerserializer.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rccplayerserializer.hpp 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- rccplayerserializer.hpp 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- { public: + PlayerSerializer(); PlayerSerializer( std::ostream& o ); Index: rccserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccserializer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rccserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2 --- rccserializer.cpp 8 Jul 2004 02:16:12 -0000 1.3 *************** *** 125,130 **** } Serializer::Serializer( std::ostream& o ) ! : m_strm( o ) {} --- 125,134 ---- } + Serializer::Serializer() + : m_strm( NULL ) + {} + Serializer::Serializer( std::ostream& o ) ! : m_strm( &o ) {} *************** *** 132,138 **** {} std::ostream& Serializer::output() ! { return m_strm; } void --- 136,146 ---- {} + void + Serializer::setOutput( std::ostream& o ) + { m_strm = &o; } + std::ostream& Serializer::output() ! { return *m_strm; } void Index: rccserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccserializer.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rccserializer.hpp 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- rccserializer.hpp 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 141,148 **** --- 141,153 ---- operator<<( std::ostream& o, PlayModeType on_off ); + Serializer(); + Serializer( std::ostream& o ); ~Serializer(); + void + setOutput( std::ostream& o ); + std::ostream& output(); *************** *** 161,165 **** private: ! std::ostream& m_strm; }; } --- 166,170 ---- private: ! std::ostream* m_strm; }; } |