TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 05:20:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'consolefuncrefactor' of https://github.com/jamesu/Torque3D into consolefuncrefactor

Browse source
This commit is contained in:
DavidWyand-GG 2013-01-07 12:09:22 -05:00
commit 59aaaf1892
93 changed files with 1947 additions and 728 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/sfx/sfxSource.cpp
View file

@ -316,7 +316,7 @@ void SFXSource::initPersistFields()
//-----------------------------------------------------------------------------
bool SFXSource::processArguments( S32 argc, const char **argv )
bool SFXSource::processArguments( S32 argc, ConsoleValueRef *argv )
{
// Don't allow subclasses of this to be created via script. Force
// usage of the SFXSystem functions.

2
Engine/source/sfx/sfxSource.h
View file

@ -382,7 +382,7 @@ class SFXSource : public SimGroup
/// We overload this to disable creation of
/// a source via script 'new'.
virtual bool processArguments( S32 argc, const char **argv );
virtual bool processArguments( S32 argc, ConsoleValueRef *argv );
// Console getters/setters.
static bool _setDescription( void *obj, const char *index, const char *data );

6
Engine/source/sfx/sfxSystem.cpp
View file

@ -1454,7 +1454,7 @@ ConsoleFunction( sfxCreateSource, S32, 2, 6,
description = dynamic_cast< SFXDescription* >( Sim::findObject( argv[1] ) );
if ( !description )
{
Con::printf( "Unable to locate sound track/description '%s'", argv[1] );
Con::printf( "Unable to locate sound track/description '%s'", (const char*)argv[1] );
return 0;
}
}
@ -1560,7 +1560,7 @@ ConsoleFunction( sfxPlay, S32, 2, 5, "( SFXSource source | ( SFXTrack track [, f
SFXTrack* track = dynamic_cast<SFXTrack*>( Sim::findObject( argv[1] ) );
if ( !track )
{
Con::printf( "Unable to locate sfx track '%s'", argv[1] );
Con::printf( "Unable to locate sfx track '%s'", (const char*)argv[1] );
return 0;
}
@ -1663,7 +1663,7 @@ ConsoleFunction( sfxPlayOnce, S32, 2, 6,
description = dynamic_cast< SFXDescription* >( Sim::findObject( argv[1] ) );
if( !description )
{
Con::errorf( "sfxPlayOnce - Unable to locate sound track/description '%s'", argv[1] );
Con::errorf( "sfxPlayOnce - Unable to locate sound track/description '%s'", (const char*)argv[1] );
return 0;
}
}

2
Engine/source/sfx/sfxTrack.cpp
View file

@ -86,7 +86,7 @@ void SFXTrack::initPersistFields()
//-----------------------------------------------------------------------------
bool SFXTrack::processArguments( S32 argc, const char **argv )
bool SFXTrack::processArguments( S32 argc, ConsoleValueRef *argv )
{
if( typeid( *this ) == typeid( SFXTrack ) )
{

2
Engine/source/sfx/sfxTrack.h
View file

@ -57,7 +57,7 @@ class SFXTrack : public SimDataBlock
StringTableEntry mParameters[ MaxNumParameters ];
/// Overload this to disable direct instantiation of this class via script 'new'.
virtual bool processArguments( S32 argc, const char **argv );
virtual bool processArguments( S32 argc, ConsoleValueRef *argv );
public: