# HG changeset patch # User Ritor1 # Date 1384784257 -21600 # Node ID b9e11e88b1574786e585219c831121a7d0c156cc # Parent e21db9518295a072202e73b9429b2c75bff887c2# Parent 47ab41698f9d9c07dae440faec3ad5261149ee47 Merge diff -r 47ab41698f9d -r b9e11e88b157 lib/lua/lua.h --- a/lib/lua/lua.h Mon Nov 18 13:17:12 2013 +0600 +++ b/lib/lua/lua.h Mon Nov 18 20:17:37 2013 +0600 @@ -2,5 +2,7 @@ extern "C" { - #include "lua-5.2.2/lua.hpp" + #include "lua-5.2.2/lua.h" + #include "lua-5.2.2/lualib.h" + #include "lua-5.2.2/lauxlib.h" } \ No newline at end of file diff -r 47ab41698f9d -r b9e11e88b157 mm7_2.cpp --- a/mm7_2.cpp Mon Nov 18 13:17:12 2013 +0600 +++ b/mm7_2.cpp Mon Nov 18 20:17:37 2013 +0600 @@ -68,6 +68,8 @@ #include "NewUI/MainMenu.h" #include "Level/Decoration.h" +#include "lib/lua/lua.h" + int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam); int __stdcall InsertMM7CDDialogFunc(HWND hDlg, int a2, __int16 a3, int a4); bool __fastcall FindMM7CD(HWND hWnd, char *pCDDrive); @@ -4311,6 +4313,14 @@ char test[1024]; sprintfex(test, "^Pi[%s]: знахар^R[ь;ка;]", "Золтан"); + lua_State *l = luaL_newstate(); + if ( l == NULL ) + printf ( "Error creating Lua context.\n" ); + luaL_openlibs(l); + if ( luaL_dofile(l,"lua_scripts/script.lua")) + printf ( "Error opening script.lua\n" ); + lua_close(l); + bool bNoMargareth = false; if (pCmdLine && *pCmdLine) {