leveldir_last_valid = leveldir_current;
/* needed if last screen (level choice) changed graphics, sounds or music */
- ReloadCustomArtwork();
+ ReloadCustomArtwork(0);
#ifdef TARGET_SDL
SetDrawtoField(DRAW_BACKBUFFER);
DrawText(mSX + level_width + 5 * 32, mSY + 3*32, int2str(level_nr,3),
FONT_VALUE_1);
- DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
+ DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE);
DrawTextF(mSX + 32 + level_width - 2, mSY + 3*32 + 1, FONT_TEXT_3, "%d-%d",
leveldir_current->first_level, leveldir_current->last_level);
OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
}
+#if 0
static void gotoTopLevelDir()
{
/* move upwards to top level directory */
leveldir_current = leveldir_current->node_parent;
}
}
+#endif
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
{
FONT_VALUE_1);
LoadLevel(level_nr);
- DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
+ DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE);
TapeErase();
LoadTape(level_nr);
SaveLevelSetup_LastSeries();
SaveLevelSetup_SeriesInfo();
+#if 0
gotoTopLevelDir();
+#endif
DrawChooseLevel();
}
if (setup.autorecord)
TapeStartRecording();
-#if defined(PLATFORM_UNIX)
+#if defined(NETWORK_AVALIABLE)
if (options.network)
SendToServer_StartPlaying();
else
if (game_status == GAME_MODE_MAIN)
{
- DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, FALSE);
+ DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, FALSE);
DoAnimation();
}
}
int num_entries = numTreeInfoInGroup(ti);
int num_page_entries;
int last_game_status = game_status; /* save current game status */
+ boolean position_set_by_scrollbar = (dx == 999);
/* force LEVELS draw offset on choose level and artwork setup screen */
game_status = GAME_MODE_LEVELS;
ti->cl_cursor = entry_pos - ti->cl_first;
}
- if (dx == 999) /* first entry is set by scrollbar position */
+ if (position_set_by_scrollbar)
ti->cl_first = dy;
else
AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
return;
}
- if (IN_VIS_FIELD(x, y) &&
+ if (!anyScrollbarGadgetActive() &&
+ IN_VIS_FIELD(x, y) &&
mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x &&
y >= 0 && y < num_page_entries)
{
setup.music_set = artwork.mus_current->identifier;
/* needed if last screen (setup choice) changed graphics, sounds or music */
- ReloadCustomArtwork();
+ ReloadCustomArtwork(0);
/* needed for displaying artwork name instead of artwork identifier */
graphics_set_name = artwork.gfx_current->name;
static struct TokenInfo setup_info_editor[] =
{
+#if 0
{ TYPE_STRING, NULL, "Offer Special Elements:"},
+#endif
{ TYPE_SWITCH, &setup.editor.el_boulderdash, "BoulderDash:" },
{ TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" },
+ { TYPE_SWITCH, &setup.editor.el_emerald_mine_club,"E.M. Club:" },
{ TYPE_SWITCH, &setup.editor.el_more, "More:" },
{ TYPE_SWITCH, &setup.editor.el_sokoban, "Sokoban:" },
{ TYPE_SWITCH, &setup.editor.el_supaplex, "Supaplex:" },
(value_ptr == &setup.fullscreen && !video.fullscreen_available))
setup_info[i].type |= TYPE_GHOSTED;
+#if 0
+ if (setup_info[i].type & TYPE_STRING ||
+ (setup_info[i].type & TYPE_SWITCH && setup_mode == SETUP_MODE_EDITOR))
+ font_nr = FONT_MENU_2;
+#else
if (setup_info[i].type & TYPE_STRING)
font_nr = FONT_MENU_2;
+#endif
DrawText(mSX + 32, mSY + ypos * 32, setup_info[i].text, font_nr);
{ &custom_key.up, "Joystick Up" },
{ &custom_key.down, "Joystick Down" },
{ &custom_key.snap, "Button 1" },
- { &custom_key.bomb, "Button 2" }
+ { &custom_key.drop, "Button 2" }
};
static char *joystick_name[MAX_PLAYERS] =
{
DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +1, 1), FONT_INPUT_1_ACTIVE);
#if 1
+ 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);
#else
DrawText(mSX+2*32, mSY+8*32, ":", FONT_VALUE_OLD);
DrawText(mSX+2*32, mSY+9*32, ":", FONT_VALUE_OLD);
DrawText(mSX+32, mSY+10*32, "Snap Field:", FONT_VALUE_OLD);
- DrawText(mSX+32, mSY+12*32, "Place Bomb:", FONT_VALUE_OLD);
+ DrawText(mSX+32, mSY+12*32, "Drop Element:", FONT_VALUE_OLD);
for (i = 0; i < 6; i++)
{
char *text;
} customize_step[] =
{
- { &custom_key.left, "Move Left" },
- { &custom_key.right, "Move Right" },
- { &custom_key.up, "Move Up" },
- { &custom_key.down, "Move Down" },
- { &custom_key.snap, "Snap Field" },
- { &custom_key.bomb, "Place Bomb" }
+ { &custom_key.left, "Move Left" },
+ { &custom_key.right, "Move Right" },
+ { &custom_key.up, "Move Up" },
+ { &custom_key.down, "Move Down" },
+ { &custom_key.snap, "Snap Field" },
+ { &custom_key.drop, "Drop Element" }
};
/* read existing key bindings from player setup */
if (game_status != GAME_MODE_PLAYING)
return;
- if (local_player->LevelSolved)
- GameWon();
+ /* !!! FIX THIS (START) !!! */
+ if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+ {
+ byte *recorded_player_action;
+ byte summarized_player_action = 0;
+ byte tape_action[MAX_PLAYERS];
+ int i;
+
+ if (level.native_em_level->lev->home == 0) /* all players at home */
+ {
+ GameWon();
- if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
- TapeStop();
+ if (!TAPE_IS_STOPPED(tape))
+ TapeStop();
- GameActions();
- BackToFront();
+ if (game_status != GAME_MODE_PLAYING)
+ return;
+ }
+
+ if (level.native_em_level->ply1->alive == 0 &&
+ level.native_em_level->ply2->alive == 0) /* all dead */
+ AllPlayersGone = TRUE;
- if (tape.auto_play && !tape.playing)
- AutoPlayTape(); /* continue automatically playing next tape */
+ if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
+ TapeStop();
+
+ /* --- game actions --- */
+
+ if (tape.pausing)
+ {
+ /* don't use 100% CPU while in pause mode -- this should better be solved
+ like in the R'n'D game engine! */
+
+ Delay(10);
+
+ return;
+ }
+
+ recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
+
+#if 1
+ /* !!! CHECK THIS (tape.pausing is always FALSE here!) !!! */
+ if (recorded_player_action == NULL && tape.pausing)
+ return;
+#endif
+
+ for (i = 0; i < MAX_PLAYERS; i++)
+ {
+ summarized_player_action |= stored_player[i].action;
+
+ if (!network_playing)
+ stored_player[i].effective_action = stored_player[i].action;
+ }
+
+ if (!options.network && !setup.team_mode)
+ local_player->effective_action = summarized_player_action;
+
+ if (recorded_player_action != NULL)
+ for (i = 0; i < MAX_PLAYERS; i++)
+ stored_player[i].effective_action = recorded_player_action[i];
+
+ for (i = 0; i < MAX_PLAYERS; i++)
+ {
+ tape_action[i] = stored_player[i].effective_action;
+
+ /* !!! (this does not happen in the EM engine) !!! */
+ if (tape.recording && tape_action[i] && !tape.player_participates[i])
+ tape.player_participates[i] = TRUE; /* player just appeared from CE */
+ }
+
+ /* only save actions from input devices, but not programmed actions */
+ if (tape.recording)
+ TapeRecordAction(tape_action);
+
+ GameActions_EM(local_player->effective_action);
+
+ if (TimeFrames >= FRAMES_PER_SECOND)
+ {
+ TimeFrames = 0;
+ TapeTime++;
+
+ if (!level.use_step_counter)
+ {
+ TimePlayed++;
+
+ if (TimeLeft > 0)
+ {
+ TimeLeft--;
+
+ if (TimeLeft <= 10 && setup.time_limit)
+ PlaySoundStereo(SND_GAME_RUNNING_OUT_OF_TIME, SOUND_MIDDLE);
+
+ DrawGameValue_Time(TimeLeft);
+
+ if (!TimeLeft && setup.time_limit)
+ level.native_em_level->lev->killed_out_of_time = TRUE;
+ }
+ else if (level.time == 0 && level.native_em_level->lev->home > 0)
+ DrawGameValue_Time(TimePlayed);
+
+ level.native_em_level->lev->time =
+ (level.time == 0 ? TimePlayed : TimeLeft);
+ }
+
+ if (tape.recording || tape.playing)
+ DrawVideoDisplay(VIDEO_STATE_TIME_ON, TapeTime);
+ }
+
+ FrameCounter++;
+ TimeFrames++;
+
+ BackToFront();
+ }
+ else
+ {
+ if (local_player->LevelSolved)
+ GameWon();
+
+ if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
+ TapeStop();
+
+ GameActions();
+ BackToFront();
+
+ if (tape.auto_play && !tape.playing)
+ AutoPlayTape(); /* continue automatically playing next tape */
+ }
}
/* ---------- new screen button stuff -------------------------------------- */
projects / rocksndiamonds.git / blobdiff