Skip to content

Commit 8133d2e

Browse files
JusonexJusonex
authored andcommitted
Merge pull request #25 from Necktrox/patch-1
Added missing OOP-def. for isElementStreamedIn
2 parents 2082a77 + 4bd2c21 commit 8133d2e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

MTA10/mods/shared_logic/lua/CLuaMain.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ void CLuaMain::AddElementClass ( lua_State* luaVM )
168168
lua_classfunction ( luaVM, "isCallPropagationEnabled", "isElementCallPropagationEnabled" );
169169
lua_classfunction ( luaVM, "isWaitingForGroundToLoad", "isElementWaitingForGroundToLoad" );
170170
lua_classfunction ( luaVM, "isOnScreen", "isElementOnScreen" );
171+
lua_classfunction ( luaVM, "isStreamedIn", "isElementStreamedIn" );
171172
lua_classfunction ( luaVM, "isStreamable", "isElementStreamable" );
172173
lua_classfunction ( luaVM, "isLocal", "isElementLocal" );
173174
lua_classfunction ( luaVM, "isSyncer", "isElementSyncer" );
@@ -222,6 +223,7 @@ void CLuaMain::AddElementClass ( lua_State* luaVM )
222223
lua_classvariable ( luaVM, "callPropagationEnabled", "setElementCallPropagationEnabled", "isElementCallPropagationEnabled" );
223224
lua_classvariable ( luaVM, "waitingForGroundToLoad", NULL, "isElementWaitingForGroundToLoad" );
224225
lua_classvariable ( luaVM, "onScreen", NULL, "isElementOnScreen" );
226+
lua_classvariable ( luaVM, "streamedIn", NULL, "isElementStreamedIn" );
225227
lua_classvariable ( luaVM, "streamable", "setElementStreamable", "isElementStreamable" );
226228
lua_classvariable ( luaVM, "localElement", NULL, "isElementLocal" );
227229
lua_classvariable ( luaVM, "id", "setElementID", "getElementID" );
@@ -2012,8 +2014,8 @@ bool CLuaMain::LoadScriptFromBuffer ( const char* cpInBuffer, unsigned int uiInS
20122014
g_pClientGame->TellServerSomethingImportant( 1003, SStringX( "CLIENT SCRIPT ERROR: " ) + strMessage, false );
20132015
return false;
20142016
}
2015-
2016-
bool bUTF8 = CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );
2017+
2018+
bool bUTF8 = CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );
20172019

20182020
// If compiled script, make sure correct chunkname is embedded
20192021
CLuaShared::EmbedChunkName( strNiceFilename, &cpBuffer, &uiSize );

0 commit comments

Comments
 (0)