Mercurial > mm7

changeset 350:77601b0fb14b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Thu, 21 Feb 2013 02:13:46 +0200
parents 672b83584b0f (current diff) 5bc2df838558 (diff)
children 5f36449527c6
files mm7_2.cpp
diffstat 7 files changed, 53 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/Bink_Smacker.cpp	Thu Feb 21 02:12:29 2013 +0200
+++ b/Bink_Smacker.cpp	Thu Feb 21 02:13:46 2013 +0200
@@ -144,7 +144,7 @@
   return (smackw32_SmackBufferOpen)(a1, a2, a3, a4, a5, a6);
 }
 
-int __fastcall SmackVolumePan(long a1, long a2, _SMACK *a3, long a4, long a5, long a6)
+int __fastcall SmackVolumePan(_SMACK *a3, long a4, long a5, long a6)
 {
  __asm int 3
  return 0;
--- a/Bink_Smacker.h	Thu Feb 21 02:12:29 2013 +0200
+++ b/Bink_Smacker.h	Thu Feb 21 02:13:46 2013 +0200
@@ -168,7 +168,7 @@
 
 
 int __stdcall SmackBufferOpen(HWND a1, long a2, long a3, long a4, long a5, long a6);
-int __fastcall SmackVolumePan(long a1, long a2, _SMACK *a3, long a4, long a5, long a6);
+int __fastcall SmackVolumePan(_SMACK *a3, long a4, long a5, long a6);
 
 int __stdcall SmackGoto(_SMACK *a1, long a2);
 
--- a/VideoPlayer.cpp	Thu Feb 21 02:12:29 2013 +0200
+++ b/VideoPlayer.cpp	Thu Feb 21 02:13:46 2013 +0200
@@ -989,7 +989,7 @@
     }
     v16 = 32767;
     v11 = (signed __int64)(pSoundVolumeLevels[(char)uSoundVolumeMultiplier] * 32767.0);
-    SmackVolumePan(v8, HIDWORD(v11), v3->pSmackerMovie, 1040384, v11, 32767);
+    SmackVolumePan(v3->pSmackerMovie, 1040384, v11, 32767);
   }
 }
 
--- a/mm7_2.cpp	Thu Feb 21 02:12:29 2013 +0200
+++ b/mm7_2.cpp	Thu Feb 21 02:13:46 2013 +0200
@@ -491,10 +491,10 @@
   unsigned int v71; // [sp-4h] [bp-278h]@75
   const char *v72; // [sp-4h] [bp-278h]@93
   unsigned int v73; // [sp-4h] [bp-278h]@99
-  char Dest; // [sp+Ch] [bp-268h]@55
-  char v75; // [sp+70h] [bp-204h]@59
-  char a1; // [sp+D4h] [bp-1A0h]@57
-  char v77; // [sp+138h] [bp-13Ch]@59
+  char Dest[100]; // [sp+Ch] [bp-268h]@55
+  char v75[100]; // [sp+70h] [bp-204h]@59
+  char a1[100]; // [sp+D4h] [bp-1A0h]@57
+  char v77[100]; // [sp+138h] [bp-13Ch]@59
   GUIWindow v78; // [sp+19Ch] [bp-D8h]@99
   GUIWindow v79; // [sp+1F0h] [bp-84h]@1
   char *Str[2]; // [sp+244h] [bp-30h]@30
@@ -771,31 +771,31 @@
     v28 = *(int *)v84;
     if ( pDialogueWindow->pCurrentPosActiveItem != 2 )
       v28 = v81;
-    sprintf(&Dest, format_4E2DC8, v28);
+    sprintf(Dest, format_4E2DC8, v28);
     sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[178], pOutString);
-    strcat(&Dest, pTmpBuf2);
-    v90 = pFontArrus->CalcTextHeight(&Dest, &v79, 0, 0);
-    strcat(&Dest, "\n \n");
+    strcat(Dest, pTmpBuf2);
+    v90 = pFontArrus->CalcTextHeight(Dest, &v79, 0, 0);
+    strcat(Dest, "\n \n");
     v29 = *(int *)v84;
     if ( pDialogueWindow->pCurrentPosActiveItem != 3 )
       v29 = v81;
-    sprintf(&a1, format_4E2DC8, v29);
+    sprintf(a1, format_4E2DC8, v29);
     sprintf(pTmpBuf2,
       pGlobalTXT_LocalizationStrings[86],
       //(signed __int64)p2DEvents_minus1__20[13 * (unsigned int)ptr_507BC0->ptr_1C],
       (signed __int64)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier,
       v83);
-    strcat(&a1, pTmpBuf2);
-    v88 = pFontArrus->CalcTextHeight(&a1, &v79, 0, 0);
-    strcat(&a1, "\n \n");
+    strcat(a1, pTmpBuf2);
+    v88 = pFontArrus->CalcTextHeight(a1, &v79, 0, 0);
+    strcat(a1, "\n \n");
     v30 = *(int *)v84;
     if ( pDialogueWindow->pCurrentPosActiveItem != 4 )
       v30 = v81;
-    sprintf(&v77, format_4E2DC8, v30);
-    strcat(&v77, pGlobalTXT_LocalizationStrings[160]);
-    v82 = pFontArrus->CalcTextHeight(&v77, &v79, 0, 0);
-    strcat(&v77, "\n \n");
-    v75 = 0;
+    sprintf(v77, format_4E2DC8, v30);
+    strcat(v77, pGlobalTXT_LocalizationStrings[160]);
+    v82 = pFontArrus->CalcTextHeight(v77, &v79, 0, 0);
+    strcat(v77, "\n \n");
+    v75[0] = 0;
     v87 = 0;
     v31 = (signed int)window_SpeakInHouse->ptr_1C;
     if ( v31 >= 108 && v31 <= 120 )
@@ -803,9 +803,9 @@
       v32 = *(int *)v84;
       if ( pDialogueWindow->pCurrentPosActiveItem != 5 )
         v32 = v81;
-      sprintf(&v75, format_4E2DC8, v32);
-      strcat(&v75, pGlobalTXT_LocalizationStrings[611]);
-      v87 = pFontArrus->CalcTextHeight(&v75, &v79, 0, 0);
+      sprintf(v75, format_4E2DC8, v32);
+      strcat(v75, pGlobalTXT_LocalizationStrings[611]);
+      v87 = pFontArrus->CalcTextHeight(v75, &v79, 0, 0);
     }
     v33 = pDialogueWindow;
     Str[1] = (char *)pDialogueWindow;
--- a/mm7_4.cpp	Thu Feb 21 02:12:29 2013 +0200
+++ b/mm7_4.cpp	Thu Feb 21 02:13:46 2013 +0200
@@ -10172,7 +10172,7 @@
   v56 = v52.pStartingPosActiveItem;
   if ( v52.pStartingPosActiveItem < v52.pStartingPosActiveItem + v52.pNumPresenceButton )
   {
-    v15 = (char *)v54;
+    v15 = "";//(char *)v54;
     while ( 1 )
     {
       v16 = v52.GetControl(v56);
--- a/mm7_data.cpp	Thu Feb 21 02:12:29 2013 +0200
+++ b/mm7_data.cpp	Thu Feb 21 02:13:46 2013 +0200
@@ -958,9 +958,34 @@
 int pNPCPortraits_x = 521; // idb
 int dword_4E5EC8[777]; // weak
 int pNPCPortraits_y = 38; // idb
-const char *pHouse_ExitPictures[11];
-char *_4E6BDC_loc_names[11];
-char aOutside[777]; // idb
+const char *pHouse_ExitPictures[11]=
+{
+	"",
+	"ticon01",
+	"ticon02",
+	"ticon03",
+	"ticon04",
+	"ticon05",
+	"istairup",
+	"itrap",
+	"outside",
+	"idoor",
+	"isecdoor"
+};
+const char *_4E6BDC_loc_names[11]=
+{
+	"mdt12.blv",
+	"d18.blv",
+	"mdt14.blv",
+	"d37.blv",
+	"mdk01.blv",
+	"mdt01.blv",
+	"mdr01.blv",
+	"mdt10.blv",
+	"mdt09.blv",
+	"mdt15.blv",
+	"mdt11.blv"
+};
 char aMer[777]; // idb
 char aMir[777]; // idb
 char aSel[777]; // idb
--- a/mm7_data.h	Thu Feb 21 02:12:29 2013 +0200
+++ b/mm7_data.h	Thu Feb 21 02:13:46 2013 +0200
@@ -684,7 +684,7 @@
 extern int dword_4E5EC8[]; // weak
 extern int pNPCPortraits_y; // idb
 extern const char *pHouse_ExitPictures[11];
-extern char *_4E6BDC_loc_names[11];
+extern const char *_4E6BDC_loc_names[11];
 extern char aOutside[]; // idb
 extern char aMer[]; // idb
 extern char aMir[]; // idb