X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=a20d5c2494b6a3783883fd17c4cf9f1943e4a290;hb=1e422c29292f0583391b0ce9e9c872b38f035ac0;hp=de24626aa57757a6911d460bddcb3ee2125cf2e6;hpb=0d4ace80d081e080a704ee15227e209d5953e325;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index de24626a..a20d5c24 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -945,7 +945,7 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text,
 	int y = mSY + pos->y;
 
 	DrawBackgroundForGraphic(x, y, pos->width, pos->height, button_graphic);
-	DrawGraphicThruMaskExt(drawto, x, y, button_graphic, 0);
+	DrawFixedGraphicThruMaskExt(drawto, x, y, button_graphic, 0);
       }
 
       if (visibleTextPos(pos_text) && text != NULL)
@@ -1046,7 +1046,7 @@ static void drawCursorExt(int xpos, int ypos, boolean active, int graphic)
     graphic = BUTTON_ACTIVE(graphic);
 
   DrawBackgroundForGraphic(x, y, TILEX, TILEY, graphic);
-  DrawGraphicThruMaskExt(drawto, x, y, graphic, 0);
+  DrawFixedGraphicThruMaskExt(drawto, x, y, graphic, 0);
 }
 
 static void initCursor(int ypos, int graphic)
@@ -2197,8 +2197,8 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
 
     ClearRectangleOnBackground(drawto, xstart, ystart2 + (i - start) * ystep,
 			       TILEX, TILEY);
-    DrawGraphicAnimationExt(drawto, xstart, ystart2 + (i - start) * ystep,
-			    graphic, sync_frame, USE_MASKING);
+    DrawFixedGraphicAnimationExt(drawto, xstart, ystart2 + (i - start) * ystep,
+				 graphic, sync_frame, USE_MASKING);
 
     if (init)
       DrawInfoScreen_HelpText(element, action, direction, i - start);
@@ -4312,11 +4312,11 @@ static struct TokenInfo setup_info_input[] =
 
 static struct TokenInfo setup_info_shortcuts[] =
 {
-  { TYPE_ENTER_MENU,	execSetupShortcuts1,	"Various Keys"	},
-  { TYPE_ENTER_MENU,	execSetupShortcuts2,	"Player Focus"	},
-  { TYPE_ENTER_MENU,	execSetupShortcuts3,	"Tape Buttons"	},
-  { TYPE_ENTER_MENU,	execSetupShortcuts4,	"Sound & Music"	},
-  { TYPE_ENTER_MENU,	execSetupShortcuts5,	"TAS Snap Keys"	},
+  { TYPE_ENTER_MENU,	execSetupShortcuts1,	"Various Keys"		},
+  { TYPE_ENTER_MENU,	execSetupShortcuts2,	"Player Focus"		},
+  { TYPE_ENTER_MENU,	execSetupShortcuts3,	"Tape Buttons"		},
+  { TYPE_ENTER_MENU,	execSetupShortcuts4,	"Sound & Music"		},
+  { TYPE_ENTER_MENU,	execSetupShortcuts5,	"TAS Snap Keys"		},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
 
@@ -4360,15 +4360,17 @@ static struct TokenInfo setup_info_shortcuts_2[] =
 
 static struct TokenInfo setup_info_shortcuts_3[] =
 {
-  { TYPE_KEYTEXT,	NULL,			"Tape Eject:",		},
+  { TYPE_KEYTEXT,	NULL,			"Eject Tape:",		},
   { TYPE_KEY,		&setup.shortcut.tape_eject, ""			},
-  { TYPE_KEYTEXT,	NULL,			"Tape Stop:",		},
+  { TYPE_KEYTEXT,	NULL,			"Warp / Single Step:",	},
+  { TYPE_KEY,		&setup.shortcut.tape_extra, ""			},
+  { TYPE_KEYTEXT,	NULL,			"Stop Tape:",		},
   { TYPE_KEY,		&setup.shortcut.tape_stop, ""			},
-  { TYPE_KEYTEXT,	NULL,			"Tape Pause:",		},
+  { TYPE_KEYTEXT,	NULL,			"Pause / Unpause Tape:",},
   { TYPE_KEY,		&setup.shortcut.tape_pause, ""			},
-  { TYPE_KEYTEXT,	NULL,			"Tape Record:",		},
+  { TYPE_KEYTEXT,	NULL,			"Record Tape:",		},
   { TYPE_KEY,		&setup.shortcut.tape_record, ""			},
-  { TYPE_KEYTEXT,	NULL,			"Tape Play:",		},
+  { TYPE_KEYTEXT,	NULL,			"Play Tape:",		},
   { TYPE_KEY,		&setup.shortcut.tape_play, ""			},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupShortcuts,	"Back"			},
@@ -4378,11 +4380,11 @@ static struct TokenInfo setup_info_shortcuts_3[] =
 
 static struct TokenInfo setup_info_shortcuts_4[] =
 {
-  { TYPE_KEYTEXT,	NULL,		"Sound Effects (Normal):",	},
+  { TYPE_KEYTEXT,	NULL,		"Toggle Sound Effects (Normal):", },
   { TYPE_KEY,		&setup.shortcut.sound_simple, ""		},
-  { TYPE_KEYTEXT,	NULL,		"Sound Effects (Looping):",	},
+  { TYPE_KEYTEXT,	NULL,		"Toggle Sound Effects (Looping):", },
   { TYPE_KEY,		&setup.shortcut.sound_loops, ""			},
-  { TYPE_KEYTEXT,	NULL,		"Music:",			},
+  { TYPE_KEYTEXT,	NULL,		"Toggle Music:",		},
   { TYPE_KEY,		&setup.shortcut.sound_music, ""			},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupShortcuts,	"Back"			},
@@ -5011,8 +5013,8 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
 
   ClearRectangleOnBackground(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
 			     TILEX, TILEY);
-  DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
-			 PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+  DrawFixedGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
+			      PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
 
   if (setup.input[player_nr].use_joystick)
   {
@@ -5368,7 +5370,7 @@ static boolean CalibrateJoystickMain(int player_nr)
   {
     for (x = 0; x < 3; x++)
     {
-      DrawGraphic(xpos + x - 1, ypos + y - 1, IMG_MENU_CALIBRATE_BLUE, 0);
+      DrawFixedGraphic(xpos + x - 1, ypos + y - 1, IMG_MENU_CALIBRATE_BLUE, 0);
       check[x][y] = FALSE;
     }
   }
@@ -5392,7 +5394,7 @@ static boolean CalibrateJoystickMain(int player_nr)
   new_joystick_xmiddle = joy_x;
   new_joystick_ymiddle = joy_y;
 
-  DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0);
+  DrawFixedGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0);
 
   FadeIn(REDRAW_FIELD);
 
@@ -5464,8 +5466,10 @@ static boolean CalibrateJoystickMain(int player_nr)
 
     if (x != last_x || y != last_y)
     {
-      DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_YELLOW, 0);
-      DrawGraphic(xpos + x,      ypos + y,      IMG_MENU_CALIBRATE_RED,    0);
+      DrawFixedGraphic(xpos + last_x, ypos + last_y,
+		       IMG_MENU_CALIBRATE_YELLOW, 0);
+      DrawFixedGraphic(xpos + x,      ypos + y,
+		       IMG_MENU_CALIBRATE_RED,    0);
 
       last_x = x;
       last_y = y;