Mercurial > mm7

diff mm7_4.cpp @ 434:137c59c3dbc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Temple of Moon and Dragon Lair can now be entered.
author Nomad
date Sun, 24 Feb 2013 01:42:35 +0200
parents 8c45cac1c5e1
children 4f451a616d3d
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Feb 24 01:08:02 2013 +0200
+++ b/mm7_4.cpp	Sun Feb 24 01:42:35 2013 +0200
@@ -1012,7 +1012,7 @@
     side1_dx = (double)(grid_pos_x1 - grid_pos_x1);
     side2_dz = (double)(grid_pos_z2 - grid_pos_z2);  // bug?  z2 - z2
     side1_dz = (double)(grid_pos_z2 - grid_pos_z2);  //       z1 - z2
-    Log::Warning(L"%s %s %u\n", __FILE__, __FUNCTION__, __LINE__);
+    Log::Warning(L"%S %S %u\n", __FILE__, __FUNCTION__, __LINE__);
     /*       |\
        side1 |  \
              |____\
@@ -10107,7 +10107,7 @@
     a1.uFrameX = 483;
     a1.uFrameWidth = 148;
     a1.uFrameZ = 334;
-    v2 = (&off_4EB080)[4 * uHouse_ExitPic];
+    v2 = pTransitionStrings[uHouse_ExitPic];
     if ( !v2 )
     {
       sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[411], v0);