mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 10:52:46 +00:00
Fix several errors and warnings from GCC compilation
This commit is contained in:
@ -63,14 +63,14 @@ enum CallbackEvent
|
||||
class plEventCallbackMsg : public plMessage
|
||||
{
|
||||
protected:
|
||||
|
||||
|
||||
public:
|
||||
float fEventTime; // the time for time events
|
||||
float fEventTime; // the time for time events
|
||||
CallbackEvent fEvent; // the event
|
||||
int16_t fIndex; // the index of the object we want the event to come from
|
||||
int16_t fIndex; // the index of the object we want the event to come from
|
||||
// (where applicable, required for sounds)
|
||||
int16_t fRepeats; // -1 for infinite repeats, 0 for one call, no repeats
|
||||
int16_t fUser; // User defined data, useful for keeping track of multiple callbacks
|
||||
int16_t fRepeats; // -1 for infinite repeats, 0 for one call, no repeats
|
||||
int16_t fUser; // User defined data, useful for keeping track of multiple callbacks
|
||||
|
||||
plEventCallbackMsg() : fEventTime(0.0f), fEvent((CallbackEvent)0), fRepeats(-1), fUser(0), fIndex(0) {;}
|
||||
plEventCallbackMsg (const plKey &s,
|
||||
@ -78,7 +78,7 @@ public:
|
||||
const double* t) :
|
||||
plMessage(s, r, t),
|
||||
fEventTime(0.0f), fEvent((CallbackEvent)0), fRepeats(-1), fUser(0), fIndex(0) {;}
|
||||
|
||||
|
||||
plEventCallbackMsg(const plKey &receiver, CallbackEvent e, int idx=0, float t=0, int16_t repeats=-1, uint16_t user=0) :
|
||||
plMessage(nil, receiver, nil), fEvent(e), fIndex(idx), fEventTime(t), fRepeats(repeats), fUser(user) {}
|
||||
|
||||
|
@ -135,12 +135,12 @@ public:
|
||||
hsBool Send(const plKey r=nil, hsBool async=false); // Message will self-destruct after send.
|
||||
hsBool SendAndKeep(const plKey r=nil, hsBool async=false); // Message won't self-destruct after send.
|
||||
|
||||
const double GetTimeStamp() const { return fTimeStamp; }
|
||||
double GetTimeStamp() const { return fTimeStamp; }
|
||||
plMessage& SetTimeStamp(double t) { fTimeStamp = t; return *this; }
|
||||
|
||||
hsBool HasBCastFlag(uint32_t f) const { return 0 != (fBCastFlags & f); }
|
||||
plMessage& SetBCastFlag(uint32_t f, hsBool on=true) { if( on )fBCastFlags |= f; else fBCastFlags &= ~f; return *this; }
|
||||
|
||||
|
||||
void SetAllBCastFlags(uint32_t f) { fBCastFlags=f; }
|
||||
uint32_t GetAllBCastFlags() const { return fBCastFlags; }
|
||||
|
||||
|
Reference in New Issue
Block a user