Mercurial > mm7
changeset 1988:7e2dd49832b5
Off-Hand <> Two-Handed error fixed
some trash left from previous commit
| author | zipi |
|---|---|
| date | Sat, 02 Nov 2013 17:24:31 +0000 |
| parents | a688e8646d72 |
| children | 33787c8938a5 |
| files | Actor.cpp Indoor.cpp OSWindow.cpp |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Sat Nov 02 15:50:44 2013 +0000 +++ b/Actor.cpp Sat Nov 02 17:24:31 2013 +0000 @@ -3789,10 +3789,10 @@ if ( player->HasItemEquipped((ITEM_EQUIP_TYPE)i) ) { ItemGen* item; - if (i == 0) + //if (i == 0) item = player->GetMainHandItem(); - else - item = player->GetOffHandItem(); + //else + //item = player->GetOffHandItem(); a4 = item->_439DF3_get_additional_damage((int*)&attackElement, &isLifeStealing); if ( isLifeStealing && pMonster->sCurrentHP > 0 ) {
--- a/Indoor.cpp Sat Nov 02 15:50:44 2013 +0000 +++ b/Indoor.cpp Sat Nov 02 17:24:31 2013 +0000 @@ -3902,6 +3902,7 @@ } } + // INDOOR initialize actors for (uint i = 0; i < uNumActors; ++i) //if ( (signed int)uNumActors > (signed int)v13 ) {
--- a/OSWindow.cpp Sat Nov 02 15:50:44 2013 +0000 +++ b/OSWindow.cpp Sat Nov 02 17:24:31 2013 +0000 @@ -521,7 +521,6 @@ ReadWindowsRegistryInt("window Y", (GetSystemMetrics(SM_CYSCREEN) - window_total_height) / 2), window_total_width, window_total_height, 0); - //SetWindowPos(api_handle, HWND_TOP, 0, 0, -1, -1, SWP_NOSIZE | SWP_SHOWWINDOW); #ifdef _DEBUG static HMENU debug_menu = CreateDebugMenuPanel(); SetMenu(api_handle, debug_menu);