Fixed menu cursor rotation

skyjake · Jun 2, 2005 · 2305794 · 2305794
1 parent 3b422c3
commit 2305794
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/doomsday/Include/jDoom/Mn_def.h b/doomsday/Include/jDoom/Mn_def.h
@@ -21,8 +21,8 @@
 #define LINEHEIGHT_B	15
 #define LINEHEIGHT_A	8
 
-#define SKULLXOFF		-20
-#define SKULLYOFF		2
+#define SKULLXOFF		-32
+#define SKULLYOFF		6
 #define SKULLW			20
 #define SKULLH			19
 #define CURSORPREF	"M_SKULL%d"

diff --git a/doomsday/Src/Common/mn_menu.c b/doomsday/Src/Common/mn_menu.c
@@ -1797,16 +1797,16 @@ void M_Drawer(void)
 		{
 			scale = currentMenu->itemHeight / (float) LINEHEIGHT;
 			w = cursorst[whichSkull].width * scale;			// skull size
-			h = SKULLH * scale;
+			h = cursorst[whichSkull].height * scale;
 			off_x = (WidgetEdit? ColorWidgetMnu.x : currentMenu->x) + SKULLXOFF * scale + w / 2;
 
 			off_y =
 				(WidgetEdit? ColorWidgetMnu.y : currentMenu->y) + (itemOn -
 								(WidgetEdit? ColorWidgetMnu.firstItem : currentMenu->firstItem)) *
 				currentMenu->itemHeight + currentMenu->itemHeight / 2 -1;
 
-			if(currentMenu->font == hu_font_b)
-				off_y += SKULLYOFF;
+			//if(currentMenu->font == hu_font_b)
+			//	off_y += SKULLYOFF;
 
 			GL_SetPatch(cursorst[whichSkull].lump);
 			gl.MatrixMode(DGL_MODELVIEW);
@@ -1816,7 +1816,7 @@ void M_Drawer(void)
 			if(skull_angle)
                 gl.Rotatef(skull_angle, 0, 0, 1);
             gl.Scalef(1, 1.2f, 1);
-            GL_DrawRect(-w , -(h / 2), w, h, 1, 1, 1, menu_alpha);
+            GL_DrawRect(-(w/2) , -(h / 2), w, h, 1, 1, 1, menu_alpha);
             gl.PopMatrix();
         }