Mercurial > mm7

changeset 2089:c041779ff4fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 06 Dec 2013 11:14:39 +0600
parents 6c0dbff26f5d (diff) ba5cd8a8a0d3 (current diff)
children 2e2c7a4edb1d
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/NewUI/Core/UIControlModule_wrap.cxx	Thu Dec 05 23:31:48 2013 +0400
+++ b/NewUI/Core/UIControlModule_wrap.cxx	Fri Dec 06 11:14:39 2013 +0600
@@ -726,7 +726,7 @@
  * type checking.
  * ----------------------------------------------------------------------------- */
  
-#include "../../lib/lua/lua.h"
+#include "lib/lua/lua.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/Outdoor.cpp	Thu Dec 05 23:31:48 2013 +0400
+++ b/Outdoor.cpp	Fri Dec 06 11:14:39 2013 +0600
@@ -2049,7 +2049,7 @@
   //v73 = strlen(pContainer);
   strcpy(Str + strlen(Str) - 4, ".ddm");
   //strcpy((char *)v141 + v73, (const char *)v108);
-  v39 = pNew_LOD->FindContainer(Str, 1);//
+  v39 = pNew_LOD->FindContainer(Str, 1);//error
   fread(&header, 0x10u, 1u, v39);
   Str2 = 0;
   if (header.uVersion != 91969 ||