projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4e98e5e
)
changed getting global border from game status to more generic approach
author
Holger Schemel
<info@artsoft.org>
Tue, 22 Mar 2016 09:07:02 +0000
(10:07 +0100)
committer
Holger Schemel
<info@artsoft.org>
Tue, 22 Mar 2016 09:07:02 +0000
(10:07 +0100)
src/tools.c
patch
|
blob
|
history
src/tools.h
patch
|
blob
|
history
diff --git
a/src/tools.c
b/src/tools.c
index cff76238c3b2f2c6db6fd6e6460aa885010e6951..053409c67ae6c09e139aa62d22617149e29cdc12 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-291,7
+291,7
@@
void RedrawPlayfield()
static void DrawMaskedBorderExt_Rect(int x, int y, int width, int height,
int draw_target)
{
static void DrawMaskedBorderExt_Rect(int x, int y, int width, int height,
int draw_target)
{
- Bitmap *bitmap = getGlobalBorderBitmapFrom
GameStatus(
);
+ Bitmap *bitmap = getGlobalBorderBitmapFrom
Status(global.border_status
);
if (x == -1 && y == -1)
return;
if (x == -1 && y == -1)
return;
@@
-833,14
+833,14
@@
Bitmap *getGlobalBorderBitmap(int graphic)
return getBitmapFromGraphicOrDefault(graphic, IMG_GLOBAL_BORDER);
}
return getBitmapFromGraphicOrDefault(graphic, IMG_GLOBAL_BORDER);
}
-Bitmap *getGlobalBorderBitmapFrom
GameStatus(
)
+Bitmap *getGlobalBorderBitmapFrom
Status(int status
)
{
int graphic =
{
int graphic =
- (
game_
status == GAME_MODE_MAIN ||
-
game_status == GAME_MODE_PSEUDO_TYPENAME
? IMG_GLOBAL_BORDER_MAIN :
-
game_status == GAME_MODE_SCORES
? IMG_GLOBAL_BORDER_SCORES :
-
game_status == GAME_MODE_EDITOR
? IMG_GLOBAL_BORDER_EDITOR :
-
game_status == GAME_MODE_PLAYING
? IMG_GLOBAL_BORDER_PLAYING :
+ (status == GAME_MODE_MAIN ||
+
status == GAME_MODE_PSEUDO_TYPENAME
? IMG_GLOBAL_BORDER_MAIN :
+
status == GAME_MODE_SCORES
? IMG_GLOBAL_BORDER_SCORES :
+
status == GAME_MODE_EDITOR
? IMG_GLOBAL_BORDER_EDITOR :
+
status == GAME_MODE_PLAYING
? IMG_GLOBAL_BORDER_PLAYING :
IMG_GLOBAL_BORDER);
return getGlobalBorderBitmap(graphic);
IMG_GLOBAL_BORDER);
return getGlobalBorderBitmap(graphic);
@@
-941,7
+941,7
@@
boolean CheckIfGlobalBorderHasChanged()
return FALSE;
// determine and store new global border bitmap for current game status
return FALSE;
// determine and store new global border bitmap for current game status
- global_border_bitmap = getGlobalBorderBitmapFrom
GameStatus(
);
+ global_border_bitmap = getGlobalBorderBitmapFrom
Status(game_status
);
return (global_border_bitmap_last != global_border_bitmap);
}
return (global_border_bitmap_last != global_border_bitmap);
}
@@
-988,7
+988,7
@@
void RedrawGlobalBorderFromBitmap(Bitmap *bitmap)
void RedrawGlobalBorder()
{
void RedrawGlobalBorder()
{
- Bitmap *bitmap = getGlobalBorderBitmapFrom
GameStatus(
);
+ Bitmap *bitmap = getGlobalBorderBitmapFrom
Status(game_status
);
RedrawGlobalBorderFromBitmap(bitmap);
RedrawGlobalBorderFromBitmap(bitmap);
diff --git
a/src/tools.h
b/src/tools.h
index 6aad5b75387c6f0fa211036796f9848ce21f85f9..d208383ac27f2ce9faee47e3248b68316d9f3f06 100644
(file)
--- a/
src/tools.h
+++ b/
src/tools.h
@@
-96,7
+96,7
@@
void FadeSetDisabled();
void FadeSkipNextFadeIn();
void FadeSkipNextFadeOut();
void FadeSkipNextFadeIn();
void FadeSkipNextFadeOut();
-Bitmap *getGlobalBorderBitmapFrom
GameStatus(
);
+Bitmap *getGlobalBorderBitmapFrom
Status(int
);
void ClearField();
void SetWindowBackgroundImageIfDefined(int);
void ClearField();
void SetWindowBackgroundImageIfDefined(int);