TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency

Browse source 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
This commit is contained in:
Daniel Buckmaster 2014-04-04 13:43:25 +11:00
commit 87d9e245b7
210 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/cinterface/c_scripting.cpp
View file

@ -164,7 +164,7 @@ extern "C" {
return false;
}
void script_simobject_setfield_int(U32 objectId, const char* fieldName, int v)
void script_simobject_setfield_int(U32 objectId, const char* fieldName, S32 v)
{
SimObject *object = Sim::findObject( objectId );
if( object )
@ -291,12 +291,12 @@ extern "C" {
entry->cb.mVoidCallbackFunc(o, argc, argv);
}
int script_simobject_get_id(SimObject* so)
S32 script_simobject_get_id(SimObject* so)
{
return so->getId();
}
int script_simobject_find(const char* classname, const char* name)
S32 script_simobject_find(const char* classname, const char* name)
{
SimObject *object;
if( Sim::findObject( name, object ) )
@ -385,7 +385,7 @@ extern "C" {
#ifdef TORQUE_OS_WIN
void script_input_event(int type, int value1, int value2)
void script_input_event(S32 type, S32 value1, S32 value2)
{
if (PlatformWindowManager::get() && PlatformWindowManager::get()->getFirstWindow())
{