OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Move these inline to be faster.

Browse Source
This commit is contained in:
Darryl Pogue
2012-04-08 00:19:24 -07:00
parent 5ad311dd97
commit cb209c853f
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.cpp
View File

@ -76,12 +76,6 @@ plLocation& plLocation::operator=(const plLocation& rhs)
return *this; return *this;
} }
hsBool plLocation::operator==(const plLocation& u) const
{
// Ignore the itinerant flag when comparing, because
return (fSequenceNumber == u.fSequenceNumber) && ((fFlags & ~kItinerant) == (u.fFlags & ~kItinerant));
}
void plLocation::Set(uint32_t seqNum) void plLocation::Set(uint32_t seqNum)
{ {
fSequenceNumber = seqNum; fSequenceNumber = seqNum;

9
Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.h
View File

@ -89,7 +89,7 @@ protected:
kNormalLocStartIdx = kLocalLocEndIdx + 1, kNormalLocStartIdx = kLocalLocEndIdx + 1,
kReservedLocStart = 0xff000000, // Reserved locations are ones that aren't real game locations, kReservedLocStart = 0xff000000, // Reserved locations are ones that aren't real game locations,
kGlobalServerLocIdx = kReservedLocStart, // Global pool room for the server. Only the server gets this one kGlobalServerLocIdx = kReservedLocStart, // Global pool room for the server. Only the server gets this one
kReservedLocAvailableStart = kGlobalServerLocIdx + 1, // This is the start of the *really* available ones kReservedLocAvailableStart = kGlobalServerLocIdx + 1, // This is the start of the *really* available ones
@ -119,7 +119,12 @@ public:
void Read(hsStream* s); void Read(hsStream* s);
void Write(hsStream* s) const; void Write(hsStream* s) const;
hsBool operator==(const plLocation& loc) const; hsBool operator==(const plLocation& loc) const
{
// Ignore the itinerant flag when comparing, because
return (fSequenceNumber == loc.fSequenceNumber) &&
((fFlags & ~kItinerant) == (loc.fFlags & ~kItinerant));
}
hsBool operator!=(const plLocation& loc) const { return !(loc == *this); } hsBool operator!=(const plLocation& loc) const { return !(loc == *this); }
plLocation& operator=(const plLocation& loc); plLocation& operator=(const plLocation& loc);
bool operator<(const plLocation& loc ) const { return fSequenceNumber < loc.fSequenceNumber; } bool operator<(const plLocation& loc ) const { return fSequenceNumber < loc.fSequenceNumber; }

5
Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp
View File

@ -120,11 +120,6 @@ void plPageInfo::AddClassVersion(uint16_t classIdx, uint16_t version)
fClassVersions.push_back(cv); fClassVersions.push_back(cv);
} }
const plLocation& plPageInfo::GetLocation() const
{
return fLocation;
}
void plPageInfo::Read( hsStream *s ) void plPageInfo::Read( hsStream *s )
{ {
delete [] fAge; delete [] fAge;

4
Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.h
View File

@ -65,7 +65,7 @@ protected:
char* fPage; char* fPage;
uint16_t fMajorVersion; uint16_t fMajorVersion;
ClassVerVec fClassVersions; ClassVerVec fClassVersions;
uint32_t fChecksum; uint32_t fChecksum;
uint32_t fDataStart, fIndexStart; uint32_t fDataStart, fIndexStart;
void IInit( void ); void IInit( void );
@ -90,7 +90,7 @@ public:
void SetStrings( const char *age, const char *page ); void SetStrings( const char *age, const char *page );
void SetLocation(const plLocation& loc); void SetLocation(const plLocation& loc);
const plLocation& GetLocation() const; const plLocation& GetLocation() const { return fLocation; }
uint16_t GetMajorVersion() const { return fMajorVersion; } uint16_t GetMajorVersion() const { return fMajorVersion; }
void SetMajorVersion(uint16_t major) { fMajorVersion = major; } void SetMajorVersion(uint16_t major) { fMajorVersion = major; }