diff --git a/CPreGame.cpp b/CPreGame.cpp index 6fa4d9740..31265e058 100644 --- a/CPreGame.cpp +++ b/CPreGame.cpp @@ -1925,15 +1925,18 @@ CPreGame::menuItems * CPreGame::currentItems() void CPreGame::scenHandleEv(SDL_Event& sEvent) { - if(sEvent.button.button == SDL_BUTTON_WHEELUP) + if(currentTab==&ourScenSel->mapsel) { - ourScenSel->mapsel.slid->moveUp(); - return; - } - else if(sEvent.button.button == SDL_BUTTON_WHEELDOWN) - { - ourScenSel->mapsel.slid->moveDown(); - return; + if(sEvent.button.button == SDL_BUTTON_WHEELUP) + { + ourScenSel->mapsel.slid->moveUp(); + return; + } + else if(sEvent.button.button == SDL_BUTTON_WHEELDOWN) + { + ourScenSel->mapsel.slid->moveDown(); + return; + } } if(sEvent.type == SDL_MOUSEMOTION) { diff --git a/ChangeLog b/ChangeLog index d133d2d12..5207bf7bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -0.7 -> 0.71 (as for r725) +0.7 -> 0.71 (as for r726) GENERAL: * fixed scrolling behind window problem (now it's possible to scroll with CTRL + arrows) * morale/luck system and corresponding sec. skills supported @@ -19,6 +19,7 @@ ADVENTURE INTERFACE: * campfire, borderguard, bordergate, questguard will be accessible from the top BATTLES: +* partial support for battle obstackles * spells not known by hero can't be casted * spell books won't be placed in War Machine slots after battle * attack is now possible when hex under cursor is not displayed