OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

Clean up plAvatarMsg a bit

Michael Hansen 11 years ago
parent
862a05cbd5
commit
29e311c91d
2 changed files with 17 additions and 138 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 122
      Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp
  2. 33
      Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h

122
Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp
Unescape View File

@ -55,34 +55,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
//////////////
// PLAVATARMSG
//////////////
// CTOR()
plAvatarMsg::plAvatarMsg()
: plMessage()
{
}
// CTOR(sender, receiver, time)
plAvatarMsg::plAvatarMsg(const plKey &sender, const plKey &receiver)
: plMessage(sender, receiver, nil)
{
}
// READ
void plAvatarMsg::Read(hsStream *stream, hsResMgr *mgr)
{
plMessage::IMsgRead(stream, mgr);
}
// WRITE
void plAvatarMsg::Write(hsStream *stream, hsResMgr *mgr)
{
plMessage::IMsgWrite(stream, mgr);
}
//////////////////////
// PLARMATUREUPDATEMSG
//////////////////////
@ -119,23 +91,6 @@ void plArmatureUpdateMsg::Write(hsStream *stream, hsResMgr *mgr)
hsAssert(false, "This message is not supposed to travel over the network or persist in a file.");
}
// ISLOCAL
bool plArmatureUpdateMsg::IsLocal() const
{
return fIsLocal;
}
// ISPLAYERCONTROLLED
bool plArmatureUpdateMsg::IsPlayerControlled() const
{
return fIsPlayerControlled;
}
bool plArmatureUpdateMsg::IsInvis() const
{
return fIsInvis;
}
/////////////////////
// PLAVATARSETTYPEMSG
/////////////////////
@ -164,18 +119,6 @@ void plAvatarSetTypeMsg::Write(hsStream *stream, hsResMgr *mgr)
stream->WriteBool(fIsPlayer);
}
// SETISPLAYER
void plAvatarSetTypeMsg::SetIsPlayer(bool is)
{
fIsPlayer = is;
}
// ISPLAYER
bool plAvatarSetTypeMsg::IsPlayer()
{
return fIsPlayer;
}
//////////////
@ -198,11 +141,6 @@ plAvTaskMsg::plAvTaskMsg(const plKey &sender, const plKey &receiver, plAvTask *t
{
}
plAvTask *plAvTaskMsg::GetTask()
{
return fTask;
}
// READ
void plAvTaskMsg::Read(hsStream *stream, hsResMgr *mgr)
{
@ -562,11 +500,6 @@ plAvPushBrainMsg::plAvPushBrainMsg(const plKey& sender, const plKey &receiver, p
fBrain = brain;
}
// dtor
plAvPushBrainMsg::~plAvPushBrainMsg()
{
}
// READ
void plAvPushBrainMsg::Read(hsStream *stream, hsResMgr *mgr)
{
@ -583,62 +516,9 @@ void plAvPushBrainMsg::Write(hsStream *stream, hsResMgr *mgr)
mgr->WriteCreatable(stream, fBrain);
}
//////////////////
//
// PLAVPOPBRAINMSG
//
//////////////////
// default ctor
plAvPopBrainMsg::plAvPopBrainMsg()
{
}
// canonical ctor
plAvPopBrainMsg::plAvPopBrainMsg(const plKey &sender, const plKey &receiver)
: plAvTaskMsg(sender, receiver)
{
}
#endif // SERVER
/////////////////
////
//// PLAVEMOTEMSG
////
/////////////////
//
//// default ctor
//plAvEmoteMsg::plAvEmoteMsg()
//: fAnimName(nil)
//{
//}
//
//// canonical ctor
//plAvEmoteMsg::plAvEmoteMsg(plKey sender, plKey receiver, char *name)
//: plAvTaskMsg(sender, receiver)
//{
// fAnimName = hsStrcpy(name);
//}
//
//// READ
//void plAvEmoteMsg::Read(hsStream *stream, hsResMgr *mgr)
//{
// plAvTaskMsg::Read(stream, mgr);
// fAnimName = stream->ReadSafeString();
//}
//
//// WRITE
//void plAvEmoteMsg::Write(hsStream *stream, hsResMgr *mgr)
//{
// plAvTaskMsg::Write(stream, mgr);
// stream->WriteSafeString(fAnimName);
///////////////////////////
//
@ -651,8 +531,6 @@ plAvatarStealthModeMsg::plAvatarStealthModeMsg() : plAvatarMsg(), fMode(kStealth
SetBCastFlag(plMessage::kBCastByExactType);
}
plAvatarStealthModeMsg::~plAvatarStealthModeMsg() {}
// READ stream mgr
void plAvatarStealthModeMsg::Read(hsStream *stream, hsResMgr *mgr)
{

33
Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h
Unescape View File

@ -64,15 +64,17 @@ class plAvatarMsg : public plMessage
{
public:
// tors
plAvatarMsg();
plAvatarMsg(const plKey &sender, const plKey &receiver);
plAvatarMsg() : plMessage() { }
plAvatarMsg(const plKey &sender, const plKey &receiver)
: plMessage(sender, receiver, nil) { }
// plasma protocol
CLASSNAME_REGISTER( plAvatarMsg );
GETINTERFACE_ANY( plAvatarMsg, plMessage );
virtual void Read(hsStream *stream, hsResMgr *mgr);
virtual void Write(hsStream *stream, hsResMgr *mgr);
virtual void Read(hsStream *stream, hsResMgr *mgr) { plMessage::IMsgRead(stream, mgr); }
virtual void Write(hsStream *stream, hsResMgr *mgr) { plMessage::IMsgWrite(stream, mgr); }
};
@ -90,13 +92,13 @@ public:
plArmatureMod *armature);
/** The avatar that sent this message is the local avatar for this client. */
bool IsLocal() const;
bool IsLocal() const { return fIsLocal; }
void SetIsLocal(bool on) { fIsLocal = on; }
/** The avatar that sent this message is controlled by a human being -- although
not necessarily a local human being. */
bool IsPlayerControlled() const;
bool IsPlayerControlled() const { return fIsPlayerControlled; }
void SetIsPlayerControlled(bool on) { fIsPlayerControlled = on; }
bool IsInvis() const;
bool IsInvis() const { return fIsInvis; }
void SetInvis(bool val) { fIsInvis = val; }
// plasma protocol
@ -108,7 +110,7 @@ public:
plArmatureMod * fArmature; // the armature that sent this message
// valid during the message's lifetime
protected:
// these will probably change to enums + bitmasks .. don't count on the representation
bool fIsLocal;
@ -124,8 +126,8 @@ public:
plAvatarSetTypeMsg(const plKey &sender, const plKey &receiver);
// theoretically we will someday achieve a broader taxonomy
void SetIsPlayer(bool is);
bool IsPlayer();
void SetIsPlayer(bool is) { fIsPlayer = is; }
bool IsPlayer() const { return fIsPlayer; }
CLASSNAME_REGISTER(plAvatarSetTypeMsg);
GETINTERFACE_ANY(plAvatarSetTypeMsg, plAvatarMsg);
@ -151,7 +153,7 @@ public:
plAvTaskMsg(const plKey &sender, const plKey &receiver);
plAvTaskMsg(const plKey &sender, const plKey &receiver, plAvTask *task);
plAvTask *GetTask();
plAvTask *GetTask() const { return fTask; }
// plasma protocol
CLASSNAME_REGISTER( plAvTaskMsg );
@ -344,7 +346,6 @@ public:
// tors
plAvPushBrainMsg();
plAvPushBrainMsg(const plKey& sender, const plKey &receiver, plArmatureBrain *brain);
~plAvPushBrainMsg();
CLASSNAME_REGISTER( plAvPushBrainMsg );
GETINTERFACE_ANY( plAvPushBrainMsg, plAvTaskMsg);
@ -364,8 +365,9 @@ class plAvPopBrainMsg : public plAvTaskMsg
{
public:
// tors
plAvPopBrainMsg();
plAvPopBrainMsg(const plKey &sender, const plKey &receiver);
plAvPopBrainMsg() { }
plAvPopBrainMsg(const plKey &sender, const plKey &receiver)
: plAvTaskMsg(sender, receiver) { }
CLASSNAME_REGISTER( plAvPopBrainMsg );
GETINTERFACE_ANY( plAvPopBrainMsg, plAvTaskMsg);
@ -379,7 +381,6 @@ class plAvatarStealthModeMsg : public plAvatarMsg
{
public:
plAvatarStealthModeMsg();
~plAvatarStealthModeMsg();
// modes
enum

Write Preview
Loading…
Cancel
Save