# HG changeset patch # User Ritor1 # Date 1361419671 -21600 # Node ID b9aff98467e3a0905f07ad11aadf1478af2434d6 # Parent bbf8efb5bfeeab79258cd752582224f5192ec6aa Open house diff -r bbf8efb5bfee -r b9aff98467e3 Bink_Smacker.cpp --- a/Bink_Smacker.cpp Thu Feb 21 09:25:50 2013 +0600 +++ b/Bink_Smacker.cpp Thu Feb 21 10:07:51 2013 +0600 @@ -146,7 +146,7 @@ int __fastcall SmackVolumePan(_SMACK *a3, long a4, long a5, long a6) { - __asm int 3 + //__asm int 3 return 0; } @@ -154,14 +154,14 @@ // sub_4D83D0: using guessed type int __stdcall SmackBufferNewPalette(_DWORD, _DWORD, _DWORD); int __stdcall SmackBufferNewPalette(long a1, long a2, long a3) { - __asm int 3 + //__asm int 3 return 0; } // sub_4D83D4: using guessed type int __stdcall SmackColorRemapWithTrans(_DWORD, _DWORD, _DWORD, _DWORD, _DWORD); int __stdcall SmackColorRemapWithTrans(long a1, long a2, long a3, long a4, long a5) { - __asm int 3 + //__asm int 3 return 0; } diff -r bbf8efb5bfee -r b9aff98467e3 mm7_data.cpp --- a/mm7_data.cpp Thu Feb 21 09:25:50 2013 +0600 +++ b/mm7_data.cpp Thu Feb 21 10:07:51 2013 +0600 @@ -103,7 +103,7 @@ "Warlock Stables", 0x21, 0x181, 0x3201B, "Elf Stables", 0x21, 0x195, 0x34D1B, "Human Tavern01", 0xD, 0x2C2, 0x3115, - "Necromancer Tavern 01", 0xD, 0x3B0, 0x3915, + "Necromancer Tavern01", 0xD, 0x3B0, 0x3915, "Dwarven Tavern01", 0xD, 0x2FE, 0x5E15, "Wizard Tavern", 0xD, 0x3BB, 0x1115, "Warlock Tavern", 0xD, 0x3A8, 0x2115,