Skip to content

Added missing OOP-def. for isElementStreamedIn #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2016
Merged

Added missing OOP-def. for isElementStreamedIn #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions MTA10/mods/shared_logic/lua/CLuaMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ void CLuaMain::AddElementClass ( lua_State* luaVM )
lua_classfunction ( luaVM, "isCallPropagationEnabled", "isElementCallPropagationEnabled" );
lua_classfunction ( luaVM, "isWaitingForGroundToLoad", "isElementWaitingForGroundToLoad" );
lua_classfunction ( luaVM, "isOnScreen", "isElementOnScreen" );
lua_classfunction ( luaVM, "isStreamedIn", "isElementStreamedIn" );
lua_classfunction ( luaVM, "isStreamable", "isElementStreamable" );
lua_classfunction ( luaVM, "isLocal", "isElementLocal" );
lua_classfunction ( luaVM, "isSyncer", "isElementSyncer" );
Expand Down Expand Up @@ -222,6 +223,7 @@ void CLuaMain::AddElementClass ( lua_State* luaVM )
lua_classvariable ( luaVM, "callPropagationEnabled", "setElementCallPropagationEnabled", "isElementCallPropagationEnabled" );
lua_classvariable ( luaVM, "waitingForGroundToLoad", NULL, "isElementWaitingForGroundToLoad" );
lua_classvariable ( luaVM, "onScreen", NULL, "isElementOnScreen" );
lua_classvariable ( luaVM, "streamedIn", NULL, "isElementStreamedIn" );
lua_classvariable ( luaVM, "streamable", "setElementStreamable", "isElementStreamable" );
lua_classvariable ( luaVM, "localElement", NULL, "isElementLocal" );
lua_classvariable ( luaVM, "id", "setElementID", "getElementID" );
Expand Down Expand Up @@ -2012,8 +2014,8 @@ bool CLuaMain::LoadScriptFromBuffer ( const char* cpInBuffer, unsigned int uiInS
g_pClientGame->TellServerSomethingImportant( 1003, SStringX( "CLIENT SCRIPT ERROR: " ) + strMessage, false );
return false;
}

bool bUTF8 = CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );
bool bUTF8 = CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );

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