diff --git a/Source/cursor.cpp b/Source/cursor.cpp index 827315e0f..69655c4dc 100644 --- a/Source/cursor.cpp +++ b/Source/cursor.cpp @@ -292,7 +292,7 @@ void CheckCursMove() if (sbookflag && MouseX > RIGHT_PANEL && MouseY <= SPANEL_HEIGHT) { return; } - if ((chrflag || questlog) && MouseX < RIGHT_PANEL) { + if ((chrflag || questlog) && MouseX < 320 && MouseY <= SPANEL_HEIGHT) { return; } diff --git a/Source/player.cpp b/Source/player.cpp index d172c6154..74d332eb8 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -3688,8 +3688,8 @@ void CheckPlrSpell() } if (pcurs != CURSOR_HAND - || MouseY >= PANEL_TOP - || (chrflag && MouseX < 320 || invflag && MouseX > RIGHT_PANEL) + || (MouseY >= PANEL_TOP && MouseX >= PANEL_LEFT && MouseX <= RIGHT_PANEL) // allows casting spells through the sides of the main panel if it doesn't cover the whole screen + || ((chrflag || questlog) && MouseX < 320 && MouseY < SPANEL_HEIGHT) || (invflag && MouseX > RIGHT_PANEL && MouseY < SPANEL_HEIGHT) && rspell != SPL_HEAL && rspell != SPL_IDENTIFY && rspell != SPL_REPAIR diff --git a/defs.h b/defs.h index 1a134dc5b..4c44b4649 100644 --- a/defs.h +++ b/defs.h @@ -91,8 +91,8 @@ #define PAL16_RED 224 #define PAL16_GRAY 240 -#define SCREEN_WIDTH 640 -#define SCREEN_HEIGHT 480 +#define SCREEN_WIDTH 1280 +#define SCREEN_HEIGHT 960 #define ZOOM_WIDTH 384 #define ZOOM_HEIGHT 224