move speedbook above main panel

Source/control.cpp

@@ -259,7 +259,7 @@ void DrawSpellList()
 	pSpell = SPL_INVALID;
 	infostr[0] = '\0';
 	x = 636 + PANEL_LEFT;
-	y = 495;
+	y = 495 + HEIGHT_DIFF;
 	ClearPanel();
 	for (i = 0; i < 4; i++) {
 		switch ((spell_type)i) {
@@ -805,9 +805,9 @@ void DoSpeedBook()
 
 	spselflag = 1;
 	xo = 636 + PANEL_LEFT;
-	yo = 495;
+	yo = 495 + HEIGHT_DIFF;
 	X = 600 + PANEL_LEFT;
-	Y = 307;
+	Y = 307 + HEIGHT_DIFF;
 	if (plr[myplr]._pRSpell != SPL_INVALID) {
 		for (i = 0; i < 4; i++) {
 			switch (i) {

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
@@ -113,6 +113,7 @@
 
 #define SCREEN_X		BORDER_LEFT
 #define SCREEN_Y		BORDER_TOP
+#define HEIGHT_DIFF		(SCREEN_HEIGHT - 480)
 
 #define BUFFER_WIDTH	(BORDER_LEFT + SCREEN_WIDTH + BORDER_RIGHT)
 #define BUFFER_HEIGHT	(BORDER_TOP + SCREEN_HEIGHT + BORDER_BOTTOM)