OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Merge pull request #273 from 'paradox/clang'

Browse Source 
Conflicts:
	Sources/Tools/MaxConvert/Pch.h
	Sources/Tools/MaxConvert/hsControlConverter.cpp
This commit is contained in:
Adam Johnson
2013-01-31 19:14:57 -05:00
parent a8b2509736 e98a95fc94
commit f5abe4ab15
103 changed files with 211 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp
View File

@ -240,7 +240,6 @@ plAvSeekMsg::plAvSeekMsg()
fDuration(0),
fSmartSeek(true),
fAlignType(kAlignHandle),
fAnimName(nil),
fNoSeek(false),
fFlags(kSeekFlagForce3rdPersonOnStart)
{
@ -249,7 +248,7 @@ plAvSeekMsg::plAvSeekMsg()
// CTOR(sender, receiver, seekKey, time)
plAvSeekMsg::plAvSeekMsg(const plKey& sender, const plKey& receiver,
const plKey &seekKey, float duration, bool smartSeek,
plAvAlignment alignType, char *animName, bool noSeek,
plAvAlignment alignType, const plString& animName, bool noSeek,
uint8_t flags, plKey finishKey)
: plAvTaskMsg(sender, receiver),
fSeekPoint(seekKey),
@ -359,7 +358,7 @@ plAvOneShotMsg::plAvOneShotMsg()
plAvOneShotMsg::plAvOneShotMsg(const plKey &sender, const plKey& receiver,
const plKey& seekKey, float duration, bool smartSeek,
const plString &animName, bool drivable, bool reversible)
: plAvSeekMsg(sender, receiver, seekKey, duration, smartSeek), fAnimName(animName),
: plAvSeekMsg(sender, receiver, seekKey, duration, smartSeek, kAlignHandle, animName),
fDrivable(drivable), fReversible(reversible), fCallbacks(nil)
{
}

5
Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h
View File

@ -189,7 +189,7 @@ public:
// tors
plAvSeekMsg();
plAvSeekMsg(const plKey& sender, const plKey& receiver, const plKey &seekKey, float duration, bool smartSeek,
plAvAlignment align = kAlignHandle, char *animName = nil, bool noSeek = false,
plAvAlignment align = kAlignHandle, const plString& animName = "", bool noSeek = false,
uint8_t flags = kSeekFlagForce3rdPersonOnStart, plKey finishKey = nil);
// plasma protocol
@ -212,7 +212,7 @@ public:
float fDuration; // take this much time to do the move (only if smartSeek is false)
bool fSmartSeek; // seek by walking rather than floating
bool fNoSeek;
char *fAnimName;
plString fAnimName;
plAvAlignment fAlignType;
uint8_t fFlags;
plKey fFinishKey;
@ -257,7 +257,6 @@ public:
virtual void Write(hsStream *stream, hsResMgr *mgr);
// public members
plString fAnimName; // the name of the animation we're going to use
bool fDrivable; // are we animated by time or by mouse movement?
bool fReversible; // can we play backwards?
plOneShotCallbacks *fCallbacks; // Callbacks given to us by a one-shot modifier