TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Beginnings of the "pass everything using a native type wrapper" console code.

Browse source 
- ConsoleValue class is now the base value class.
- ConsoleValueRef is now used to supply function parameters. Values are disposable.
- Script functions return values instead of just strings where possible.
- Variables can be disposable strings
- Bytecode changed

Fix the issues with console method parameters and fields which prevented missions from loading.
This commit is contained in:
James Urquhart 2012-09-23 09:59:48 +01:00
parent 394d87cd54
commit 38c8e52c1d
68 changed files with 1511 additions and 529 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/environment/editors/guiMeshRoadEditorCtrl.cpp
View file

@ -1040,7 +1040,7 @@ void GuiMeshRoadEditorCtrl::setMode( String mode, bool sourceShortcut = false )
mMode = mode;
if( sourceShortcut )
Con::executef( this, "paletteSync", mode );
Con::executef( this, "paletteSync", (const char*)mode );
}
void GuiMeshRoadEditorCtrl::setSelectedRoad( MeshRoad *road )

2
Engine/source/environment/editors/guiRiverEditorCtrl.cpp
View file

@ -1181,7 +1181,7 @@ void GuiRiverEditorCtrl::setMode( String mode, bool sourceShortcut = false )
mMode = mode;
if( sourceShortcut )
Con::executef( this, "paletteSync", mode );
Con::executef( this, "paletteSync", mode.utf8() );
}
void GuiRiverEditorCtrl::setSelectedRiver( River *river )

2
Engine/source/environment/editors/guiRoadEditorCtrl.cpp
View file

@ -945,7 +945,7 @@ void GuiRoadEditorCtrl::setMode( String mode, bool sourceShortcut = false )
mMode = mode;
if( sourceShortcut )
Con::executef( this, "paletteSync", mode );
Con::executef( this, "paletteSync", mode.utf8() );
}
void GuiRoadEditorCtrl::setSelectedRoad( DecalRoad *road )

2
Engine/source/environment/waterObject.cpp
View file

@ -406,7 +406,7 @@ void WaterObject::inspectPostApply()
setMaskBits( UpdateMask | WaveMask | TextureMask | SoundMask );
}
bool WaterObject::processArguments( S32 argc, const char **argv )
bool WaterObject::processArguments( S32 argc, ConsoleValueRef *argv )
{
if( typeid( *this ) == typeid( WaterObject ) )
{

2
Engine/source/environment/waterObject.h
View file

@ -156,7 +156,7 @@ public:
virtual bool onAdd();
virtual void onRemove();
virtual void inspectPostApply();
virtual bool processArguments(S32 argc, const char **argv);
virtual bool processArguments(S32 argc, ConsoleValueRef *argv);
// NetObject
virtual U32 packUpdate( NetConnection * conn, U32 mask, BitStream *stream );