# HG changeset patch
# User Ritor1
# Date 1386040944 -21600
# Node ID f7e5b9f236ae7852926f073d699d4861e7ae53ff
# Parent 64e23bf9d27ee2ca8bf8d0c8e5c72729f98278c1
inline LuaVM()
diff -r 64e23bf9d27e -r f7e5b9f236ae Build/Visual Studio 2010/World of Might and Magic.vcxproj
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj Fri Nov 29 12:20:44 2013 +0200
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj Tue Dec 03 09:22:24 2013 +0600
@@ -163,6 +163,7 @@
+
@@ -322,6 +323,7 @@
+
diff -r 64e23bf9d27e -r f7e5b9f236ae Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters Fri Nov 29 12:20:44 2013 +0200
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters Tue Dec 03 09:22:24 2013 +0600
@@ -285,6 +285,7 @@
UI
+
@@ -605,6 +606,7 @@
UI\Books
+
diff -r 64e23bf9d27e -r f7e5b9f236ae Events.cpp
--- a/Events.cpp Fri Nov 29 12:20:44 2013 +0200
+++ b/Events.cpp Tue Dec 03 09:22:24 2013 +0600
@@ -433,6 +433,7 @@
{
if (!lua->DoFile("out01.lua"))
Log::Warning(L"Error opening out01.lua\n");
+ return;
}
if ( !uEventID )
{
diff -r 64e23bf9d27e -r f7e5b9f236ae LuaVM.h
--- a/LuaVM.h Fri Nov 29 12:20:44 2013 +0200
+++ b/LuaVM.h Tue Dec 03 09:22:24 2013 +0600
@@ -3,6 +3,8 @@
class LuaVM
{
public:
+ inline LuaVM(): L(nullptr) {}
+
void Initialize();
bool DoFile(const char *filename);