Applied new Astyle settings

This commit is contained in:
Robert Beckebans 2019-11-11 20:27:44 +01:00
parent 4ab1bb1821
commit 4a6af2d609
725 changed files with 54781 additions and 52398 deletions

View file

@ -296,14 +296,14 @@ idStr idSWFScriptVar::ToString() const
case SWF_VAR_RESULT:
return *value.string;
// RB end
case SWF_VAR_FLOAT:
return va( "%g", value.f );
case SWF_VAR_BOOL:
return value.b ? "true" : "false";
case SWF_VAR_INTEGER:
return va( "%i", value.i );
case SWF_VAR_NULL:
return "[null]";
case SWF_VAR_UNDEF:
@ -336,17 +336,17 @@ float idSWFScriptVar::ToFloat() const
{
case SWF_VAR_STRING:
return atof( *value.string );
case SWF_VAR_FLOAT:
return value.f;
case SWF_VAR_BOOL:
return ( float )value.b;
case SWF_VAR_INTEGER:
return ( float )value.i;
case SWF_VAR_OBJECT:
return value.object->DefaultValue( false ).ToFloat();
case SWF_VAR_FUNCTION:
case SWF_VAR_NULL:
case SWF_VAR_UNDEF:
@ -368,17 +368,17 @@ bool idSWFScriptVar::ToBool() const
{
case SWF_VAR_STRING:
return ( value.string->Icmp( "true" ) == 0 || value.string->Icmp( "1" ) == 0 );
case SWF_VAR_FLOAT:
return ( value.f != 0.0f );
case SWF_VAR_BOOL:
return value.b;
case SWF_VAR_INTEGER:
return value.i != 0;
case SWF_VAR_OBJECT:
return value.object->DefaultValue( false ).ToBool();
case SWF_VAR_FUNCTION:
case SWF_VAR_NULL:
case SWF_VAR_UNDEF:
@ -400,18 +400,18 @@ int32 idSWFScriptVar::ToInteger() const
{
case SWF_VAR_STRING:
return atoi( *value.string );
case SWF_VAR_FLOAT:
return idMath::Ftoi( value.f );
case SWF_VAR_BOOL:
return value.b ? 1 : 0;
case SWF_VAR_INTEGER:
return value.i;
case SWF_VAR_OBJECT:
return value.object->DefaultValue( false ).ToInteger();
case SWF_VAR_FUNCTION:
case SWF_VAR_NULL:
case SWF_VAR_UNDEF:
@ -433,7 +433,7 @@ idSWFSpriteInstance* idSWFScriptVar::ToSprite()
{
return value.object->GetSprite();
}
return NULL;
}
@ -448,7 +448,7 @@ idSWFTextInstance* idSWFScriptVar::ToText()
{
return value.object->GetText();
}
return NULL;
}
@ -463,7 +463,7 @@ idSWFScriptVar idSWFScriptVar::GetNestedVar( const char* arg1, const char* arg2,
{
return idSWFScriptVar();
}
return GetObject()->GetNestedVar( arg1, arg2, arg3, arg4, arg5, arg6 );
}
@ -478,7 +478,7 @@ idSWFScriptObject* idSWFScriptVar::GetNestedObj( const char* arg1, const char* a
{
return NULL;
}
return GetObject()->GetNestedObj( arg1, arg2, arg3, arg4, arg5, arg6 );
}
@ -493,7 +493,7 @@ idSWFSpriteInstance* idSWFScriptVar::GetNestedSprite( const char* arg1, const ch
{
return NULL;
}
return GetObject()->GetNestedSprite( arg1, arg2, arg3, arg4, arg5, arg6 );
}
@ -508,7 +508,7 @@ idSWFTextInstance* idSWFScriptVar::GetNestedText( const char* arg1, const char*
{
return NULL;
}
return GetObject()->GetNestedText( arg1, arg2, arg3, arg4, arg5, arg6 );
}
@ -529,14 +529,14 @@ const char* idSWFScriptVar::TypeOf() const
case SWF_VAR_RESULT:
return "result";
// RB end
case SWF_VAR_FLOAT:
return "number";
case SWF_VAR_BOOL:
return "boolean";
case SWF_VAR_INTEGER:
return "number";
case SWF_VAR_OBJECT:
if( value.object->GetSprite() != NULL )
{
@ -550,7 +550,7 @@ const char* idSWFScriptVar::TypeOf() const
{
return "object";
}
case SWF_VAR_FUNCTION:
return "function";
case SWF_VAR_NULL:
@ -571,7 +571,7 @@ idSWFScriptVar::PrintToConsole
void idSWFScriptVar::PrintToConsole() const
{
idLib::Printf( "Object type: %s\n", TypeOf() );
if( IsObject() )
{
GetObject()->PrintToConsole();