X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=d494e99a7c1f3ce3f92fc5c687ef7aeb0135523d;hb=20e58eb6573a45a41c25958e17e8d9c20f738edc;hp=11c6bf2a9c9e011a89a6d4b2ecb067125d154aff;hpb=c16ef99848a25648feccaae350ada6f8665a18f4;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 11c6bf2a..d494e99a 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -47,9 +47,9 @@ extern unsigned char get_ascii(KeySym);
 
 void DrawHeadline()
 {
-  int x = SX + (SXSIZE - strlen(GAMETITLE_STRING) * FONT1_XSIZE) / 2;
+  int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2;
 
-  DrawText(x, SY + 8, GAMETITLE_STRING, FS_BIG, FC_YELLOW);
+  DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW);
   DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING);
 }
 
@@ -58,6 +58,8 @@ void DrawMainMenu()
   int i;
   char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
 
+  UnmapAllGadgets();
+  FadeSounds();
   XAutoRepeatOn(display);
 
   /* needed if last screen was the playing screen, invoked from level editor */
@@ -68,10 +70,12 @@ void DrawMainMenu()
     return;
   }
 
-  /* needed if last screen was the level editor */
-  UnmapLevelEditorGadgets();
+  /* needed if last screen was the editor screen */
+  UndrawSpecialEditorDoor();
+
+  /* map gadgets for main menu screen */
+  MapTapeButtons();
 
-  FadeSounds();
   GetPlayerConfig();
   LoadLevel(level_nr);
 
@@ -129,7 +133,10 @@ void DrawMainMenu()
 
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
 
+#if 0
   ClearEventQueue();
+#endif
+
 }
 
 void HandleMainMenu(int mx, int my, int dx, int dy, int button)
@@ -319,8 +326,10 @@ static int helpscreen_action[] =
   GFX_MORAST_LEER,1,100,					HA_NEXT,
   GFX_BETON,1,100,						HA_NEXT,
   GFX_MAUERWERK,1,100,						HA_NEXT,
-  GFX_MAUER_R1,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
-  GFX_MAUER_L1,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,	HA_NEXT,
+  GFX_MAUER_L1,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
+  GFX_MAUER_R1,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
+  GFX_MAUER_UP,  3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,
+  GFX_MAUER_DOWN,3,4, GFX_MAUERWERK,1,20, GFX_LEERRAUM,1,10,	HA_NEXT,
   GFX_UNSICHTBAR,1,100,						HA_NEXT,
   GFX_FELSBODEN,1,100,						HA_NEXT,
   GFX_CHAR_A,30,4, GFX_CHAR_AUSRUF,32,4,			HA_NEXT,
@@ -406,6 +415,10 @@ static int helpscreen_action[] =
   GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,			HA_NEXT,
   GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
   GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2,			HA_NEXT,
+  GFX_SOKOBAN_OBJEKT,1,100,					HA_NEXT,
+  GFX_SOKOBAN_FELD_LEER,1,100,					HA_NEXT,
+  GFX_SOKOBAN_FELD_VOLL,1,100,					HA_NEXT,
+  GFX_SPEED_PILL,1,100,						HA_NEXT,
   HA_END
 };
 static char *helpscreen_eltext[][2] =
@@ -416,7 +429,7 @@ static char *helpscreen_eltext[][2] =
  {"Quicksand: You cannot pass it,",	"but rocks can fall though it"},
  {"Massive Wall:",			"Nothing can go through it"},
  {"Normal Wall: You can't go through",	"it, but you can bomb it away"},
- {"Growing Wall: Grows to the left or",	"right if there is an empty field"},
+ {"Growing Wall: Grows in several di-",	"rections if there is an empty field"},
  {"Invisible Wall: Behaves like normal","wall, but is invisible"},
  {"Old Wall: Like normal wall, but",	"some things can fall down from it"},
  {"Letter Wall: Looks like a letter,",	"behaves like a normal wall"},
@@ -467,6 +480,10 @@ static char *helpscreen_eltext[][2] =
  {"Magic Wall (BD style):",		"Changes rocks and BD style diamonds"},
  {"Exit door: Opens if you have enough","emeralds to finish the level"},
  {"Open exit door: Enter here to leave","the level and exit the actual game"},
+ {"Sokoban element: Object which must", "be pushed to an empty field"},
+ {"Sokoban element: Empty field where", "a Sokoban object can be placed on"},
+ {"Sokoban element: Field with object", "which can be pushed away"},
+ {"Speed pill: Lets the player run",    "twice as fast as normally"},
 };
 static int num_helpscreen_els = sizeof(helpscreen_eltext)/(2*sizeof(char *));
 
@@ -665,6 +682,7 @@ void DrawHelpScreen()
 {
   int i;
 
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   for(i=0;i<MAX_HELPSCREEN_ELS;i++)
@@ -784,6 +802,7 @@ void HandleTypeName(int newxpos, KeySym key)
 
 void DrawChooseLevel()
 {
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   FadeToFront();
@@ -803,7 +822,8 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
   {
     strncpy(buffer, leveldir[first_entry + i].name , SCR_FIELDX - 1);
     buffer[SCR_FIELDX - 1] = '\0';
-    DrawText(SX + 32, SY + (i + 2) * 32, buffer, FS_BIG, FC_YELLOW);
+    DrawText(SX + 32, SY + (i + 2) * 32, buffer,
+	     FS_BIG, leveldir[first_entry + i].color);
     DrawGraphic(0, i + 2, GFX_KUGEL_BLAU);
   }
 
@@ -816,10 +836,17 @@ static void drawChooseLevelList(int first_entry, int num_page_entries)
 
 static void drawChooseLevelInfo(int leveldir_nr)
 {
+  int x, last_redraw_mask = redraw_mask;
+
   XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 32, 32);
   DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
 		    leveldir[leveldir_nr].levels,
 		    leveldir[leveldir_nr].readonly ? "readonly" : "writable");
+
+  /* let BackToFront() redraw only what is needed */
+  redraw_mask = last_redraw_mask | REDRAW_TILES;
+  for (x=0; x<SCR_FIELDX; x++)
+    MarkTileDirty(x, 1);
 }
 
 void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
@@ -952,6 +979,7 @@ void DrawHallOfFame(int highlight_position)
 {
   int i;
 
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0) 
@@ -1019,9 +1047,11 @@ void DrawSetupScreen()
     { NULL,			"Save and exit"	}
   };
 
+  UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
   ClearWindow();
-  DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW);
+
+  DrawText(SX + 16, SY + 16, "SETUP",FS_BIG,FC_YELLOW);
 
   for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++)
   {
@@ -1904,186 +1934,6 @@ void CalibrateJoystick(int player_nr)
   DrawSetupInputScreen();
 }
 
-
-
-#if 0
-
-void CalibrateJoystick_OLD()
-{
-#ifdef __FreeBSD__
-  struct joystick joy_ctrl;
-#else
-  struct joystick_control
-  {
-    int buttons;
-    int x;
-    int y;
-  } joy_ctrl;
-#endif
-
-#ifdef MSDOS
-  char joy_nr[4];
-#endif
-
-  int joystick_nr = setup.input[0].joystick_nr;
-  int new_joystick_xleft, new_joystick_xright, new_joystick_xmiddle;
-  int new_joystick_yupper, new_joystick_ylower, new_joystick_ymiddle;
-
-  if (joystick_status == JOYSTICK_OFF)
-    goto error_out;
-
-#ifndef MSDOS
-  ClearWindow();
-  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+9*32, "AND PRESS BUTTON",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-#ifdef __FreeBSD__
-  joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
-  joy_ctrl.buttons = 0;
-#endif
-  while(Joystick() & JOY_BUTTON);
-#ifdef __FreeBSD__
-  while(!(joy_ctrl.b1 || joy_ctrl.b2))
-#else
-  while(!joy_ctrl.buttons)
-#endif
-  {
-    if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
-    {
-      joystick_status=JOYSTICK_OFF;
-      goto error_out;
-    }
-    Delay(10);
-  }
-
-  new_joystick_xleft = joy_ctrl.x;
-  new_joystick_yupper = joy_ctrl.y;
-
-  ClearWindow();
-  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+8*32, "THE LOWER RIGHT",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+9*32, "AND PRESS BUTTON",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-#ifdef __FreeBSD__
-  joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
-  joy_ctrl.buttons = 0;
-#endif
-  while(Joystick() & JOY_BUTTON);
-#ifdef __FreeBSD__
-  while(!(joy_ctrl.b1 || joy_ctrl.b2))
-#else
-  while(!joy_ctrl.buttons)
-#endif
-  {
-    if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
-    {
-      joystick_status=JOYSTICK_OFF;
-      goto error_out;
-    }
-    Delay(10);
-  }
-
-  new_joystick_xright = joy_ctrl.x;
-  new_joystick_ylower = joy_ctrl.y;
-
-  ClearWindow();
-  DrawText(SX+32, SY+16+7*32, "CENTER JOYSTICK",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+16+8*32, "AND PRESS BUTTON",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-#ifdef __FreeBSD__
-  joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
-  joy_ctrl.buttons = 0;
-#endif
-  while(Joystick() & JOY_BUTTON);
-#ifdef __FreeBSD__
-  while(!(joy_ctrl.b1 || joy_ctrl.b2))
-#else
-  while(!joy_ctrl.buttons)
-#endif
-  {
-    if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
-    {
-      joystick_status=JOYSTICK_OFF;
-      goto error_out;
-    }
-    Delay(10);
-  }
-
-  new_joystick_xmiddle = joy_ctrl.x;
-  new_joystick_ymiddle = joy_ctrl.y;
-
-  setup.input[player_nr].joy.xleft = new_joystick_xleft;
-  setup.input[player_nr].joy.yupper = new_joystick_yupper;
-  setup.input[player_nr].joy.xright = new_joystick_xright;
-  setup.input[player_nr].joy.ylower = new_joystick_ylower;
-  setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle;
-  setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle;
-
-  CheckJoystickData();
-
-  DrawSetupScreen();
-  while(Joystick() & JOY_BUTTON);
-  return;
-
-#endif
-  error_out:
-
-#ifdef MSDOS
-  joy_nr[0] = '#';
-  joy_nr[1] = SETUP_2ND_JOYSTICK_ON(local_player->setup)+49;
-  joy_nr[2] = '\0';
-
-  remove_joystick();
-  ClearWindow();
-  DrawText(SX+32, SY+7*32, "CENTER JOYSTICK",FS_BIG,FC_YELLOW);
-  DrawText(SX+16+7*32, SY+8*32, joy_nr, FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-  for(clear_keybuf();!keypressed(););
-  install_joystick(JOY_TYPE_2PADS);
-
-  ClearWindow();
-  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-  for(clear_keybuf();!keypressed(););
-  calibrate_joystick(SETUP_2ND_JOYSTICK_ON(local_player->setup));
-
-  ClearWindow();
-  DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+8*32, "THE LOWER RIGHT",FS_BIG,FC_YELLOW);
-  DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
-  BackToFront();
-
-  for(clear_keybuf();!keypressed(););
-  calibrate_joystick(SETUP_2ND_JOYSTICK_ON(local_player->setup));
-
-  DrawSetupScreen();
-  return;
-#endif
-
-  ClearWindow();
-  DrawText(SX+16, SY+16, "NO JOYSTICK",FS_BIG,FC_YELLOW);
-  DrawText(SX+16, SY+48, " AVAILABLE ",FS_BIG,FC_YELLOW);
-  BackToFront();
-  Delay(3000);
-  DrawSetupScreen();
-}
-
-#endif
-
-
-
 void HandleGameActions()
 {
   if (game_status != PLAYING)
@@ -2099,237 +1949,3 @@ void HandleGameActions()
 
   BackToFront();
 }
-
-void HandleVideoButtons(int mx, int my, int button)
-{
-  if (game_status != MAINMENU && game_status != PLAYING)
-    return;
-
-  switch(CheckVideoButtons(mx,my,button))
-  {
-    case BUTTON_VIDEO_EJECT:
-      TapeStop();
-      if (TAPE_IS_EMPTY(tape))
-      {
-	LoadTape(level_nr);
-	if (TAPE_IS_EMPTY(tape))
-	  Request("No tape for this level !",REQ_CONFIRM);
-      }
-      else
-      {
-	if (tape.changed)
-	  SaveTape(tape.level_nr);
-	TapeErase();
-      }
-      DrawCompleteVideoDisplay();
-      break;
-
-    case BUTTON_VIDEO_STOP:
-      TapeStop();
-      break;
-
-    case BUTTON_VIDEO_PAUSE:
-      TapeTogglePause();
-      break;
-
-    case BUTTON_VIDEO_REC:
-      if (TAPE_IS_STOPPED(tape))
-      {
-	TapeStartRecording();
-
-#ifndef MSDOS
-	if (options.network)
-	  SendToServer_StartPlaying();
-	else
-#endif
-	{
-	  game_status = PLAYING;
-	  InitGame();
-	}
-      }
-      else if (tape.pausing)
-      {
-	if (tape.playing)	/* PLAYING -> PAUSING -> RECORDING */
-	{
-	  tape.pos[tape.counter].delay = tape.delay_played;
-	  tape.playing = FALSE;
-	  tape.recording = TRUE;
-	  tape.changed = TRUE;
-
-	  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON,0);
-	}
-	else
-	  TapeTogglePause();
-      }
-      break;
-
-    case BUTTON_VIDEO_PLAY:
-      if (TAPE_IS_EMPTY(tape))
-	break;
-
-      if (TAPE_IS_STOPPED(tape))
-      {
-	TapeStartPlaying();
-
-	game_status = PLAYING;
-	InitGame();
-      }
-      else if (tape.playing)
-      {
-	if (tape.pausing)			/* PAUSE -> PLAY */
-	  TapeTogglePause();
-	else if (!tape.fast_forward)		/* PLAY -> FAST FORWARD PLAY */
-	{
-	  tape.fast_forward = TRUE;
-	  DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
-	}
-	else if (!tape.pause_before_death)	/* FFWD PLAY -> + AUTO PAUSE */
-	{
-	  tape.pause_before_death = TRUE;
-	  DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
-	}
-	else					/* -> NORMAL PLAY */
-	{
-	  tape.fast_forward = FALSE;
-	  tape.pause_before_death = FALSE;
-	  DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_OFF, 0);
-	}
-      }
-      break;
-
-    default:
-      break;
-  }
-
-  BackToFront();
-}
-
-void HandleSoundButtons(int mx, int my, int button)
-{
-  if (game_status != PLAYING)
-    return;
-
-  switch(CheckSoundButtons(mx,my,button))
-  {
-    case BUTTON_SOUND_MUSIC:
-      if (setup.sound_music)
-      { 
-	setup.sound_music = FALSE;
-	FadeSound(background_loop[level_nr % num_bg_loops]);
-	DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF);
-      }
-      else if (sound_loops_allowed)
-      { 
-	setup.sound = setup.sound_music = TRUE;
-	PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
-	DrawSoundDisplay(BUTTON_SOUND_MUSIC_ON);
-      }
-      else
-	DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF);
-      break;
-
-    case BUTTON_SOUND_LOOPS:
-      if (setup.sound_loops)
-      { 
-	setup.sound_loops = FALSE;
-	DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF);
-      }
-      else if (sound_loops_allowed)
-      { 
-	setup.sound = setup.sound_loops = TRUE;
-	DrawSoundDisplay(BUTTON_SOUND_LOOPS_ON);
-      }
-      else
-	DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF);
-      break;
-
-    case BUTTON_SOUND_SIMPLE:
-      if (setup.sound_simple)
-      { 
-	setup.sound_simple = FALSE;
-	DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF);
-      }
-      else if (sound_status==SOUND_AVAILABLE)
-      { 
-	setup.sound = setup.sound_simple = TRUE;
-	DrawSoundDisplay(BUTTON_SOUND_SIMPLE_ON);
-      }
-      else
-	DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF);
-      break;
-
-    default:
-      break;
-  }
-
-  BackToFront();
-}
-
-void HandleGameButtons(int mx, int my, int button)
-{
-  if (game_status != PLAYING)
-    return;
-
-  switch(CheckGameButtons(mx,my,button))
-  {
-    case BUTTON_GAME_STOP:
-      if (AllPlayersGone)
-      {
-	CloseDoor(DOOR_CLOSE_1);
-	game_status = MAINMENU;
-	DrawMainMenu();
-	break;
-      }
-
-      if (Request("Do you really want to quit the game ?",
-		  REQ_ASK | REQ_STAY_CLOSED))
-      { 
-#ifndef MSDOS
-	if (options.network)
-	  SendToServer_StopPlaying();
-	else
-#endif
-	{
-	  game_status = MAINMENU;
-	  DrawMainMenu();
-	}
-      }
-      else
-	OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
-      break;
-
-    case BUTTON_GAME_PAUSE:
-      if (options.network)
-      {
-#ifndef MSDOS
-	if (tape.pausing)
-	  SendToServer_ContinuePlaying();
-	else
-	  SendToServer_PausePlaying();
-#endif
-      }
-      else
-	TapeTogglePause();
-      break;
-
-    case BUTTON_GAME_PLAY:
-      if (tape.pausing)
-      {
-#ifndef MSDOS
-	if (options.network)
-	  SendToServer_ContinuePlaying();
-	else
-#endif
-	{
-	  tape.pausing = FALSE;
-	  DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
-	}
-      }
-      break;
-
-    default:
-      break;
-  }
-
-  BackToFront();
-}