Mercurial > mm7

changeset 2067:2e08496c40c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 03 Dec 2013 09:22:28 +0600
parents f7e5b9f236ae (diff) 87be06553c76 (current diff)
children a290d9fbdc95
files
diffstat 3 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Mon Dec 02 23:19:22 2013 +0600
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Tue Dec 03 09:22:28 2013 +0600
@@ -163,6 +163,7 @@
     <ClCompile Include="..\..\LightsStack.cpp" />
     <ClCompile Include="..\..\LOD.cpp" />
     <ClCompile Include="..\..\Log.cpp" />
+    <ClCompile Include="..\..\LuaVM.cpp" />
     <ClCompile Include="..\..\mm7text_ru.cpp" />
     <ClCompile Include="..\..\mm7_2.cpp" />
     <ClCompile Include="..\..\mm7_3.cpp" />
@@ -322,6 +323,7 @@
     <ClInclude Include="..\..\Lights.h" />
     <ClInclude Include="..\..\LOD.h" />
     <ClInclude Include="..\..\Log.h" />
+    <ClInclude Include="..\..\LuaVM.h" />
     <ClInclude Include="..\..\MapInfo.h" />
     <ClInclude Include="..\..\MM7.h" />
     <ClInclude Include="..\..\mm7_data.h" />
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Mon Dec 02 23:19:22 2013 +0600
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Tue Dec 03 09:22:28 2013 +0600
@@ -285,6 +285,7 @@
       <Filter>UI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Timer.h" />
+    <ClInclude Include="..\..\LuaVM.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="lib">
@@ -605,6 +606,7 @@
       <Filter>UI\Books</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Timer.cpp" />
+    <ClCompile Include="..\..\LuaVM.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
--- a/Events.cpp	Mon Dec 02 23:19:22 2013 +0600
+++ b/Events.cpp	Tue Dec 03 09:22:28 2013 +0600
@@ -433,6 +433,7 @@
   {
     if (!lua->DoFile("out01.lua"))
       Log::Warning(L"Error opening out01.lua\n");
+    return;
   }
   if ( !uEventID )
     {