OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-13 18:17:49 -04:00
Code Releases Activity

Fix some warnings and some errors.

Browse Source
This commit is contained in:
Darryl Pogue
2013-02-10 00:14:10 -08:00
parent 70ea64eed2
commit c06cfd1449
13 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp
View File

@ -677,7 +677,7 @@ PF_CONSOLE_CMD( Avatar_Anim, BlendAnimPri, "string Animation, float blendFactor,
PF_CONSOLE_CMD( Avatar_Anim, PlaySimpleAnim, "string AvatarName, string Animation", "Play a simple (root not animated) one time animation on the avatar")
{
plArmatureMod *avatar = plAvatarMgr::GetInstance()->FindAvatarByModelName(params[0]);
plArmatureMod *avatar = plAvatarMgr::GetInstance()->FindAvatarByModelName((char*)params[0]);
if (avatar)
avatar->PlaySimpleAnim(plString::FromUtf8(params[1]));
}

18
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
View File

@ -2003,10 +2003,13 @@ PF_CONSOLE_CMD( Graphics_Show, PhysicalsOnly, "", "Toggle only Physical geometry
PF_CONSOLE_CMD( Graphics_Show, Normal, "", "Toggle normal geometry visible")
{
static bool on = true;
if( on = !on )
if (!on) {
on = !on;
pfConsole::GetPipeline()->SetDrawableTypeMask(pfConsole::GetPipeline()->GetDrawableTypeMask() | plDrawableSpans::kNormal);
else
} else {
pfConsole::GetPipeline()->SetDrawableTypeMask(pfConsole::GetPipeline()->GetDrawableTypeMask() & ~plDrawableSpans::kNormal);
}
char str[ 256 ];
sprintf( str, "Normal geometry now %s", on ? "visible" : "invisible" );
@ -2017,15 +2020,15 @@ PF_CONSOLE_CMD( Graphics_Show, NormalOnly, "", "Toggle only normal geometry visi
{
static bool on = false;
static uint32_t oldMask = plDrawableSpans::kNormal;
if( on = !on )
{
if (!on) {
on = !on;
oldMask = pfConsole::GetPipeline()->GetDrawableTypeMask();
pfConsole::GetPipeline()->SetDrawableTypeMask(plDrawableSpans::kNormal);
}
else
{
} else {
pfConsole::GetPipeline()->SetDrawableTypeMask(oldMask);
}
char str[ 256 ];
sprintf( str, on ? "Now showing only normal geometry" : "Restoring previous render state" );
PrintString( str );
@ -3384,6 +3387,7 @@ Valid channels are: SoundFX, BgndMusic, Voice, GUI, NPCVoice and Ambience.")
case plgAudioSys::kAmbience: sprintf( msg, "Setting Ambience master volume to %4.2f", vol ); break;
case plgAudioSys::kGUI: sprintf( msg, "Setting GUI master volume to %4.2f", vol ); break;
case plgAudioSys::kNPCVoice: sprintf( msg, "Setting NPC Voice master volume to %4.2f", vol ); break;
default: break;
}
PrintString( msg );
}