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 "-Wmissing-prototypes")
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index 7321731c75110895a24c6c0380a5036cdf338ee2..64f67a179593cbd844576d746892c5a9fc17d489 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-116,7
+116,7
@@
void InitNetworkInfo(boolean enabled, boolean connected, boolean serveronly,
network.server_port = server_port;
}
network.server_port = server_port;
}
-void InitScoresInfo()
+void InitScoresInfo(
void
)
{
char *global_scores_dir = getPath2(getCommonDataDir(), SCORES_DIRECTORY);
{
char *global_scores_dir = getPath2(getCommonDataDir(), SCORES_DIRECTORY);
@@
-143,7
+143,7
@@
void InitScoresInfo()
free(global_scores_dir);
}
free(global_scores_dir);
}
-void SetWindowTitle()
+void SetWindowTitle(
void
)
{
program.window_title = program.window_title_function();
{
program.window_title = program.window_title_function();
@@
-307,7
+307,7
@@
void InitGfxDrawTileCursorFunction(void (*draw_tile_cursor_function)(int))
gfx.draw_tile_cursor_function = draw_tile_cursor_function;
}
gfx.draw_tile_cursor_function = draw_tile_cursor_function;
}
-void InitGfxCustomArtworkInfo()
+void InitGfxCustomArtworkInfo(
void
)
{
gfx.override_level_graphics = FALSE;
gfx.override_level_sounds = FALSE;
{
gfx.override_level_graphics = FALSE;
gfx.override_level_sounds = FALSE;
@@
-316,12
+316,12
@@
void InitGfxCustomArtworkInfo()
gfx.draw_init_text = TRUE;
}
gfx.draw_init_text = TRUE;
}
-void InitGfxOtherSettings()
+void InitGfxOtherSettings(
void
)
{
gfx.cursor_mode = CURSOR_DEFAULT;
}
{
gfx.cursor_mode = CURSOR_DEFAULT;
}
-void InitTileCursorInfo()
+void InitTileCursorInfo(
void
)
{
tile_cursor.enabled = FALSE;
tile_cursor.active = FALSE;
{
tile_cursor.enabled = FALSE;
tile_cursor.active = FALSE;
@@
-338,7
+338,7
@@
void InitTileCursorInfo()
tile_cursor.sy = 0;
}
tile_cursor.sy = 0;
}
-void InitOverlayInfo()
+void InitOverlayInfo(
void
)
{
int nr = GRID_ACTIVE_NR();
int x, y;
{
int nr = GRID_ACTIVE_NR();
int x, y;
@@
-425,7
+425,7
@@
void SetOverlayShowGrid(boolean show_grid)
SetOverlayEnabled(TRUE);
}
SetOverlayEnabled(TRUE);
}
-boolean GetOverlayActive()
+boolean GetOverlayActive(
void
)
{
return overlay.active;
}
{
return overlay.active;
}
@@
-435,7
+435,7
@@
void SetDrawDeactivationMask(int draw_deactivation_mask)
gfx.draw_deactivation_mask = draw_deactivation_mask;
}
gfx.draw_deactivation_mask = draw_deactivation_mask;
}
-int GetDrawDeactivationMask()
+int GetDrawDeactivationMask(
void
)
{
return gfx.draw_deactivation_mask;
}
{
return gfx.draw_deactivation_mask;
}
@@
-445,7
+445,7
@@
void SetDrawBackgroundMask(int draw_background_mask)
gfx.draw_background_mask = draw_background_mask;
}
gfx.draw_background_mask = draw_background_mask;
}
-void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
+
static
void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
{
if (background_bitmap_tile != NULL)
gfx.background_bitmap_mask |= mask;
{
if (background_bitmap_tile != NULL)
gfx.background_bitmap_mask |= mask;
@@
-659,9
+659,11
@@
void ReCreateBitmap(Bitmap **bitmap, int width, int height)
}
}
}
}
-void CloseWindow(DrawWindow *window)
+#if 0
+static void CloseWindow(DrawWindow *window)
{
}
{
}
+#endif
void SetRedrawMaskFromArea(int x, int y, int width, int height)
{
void SetRedrawMaskFromArea(int x, int y, int width, int height)
{
@@
-709,7
+711,7
@@
inline static boolean CheckDrawingArea(int x, int y, int width, int height,
return FALSE;
}
return FALSE;
}
-boolean DrawingDeactivatedField()
+boolean DrawingDeactivatedField(
void
)
{
if (program.headless)
return TRUE;
{
if (program.headless)
return TRUE;
@@
-1018,8
+1020,8
@@
void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL);
}
SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL);
}
-void DrawLine(Bitmap *bitmap, int from_x, int from_y,
- int to_x, int to_y, Pixel pixel, int line_width)
+
static
void DrawLine(Bitmap *bitmap, int from_x, int from_y,
+
int to_x, int to_y, Pixel pixel, int line_width)
{
int x, y;
{
int x, y;
@@
-1120,7
+1122,7
@@
void SetVideoFrameDelay(unsigned int frame_delay_value)
video.frame_delay_value = frame_delay_value;
}
video.frame_delay_value = frame_delay_value;
}
-unsigned int GetVideoFrameDelay()
+unsigned int GetVideoFrameDelay(
void
)
{
return video.frame_delay_value;
}
{
return video.frame_delay_value;
}
@@
-1388,7
+1390,13
@@
static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
free_old_bitmap = FALSE;
if (free_old_bitmap)
free_old_bitmap = FALSE;
if (free_old_bitmap)
+ {
+ /* copy image filename from old to new standard sized bitmap */
+ bitmaps[IMG_BITMAP_STANDARD]->source_filename =
+ getStringCopy(old_bitmap->source_filename);
+
FreeBitmap(old_bitmap);
FreeBitmap(old_bitmap);
+ }
}
else
{
}
else
{
@@
-1713,12
+1721,12
@@
KeyMod HandleKeyModState(Key key, int key_status)
return current_modifiers;
}
return current_modifiers;
}
-KeyMod GetKeyModState()
+KeyMod GetKeyModState(
void
)
{
return (KeyMod)SDL_GetModState();
}
{
return (KeyMod)SDL_GetModState();
}
-KeyMod GetKeyModStateFromEvents()
+KeyMod GetKeyModStateFromEvents(
void
)
{
/* always use key modifier state as tracked from key events (this is needed
if the modifier key event was injected into the event queue, but the key
{
/* always use key modifier state as tracked from key events (this is needed
if the modifier key event was injected into the event queue, but the key
@@
-1745,7
+1753,7
@@
void StartTextInput(int x, int y, int width, int height)
#endif
}
#endif
}
-void StopTextInput()
+void StopTextInput(
void
)
{
#if defined(TARGET_SDL2)
#if defined(HAS_SCREEN_KEYBOARD)
{
#if defined(TARGET_SDL2)
#if defined(HAS_SCREEN_KEYBOARD)
@@
-1774,7
+1782,7
@@
boolean CheckCloseWindowEvent(ClientMessageEvent *event)
/* joystick functions */
/* ========================================================================= */
/* joystick functions */
/* ========================================================================= */
-void InitJoysticks()
+void InitJoysticks(
void
)
{
int i;
{
int i;
@@
-1800,7
+1808,7
@@
boolean CheckJoystickOpened(int nr)
return SDLCheckJoystickOpened(nr);
}
return SDLCheckJoystickOpened(nr);
}
-void ClearJoystickState()
+void ClearJoystickState(
void
)
{
SDLClearJoystickState();
}
{
SDLClearJoystickState();
}