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

Update3 for MSVC10

Browse Source 
Fix some const problems.
This commit is contained in:
Skoader
2012-04-22 13:13:32 +10:00
parent bc74371c57
commit f8c3f7ac31
9 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -1970,11 +1970,11 @@ bool IsExpired()
void* desc = nil;
if (VerQueryValue(data, "\\StringFileInfo\\040904B0\\FileDescription", &desc, &descLen))
{
char* buildDateStart = strstr((const char*)desc, " - Built ");
const char* buildDateStart = strstr((const char*)desc, " - Built ");
if (buildDateStart)
{
buildDateStart += strlen(" - Built ");
char* buildDateEnd = strstr(buildDateStart, " at");
const char* buildDateEnd = strstr(buildDateStart, " at");
if (buildDateEnd)
{
int len = buildDateEnd-buildDateStart;

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp
View File

@ -218,12 +218,12 @@ void plAgeDescription::SetAgeNameFromPath( const char *path )
}
// Construct our name from the path
char *pathSep1 = strrchr( path, '\\' );
char *pathSep2 = strrchr( path, '/' );
const char *pathSep1 = strrchr( path, '\\' );
const char *pathSep2 = strrchr( path, '/' );
if( pathSep2 > pathSep1 )
pathSep1 = pathSep2;
if( pathSep1 == nil )
pathSep1 = (char *)path;
pathSep1 = path;
else
pathSep1++; // Get past the actual character we found

5
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h
View File

@ -99,7 +99,10 @@ public:
{
std::set<OwnedGroup>::iterator it=IFind(grpId);
if (it != fGroups.end())
(*it).fOwnIt=ownIt;
{
fGroups.erase(it);
fGroups.insert(OwnedGroup(grpId, ownIt));
}
else
{
ISetGroupDesc(grpId);

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp
View File

@ -275,7 +275,7 @@ void plNetObjectDebugger::LogMsgIfMatch(const char* msg) const
std::string tmp = msg;
hsStrLower((char*)tmp.c_str());
std::string objTag="object";
char* c=strstr(tmp.c_str(), objTag.c_str());
const char* c=strstr(tmp.c_str(), objTag.c_str());
if (c && c != tmp.c_str())
{
c+=objTag.size();

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp
View File

@ -82,7 +82,7 @@ void plNetClientRecorder::IMakeFilename(const char* recName, char* path)
CreateDirectory(path, NULL);
#endif
char* lastDot = strrchr(recName, '.');
const char* lastDot = strrchr(recName, '.');
if (lastDot)
strncat(path, recName, lastDot-recName);
else

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp
View File

@ -84,7 +84,7 @@ void plPhysicsSoundMgr::Update()
fCurCollisions.clear();
}
void plPhysicsSoundMgr::IStartCollision(CollidePair& cp)
void plPhysicsSoundMgr::IStartCollision(const CollidePair& cp)
{
hsVector3 v1, v2;
const hsScalar strengthThreshold = 20.0f;
@ -120,7 +120,7 @@ void plPhysicsSoundMgr::IStartCollision(CollidePair& cp)
}
}
void plPhysicsSoundMgr::IStopCollision(CollidePair& cp)
void plPhysicsSoundMgr::IStopCollision(const CollidePair& cp)
{
plPhysical* physicalA = cp.FirstPhysical();
plPhysical* physicalB = cp.SecondPhysical();
@ -146,7 +146,7 @@ void plPhysicsSoundMgr::IStopCollision(CollidePair& cp)
}
}
void plPhysicsSoundMgr::IUpdateCollision(CollidePair& cp)
void plPhysicsSoundMgr::IUpdateCollision(const CollidePair& cp)
{
const hsScalar slideThreshhold = 0.f;
hsVector3 v1, v2;

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.h
View File

@ -81,9 +81,9 @@ private:
plPhysical* SecondPhysical() const;
};
void IStartCollision(CollidePair& cp);
void IStopCollision(CollidePair& cp);
void IUpdateCollision(CollidePair& cp);
void IStartCollision(const CollidePair& cp);
void IStopCollision(const CollidePair& cp);
void IUpdateCollision(const CollidePair& cp);
void IProcessSlide(plPhysicalSndGroup* sndA, plPhysicalSndGroup* sndB, hsScalar strength);
typedef std::set<CollidePair> CollideSet;

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
View File

@ -10575,7 +10575,7 @@ inline void inlTESTPOINT(const hsPoint3& destP,
void plDXPipeline::IBlendVertsIntoBuffer( plSpan* span,
hsMatrix44* matrixPalette, int numMatrices,
UInt8 *src, UInt8 format, UInt32 srcStride,
const UInt8 *src, UInt8 format, UInt32 srcStride,
UInt8 *dest, UInt32 destStride, UInt32 count,
UInt16 localUVWChans )
{

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h
View File

@ -464,7 +464,7 @@ protected:
hsBool IAvatarSort(plDrawableSpans* d, const hsTArray<Int16>& visList);
void IBlendVertsIntoBuffer( plSpan* span,
hsMatrix44* matrixPalette, int numMatrices,
UInt8 *src, UInt8 format, UInt32 srcStride,
const UInt8 *src, UInt8 format, UInt32 srcStride,
UInt8 *dest, UInt32 destStride, UInt32 count, UInt16 localUVWChans );
hsBool ISoftwareVertexBlend( plDrawableSpans* drawable, const hsTArray<Int16>& visList );