projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed compiler warnings (after adding "-Wstrict-prototypes")
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 4fed1cd982a7223367deaee0ce8e1b2c26cb6327..82a58803ca3e15e0fb5da15a04984339c6c257c6 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-166,7
+166,7
@@
static struct DoorPartControlInfo door_part_controls[] =
/* forward declaration for internal use */
/* forward declaration for internal use */
-static void UnmapToolButtons();
+static void UnmapToolButtons(
void
);
static void HandleToolButtons(struct GadgetInfo *);
static int el_act_dir2crm(int, int, int);
static int el_act2crm(int, int);
static void HandleToolButtons(struct GadgetInfo *);
static int el_act_dir2crm(int, int, int);
static int el_act2crm(int, int);
@@
-208,7
+208,7
@@
int correctLevelPosY_EM(int ly)
return ly;
}
return ly;
}
-static int getFieldbufferOffsetX_RND()
+static int getFieldbufferOffsetX_RND(
void
)
{
int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
int dx = (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
{
int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
int dx = (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
@@
-240,7
+240,7
@@
static int getFieldbufferOffsetX_RND()
return fx;
}
return fx;
}
-static int getFieldbufferOffsetY_RND()
+static int getFieldbufferOffsetY_RND(
void
)
{
int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
int dy = (ScreenMovDir & (MV_UP | MV_DOWN) ? ScreenGfxPos : 0);
{
int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
int dy = (ScreenMovDir & (MV_UP | MV_DOWN) ? ScreenGfxPos : 0);
@@
-479,7
+479,7
@@
void SetDrawtoField(int mode)
}
}
}
}
-static void RedrawPlayfield_RND()
+static void RedrawPlayfield_RND(
void
)
{
if (game.envelope_active)
return;
{
if (game.envelope_active)
return;
@@
-488,7
+488,7
@@
static void RedrawPlayfield_RND()
DrawAllPlayers();
}
DrawAllPlayers();
}
-void RedrawPlayfield()
+void RedrawPlayfield(
void
)
{
if (game_status != GAME_MODE_PLAYING)
return;
{
if (game_status != GAME_MODE_PLAYING)
return;
@@
-592,7
+592,7
@@
static void DrawMaskedBorderExt(int redraw_mask, int draw_target)
}
}
}
}
-void DrawMaskedBorder_FIELD()
+void DrawMaskedBorder_FIELD(
void
)
{
DrawMaskedBorderExt_FIELD(DRAW_TO_BACKBUFFER);
}
{
DrawMaskedBorderExt_FIELD(DRAW_TO_BACKBUFFER);
}
@@
-711,7
+711,7
@@
void BlitScreenToBitmap(Bitmap *target_bitmap)
redraw_mask |= REDRAW_FIELD;
}
redraw_mask |= REDRAW_FIELD;
}
-void DrawFramesPerSecond()
+void DrawFramesPerSecond(
void
)
{
char text[100];
int font_nr = FONT_TEXT_2;
{
char text[100];
int font_nr = FONT_TEXT_2;
@@
-737,7
+737,7
@@
void DrawFramesPerSecond()
}
#if DEBUG_FRAME_TIME
}
#if DEBUG_FRAME_TIME
-static void PrintFrameTimeDebugging()
+static void PrintFrameTimeDebugging(
void
)
{
static unsigned int last_counter = 0;
unsigned int counter = Counter();
{
static unsigned int last_counter = 0;
unsigned int counter = Counter();
@@
-790,7
+790,7
@@
static boolean equalRedrawMasks(int mask_1, int mask_2)
return unifiedRedrawMask(mask_1) == unifiedRedrawMask(mask_2);
}
return unifiedRedrawMask(mask_1) == unifiedRedrawMask(mask_2);
}
-void BackToFront()
+void BackToFront(
void
)
{
static int last_redraw_mask = REDRAW_NONE;
{
static int last_redraw_mask = REDRAW_NONE;
@@
-981,9
+981,11
@@
static void FadeExt(int fade_mask, int fade_mode, int fade_type)
draw_border_function);
redraw_mask &= ~fade_mask;
draw_border_function);
redraw_mask &= ~fade_mask;
+
+ ClearAutoRepeatKeyEvents();
}
}
-static void SetScreenStates_BeforeFadingIn()
+static void SetScreenStates_BeforeFadingIn(
void
)
{
// temporarily set screen mode for animations to screen after fading in
global.anim_status = global.anim_status_next;
{
// temporarily set screen mode for animations to screen after fading in
global.anim_status = global.anim_status_next;
@@
-996,7
+998,7
@@
static void SetScreenStates_BeforeFadingIn()
global.anim_status = GAME_MODE_PSEUDO_FADING;
}
global.anim_status = GAME_MODE_PSEUDO_FADING;
}
-static void SetScreenStates_AfterFadingIn()
+static void SetScreenStates_AfterFadingIn(
void
)
{
// store new source screen (to use correct masked border for fading)
gfx.fade_border_source_status = global.border_status;
{
// store new source screen (to use correct masked border for fading)
gfx.fade_border_source_status = global.border_status;
@@
-1004,7
+1006,7
@@
static void SetScreenStates_AfterFadingIn()
global.anim_status = global.anim_status_next;
}
global.anim_status = global.anim_status_next;
}
-static void SetScreenStates_BeforeFadingOut()
+static void SetScreenStates_BeforeFadingOut(
void
)
{
// store new target screen (to use correct masked border for fading)
gfx.fade_border_target_status = game_status;
{
// store new target screen (to use correct masked border for fading)
gfx.fade_border_target_status = game_status;
@@
-1017,7
+1019,7
@@
static void SetScreenStates_BeforeFadingOut()
PrepareFadeBitmap(DRAW_TO_FADE_SOURCE);
}
PrepareFadeBitmap(DRAW_TO_FADE_SOURCE);
}
-static void SetScreenStates_AfterFadingOut()
+static void SetScreenStates_AfterFadingOut(
void
)
{
global.border_status = game_status;
}
{
global.border_status = game_status;
}
@@
-1084,28
+1086,28
@@
static void FadeSetLeaveNext(struct TitleFadingInfo fading_leave, boolean set)
fading = fading_leave_stored;
}
fading = fading_leave_stored;
}
-void FadeSetEnterMenu()
+void FadeSetEnterMenu(
void
)
{
fading = menu.enter_menu;
FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */
}
{
fading = menu.enter_menu;
FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */
}
-void FadeSetLeaveMenu()
+void FadeSetLeaveMenu(
void
)
{
fading = menu.leave_menu;
FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */
}
{
fading = menu.leave_menu;
FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */
}
-void FadeSetEnterScreen()
+void FadeSetEnterScreen(
void
)
{
fading = menu.enter_screen[game_status];
FadeSetLeaveNext(menu.leave_screen[game_status], TRUE); /* store */
}
{
fading = menu.enter_screen[game_status];
FadeSetLeaveNext(menu.leave_screen[game_status], TRUE); /* store */
}
-void FadeSetNextScreen()
+void FadeSetNextScreen(
void
)
{
fading = menu.next_screen[game_status];
{
fading = menu.next_screen[game_status];
@@
-1113,7
+1115,7
@@
void FadeSetNextScreen()
// FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */
}
// FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */
}
-void FadeSetLeaveScreen()
+void FadeSetLeaveScreen(
void
)
{
FadeSetLeaveNext(menu.leave_screen[game_status], FALSE); /* recall */
}
{
FadeSetLeaveNext(menu.leave_screen[game_status], FALSE); /* recall */
}
@@
-1128,19
+1130,19
@@
void FadeSetFromType(int type)
FadeSetLeaveMenu();
}
FadeSetLeaveMenu();
}
-void FadeSetDisabled()
+void FadeSetDisabled(
void
)
{
static struct TitleFadingInfo fading_none = { FADE_MODE_NONE, -1, -1, -1 };
fading = fading_none;
}
{
static struct TitleFadingInfo fading_none = { FADE_MODE_NONE, -1, -1, -1 };
fading = fading_none;
}
-void FadeSkipNextFadeIn()
+void FadeSkipNextFadeIn(
void
)
{
FadeExt(0, FADE_MODE_SKIP_FADE_IN, FADE_TYPE_SKIP);
}
{
FadeExt(0, FADE_MODE_SKIP_FADE_IN, FADE_TYPE_SKIP);
}
-void FadeSkipNextFadeOut()
+void FadeSkipNextFadeOut(
void
)
{
FadeExt(0, FADE_MODE_SKIP_FADE_OUT, FADE_TYPE_SKIP);
}
{
FadeExt(0, FADE_MODE_SKIP_FADE_OUT, FADE_TYPE_SKIP);
}
@@
-1211,7
+1213,7
@@
void SetDoorBackgroundImage(int graphic)
SetDoorBackgroundBitmap(getBackgroundBitmap(graphic));
}
SetDoorBackgroundBitmap(getBackgroundBitmap(graphic));
}
-void SetPanelBackground()
+void SetPanelBackground(
void
)
{
struct GraphicInfo *gfx = &graphic_info[IMG_BACKGROUND_PANEL];
{
struct GraphicInfo *gfx = &graphic_info[IMG_BACKGROUND_PANEL];
@@
-1268,7
+1270,7
@@
static int vxsize_last = -1, vysize_last = -1;
static int ex_last = -1, ey_last = -1;
static int exsize_last = -1, eysize_last = -1;
static int ex_last = -1, ey_last = -1;
static int exsize_last = -1, eysize_last = -1;
-boolean CheckIfGlobalBorderHasChanged()
+boolean CheckIfGlobalBorderHasChanged(
void
)
{
// if game status has not changed, global border has not changed either
if (game_status == game_status_last)
{
// if game status has not changed, global border has not changed either
if (game_status == game_status_last)
@@
-1280,7
+1282,7
@@
boolean CheckIfGlobalBorderHasChanged()
return (global_border_bitmap_last != global_border_bitmap);
}
return (global_border_bitmap_last != global_border_bitmap);
}
-boolean CheckIfGlobalBorderRedrawIsNeeded()
+boolean CheckIfGlobalBorderRedrawIsNeeded(
void
)
{
// if game status has not changed, nothing has to be redrawn
if (game_status == game_status_last)
{
// if game status has not changed, nothing has to be redrawn
if (game_status == game_status_last)
@@
-1325,7
+1327,7
@@
void RedrawGlobalBorderFromBitmap(Bitmap *bitmap)
ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE);
}
ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE);
}
-void RedrawGlobalBorder()
+void RedrawGlobalBorder(
void
)
{
Bitmap *bitmap = getGlobalBorderBitmapFromStatus(game_status);
{
Bitmap *bitmap = getGlobalBorderBitmapFromStatus(game_status);
@@
-1336,7
+1338,7
@@
void RedrawGlobalBorder()
#define ONLY_REDRAW_GLOBAL_BORDER_IF_NEEDED 0
#define ONLY_REDRAW_GLOBAL_BORDER_IF_NEEDED 0
-static void RedrawGlobalBorderIfNeeded()
+static void RedrawGlobalBorderIfNeeded(
void
)
{
#if ONLY_REDRAW_GLOBAL_BORDER_IF_NEEDED
if (game_status == game_status_last)
{
#if ONLY_REDRAW_GLOBAL_BORDER_IF_NEEDED
if (game_status == game_status_last)
@@
-1415,7
+1417,7
@@
static void RedrawGlobalBorderIfNeeded()
eysize_last = EYSIZE;
}
eysize_last = EYSIZE;
}
-void ClearField()
+void ClearField(
void
)
{
RedrawGlobalBorderIfNeeded();
{
RedrawGlobalBorderIfNeeded();
@@
-1440,7
+1442,7
@@
void MarkTileDirty(int x, int y)
redraw_mask |= REDRAW_FIELD;
}
redraw_mask |= REDRAW_FIELD;
}
-void SetBorderElement()
+void SetBorderElement(
void
)
{
int x, y;
{
int x, y;
@@
-2800,6
+2802,8
@@
void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
}
SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
}
+
+ ClearAutoRepeatKeyEvents();
}
void ShowEnvelope(int envelope_nr)
}
void ShowEnvelope(int envelope_nr)
@@
-3083,6
+3087,8
@@
void AnimateEnvelopeRequest(int anim_mode, int action)
SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
}
SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
}
+
+ ClearAutoRepeatKeyEvents();
}
void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
}
void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
@@
-3504,7
+3510,7
@@
static void DrawPreviewLevelExt(boolean restart)
}
}
}
}
-void DrawPreviewPlayers()
+void DrawPreviewPlayers(
void
)
{
if (game_status != GAME_MODE_MAIN)
return;
{
if (game_status != GAME_MODE_MAIN)
return;
@@
-3579,13
+3585,13
@@
void DrawPreviewPlayers()
}
}
}
}
-void DrawPreviewLevelInitial()
+void DrawPreviewLevelInitial(
void
)
{
DrawPreviewLevelExt(TRUE);
DrawPreviewPlayers();
}
{
DrawPreviewLevelExt(TRUE);
DrawPreviewPlayers();
}
-void DrawPreviewLevelAnimation()
+void DrawPreviewLevelAnimation(
void
)
{
DrawPreviewLevelExt(FALSE);
}
{
DrawPreviewLevelExt(FALSE);
}
@@
-3623,7
+3629,7
@@
void DrawNetworkPlayersExt(boolean force)
struct TextPosInfo *pos = &menu.main.network_players;
int tile_size = pos->tile_size;
struct TextPosInfo *pos = &menu.main.network_players;
int tile_size = pos->tile_size;
- int border_size =
2
;
+ int border_size =
pos->border_size
;
int xoffset_text = tile_size + border_size;
int font_nr = pos->font;
int font_width = getFontWidth(font_nr);
int xoffset_text = tile_size + border_size;
int font_nr = pos->font;
int font_width = getFontWidth(font_nr);
@@
-3673,12
+3679,12
@@
void DrawNetworkPlayersExt(boolean force)
}
}
}
}
-void DrawNetworkPlayers()
+void DrawNetworkPlayers(
void
)
{
DrawNetworkPlayersExt(FALSE);
}
{
DrawNetworkPlayersExt(FALSE);
}
-void ClearNetworkPlayers()
+void ClearNetworkPlayers(
void
)
{
DrawNetworkPlayersExt(TRUE);
}
{
DrawNetworkPlayersExt(TRUE);
}
@@
-3820,7
+3826,7
@@
static boolean equalGraphics(int graphic1, int graphic2)
g1->anim_mode == g2->anim_mode);
}
g1->anim_mode == g2->anim_mode);
}
-void DrawAllPlayers()
+void DrawAllPlayers(
void
)
{
int i;
{
int i;
@@
-4171,7
+4177,7
@@
void DrawPlayer(struct PlayerInfo *player)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
-void WaitForEventToContinue()
+void WaitForEventToContinue(
void
)
{
boolean still_wait = TRUE;
{
boolean still_wait = TRUE;
@@
-4564,6
+4570,7
@@
static boolean RequestDoor(char *text, unsigned int req_state)
/* pause network game while waiting for request to answer */
if (network.enabled &&
game_status == GAME_MODE_PLAYING &&
/* pause network game while waiting for request to answer */
if (network.enabled &&
game_status == GAME_MODE_PLAYING &&
+ !AllPlayersGone &&
req_state & REQUEST_WAIT_FOR_INPUT)
SendToServer_PausePlaying();
req_state & REQUEST_WAIT_FOR_INPUT)
SendToServer_PausePlaying();
@@
-4704,6
+4711,7
@@
static boolean RequestDoor(char *text, unsigned int req_state)
/* continue network game after request */
if (network.enabled &&
game_status == GAME_MODE_PLAYING &&
/* continue network game after request */
if (network.enabled &&
game_status == GAME_MODE_PLAYING &&
+ !AllPlayersGone &&
req_state & REQUEST_WAIT_FOR_INPUT)
SendToServer_ContinuePlaying();
req_state & REQUEST_WAIT_FOR_INPUT)
SendToServer_ContinuePlaying();
@@
-4730,6
+4738,7
@@
static boolean RequestEnvelope(char *text, unsigned int req_state)
/* pause network game while waiting for request to answer */
if (network.enabled &&
game_status == GAME_MODE_PLAYING &&
/* pause network game while waiting for request to answer */
if (network.enabled &&
game_status == GAME_MODE_PLAYING &&
+ !AllPlayersGone &&
req_state & REQUEST_WAIT_FOR_INPUT)
SendToServer_PausePlaying();
req_state & REQUEST_WAIT_FOR_INPUT)
SendToServer_PausePlaying();
@@
-4787,6
+4796,7
@@
static boolean RequestEnvelope(char *text, unsigned int req_state)
/* continue network game after request */
if (network.enabled &&
game_status == GAME_MODE_PLAYING &&
/* continue network game after request */
if (network.enabled &&
game_status == GAME_MODE_PLAYING &&
+ !AllPlayersGone &&
req_state & REQUEST_WAIT_FOR_INPUT)
SendToServer_ContinuePlaying();
req_state & REQUEST_WAIT_FOR_INPUT)
SendToServer_ContinuePlaying();
@@
-4828,7
+4838,7
@@
static int compareDoorPartOrderInfo(const void *object1, const void *object2)
return compare_result;
}
return compare_result;
}
-void InitGraphicCompatibilityInfo_Doors()
+void InitGraphicCompatibilityInfo_Doors(
void
)
{
struct
{
{
struct
{
@@
-4985,7
+4995,7
@@
void InitGraphicCompatibilityInfo_Doors()
}
}
}
}
-void InitDoors()
+void InitDoors(
void
)
{
int i;
{
int i;
@@
-5050,7
+5060,7
@@
unsigned int CloseDoor(unsigned int door_state)
return MoveDoor(door_state);
}
return MoveDoor(door_state);
}
-unsigned int GetDoorState()
+unsigned int GetDoorState(
void
)
{
return MoveDoor(DOOR_GET_STATE);
}
{
return MoveDoor(DOOR_GET_STATE);
}
@@
-5419,10
+5429,12
@@
unsigned int MoveDoor(unsigned int door_state)
DrawMaskedBorder(REDRAW_DOOR_1);
DrawMaskedBorder(REDRAW_DOOR_2);
DrawMaskedBorder(REDRAW_DOOR_1);
DrawMaskedBorder(REDRAW_DOOR_2);
+ ClearAutoRepeatKeyEvents();
+
return (door1 | door2);
}
return (door1 | door2);
}
-static boolean useSpecialEditorDoor()
+static boolean useSpecialEditorDoor(
void
)
{
int graphic = IMG_GLOBAL_BORDER_EDITOR;
boolean redefined = getImageListEntryFromImageID(graphic)->redefined;
{
int graphic = IMG_GLOBAL_BORDER_EDITOR;
boolean redefined = getImageListEntryFromImageID(graphic)->redefined;
@@
-5445,7
+5457,7
@@
static boolean useSpecialEditorDoor()
return TRUE;
}
return TRUE;
}
-void DrawSpecialEditorDoor()
+void DrawSpecialEditorDoor(
void
)
{
struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION];
int top_border_width = gfx1->width;
{
struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION];
int top_border_width = gfx1->width;
@@
-5468,7
+5480,7
@@
void DrawSpecialEditorDoor()
redraw_mask |= REDRAW_ALL;
}
redraw_mask |= REDRAW_ALL;
}
-void UndrawSpecialEditorDoor()
+void UndrawSpecialEditorDoor(
void
)
{
struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION];
int top_border_width = gfx1->width;
{
struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION];
int top_border_width = gfx1->width;
@@
-5543,7
+5555,7
@@
static struct
}
};
}
};
-void CreateToolButtons()
+void CreateToolButtons(
void
)
{
int i;
{
int i;
@@
-5639,7
+5651,7
@@
void CreateToolButtons()
}
}
}
}
-void FreeToolButtons()
+void FreeToolButtons(
void
)
{
int i;
{
int i;
@@
-5647,7
+5659,7
@@
void FreeToolButtons()
FreeGadget(tool_gadget[i]);
}
FreeGadget(tool_gadget[i]);
}
-static void UnmapToolButtons()
+static void UnmapToolButtons(
void
)
{
int i;
{
int i;
@@
-8101,9
+8113,9
@@
int getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir)
return getBeltSwitchElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr);
}
return getBeltSwitchElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr);
}
-boolean getTeamMode_EM()
+boolean getTeamMode_EM(
void
)
{
{
- return game.team_mode;
+ return game.team_mode
|| network_playing
;
}
int getGameFrameDelay_EM(int native_em_game_frame_delay)
}
int getGameFrameDelay_EM(int native_em_game_frame_delay)
@@
-9157,7
+9169,7
@@
void PlayMenuSoundExt(int sound)
PlaySound(sound);
}
PlaySound(sound);
}
-void PlayMenuSound()
+void PlayMenuSound(
void
)
{
PlayMenuSoundExt(menu.sound[game_status]);
}
{
PlayMenuSoundExt(menu.sound[game_status]);
}
@@
-9190,7
+9202,7
@@
void PlayMenuSoundIfLoopExt(int sound)
PlaySoundLoop(sound);
}
PlaySoundLoop(sound);
}
-void PlayMenuSoundIfLoop()
+void PlayMenuSoundIfLoop(
void
)
{
PlayMenuSoundIfLoopExt(menu.sound[game_status]);
}
{
PlayMenuSoundIfLoopExt(menu.sound[game_status]);
}
@@
-9203,10
+9215,13
@@
void PlayMenuMusicExt(int music)
if (!setup.sound_music)
return;
if (!setup.sound_music)
return;
- PlayMusic(music);
+ if (IS_LOOP_MUSIC(music))
+ PlayMusicLoop(music);
+ else
+ PlayMusic(music);
}
}
-void PlayMenuMusic()
+void PlayMenuMusic(
void
)
{
char *curr_music = getCurrentlyPlayingMusicFilename();
char *next_music = getMusicInfoEntryFilename(menu.music[game_status]);
{
char *curr_music = getCurrentlyPlayingMusicFilename();
char *next_music = getMusicInfoEntryFilename(menu.music[game_status]);
@@
-9215,18
+9230,18
@@
void PlayMenuMusic()
PlayMenuMusicExt(menu.music[game_status]);
}
PlayMenuMusicExt(menu.music[game_status]);
}
-void PlayMenuSoundsAndMusic()
+void PlayMenuSoundsAndMusic(
void
)
{
PlayMenuSound();
PlayMenuMusic();
}
{
PlayMenuSound();
PlayMenuMusic();
}
-static void FadeMenuSounds()
+static void FadeMenuSounds(
void
)
{
FadeSounds();
}
{
FadeSounds();
}
-static void FadeMenuMusic()
+static void FadeMenuMusic(
void
)
{
char *curr_music = getCurrentlyPlayingMusicFilename();
char *next_music = getMusicInfoEntryFilename(menu.music[game_status]);
{
char *curr_music = getCurrentlyPlayingMusicFilename();
char *next_music = getMusicInfoEntryFilename(menu.music[game_status]);
@@
-9235,27
+9250,27
@@
static void FadeMenuMusic()
FadeMusic();
}
FadeMusic();
}
-void FadeMenuSoundsAndMusic()
+void FadeMenuSoundsAndMusic(
void
)
{
FadeMenuSounds();
FadeMenuMusic();
}
{
FadeMenuSounds();
FadeMenuMusic();
}
-void PlaySoundActivating()
+void PlaySoundActivating(
void
)
{
#if 0
PlaySound(SND_MENU_ITEM_ACTIVATING);
#endif
}
{
#if 0
PlaySound(SND_MENU_ITEM_ACTIVATING);
#endif
}
-void PlaySoundSelecting()
+void PlaySoundSelecting(
void
)
{
#if 0
PlaySound(SND_MENU_ITEM_SELECTING);
#endif
}
{
#if 0
PlaySound(SND_MENU_ITEM_SELECTING);
#endif
}
-void ToggleFullscreenOrChangeWindowScalingIfNeeded()
+void ToggleFullscreenOrChangeWindowScalingIfNeeded(
void
)
{
boolean change_fullscreen = (setup.fullscreen !=
video.fullscreen_enabled);
{
boolean change_fullscreen = (setup.fullscreen !=
video.fullscreen_enabled);
@@
-9374,12
+9389,19
@@
void SetFontStatus(int game_status_new)
}
}
}
}
-void ResetFontStatus()
+void ResetFontStatus(
void
)
{
SetFontStatus(-1);
}
{
SetFontStatus(-1);
}
-boolean CheckIfPlayfieldViewportHasChanged()
+void SetLevelSetInfo(char *identifier, int level_nr)
+{
+ setString(&levelset.identifier, identifier);
+
+ levelset.level_nr = level_nr;
+}
+
+boolean CheckIfPlayfieldViewportHasChanged(void)
{
// if game status has not changed, playfield viewport has not changed either
if (game_status == game_status_last)
{
// if game status has not changed, playfield viewport has not changed either
if (game_status == game_status_last)
@@
-9398,13
+9420,13
@@
boolean CheckIfPlayfieldViewportHasChanged()
new_full_sysize != FULL_SYSIZE);
}
new_full_sysize != FULL_SYSIZE);
}
-boolean CheckIfGlobalBorderOrPlayfieldViewportHasChanged()
+boolean CheckIfGlobalBorderOrPlayfieldViewportHasChanged(
void
)
{
return (CheckIfGlobalBorderHasChanged() ||
CheckIfPlayfieldViewportHasChanged());
}
{
return (CheckIfGlobalBorderHasChanged() ||
CheckIfPlayfieldViewportHasChanged());
}
-void ChangeViewportPropertiesIfNeeded()
+void ChangeViewportPropertiesIfNeeded(
void
)
{
boolean use_mini_tilesize = (level.game_engine_type == GAME_ENGINE_TYPE_MM ?
FALSE : setup.small_game_graphics);
{
boolean use_mini_tilesize = (level.game_engine_type == GAME_ENGINE_TYPE_MM ?
FALSE : setup.small_game_graphics);