projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added functions for integer hash keys
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index cdb7b4cb70bc20bf5a75af60be8df3387c9f7890..0b0b7e2ee1e2b5938dfb2e9bb4e7854087019e19 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-500,7
+500,9
@@
void RedrawPlayfield(void)
if (game_status != GAME_MODE_PLAYING)
return;
if (game_status != GAME_MODE_PLAYING)
return;
- if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+ if (level.game_engine_type == GAME_ENGINE_TYPE_BD)
+ RedrawPlayfield_BD(TRUE);
+ else if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
RedrawPlayfield_EM(TRUE);
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
RedrawPlayfield_SP(TRUE);
RedrawPlayfield_EM(TRUE);
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
RedrawPlayfield_SP(TRUE);
@@
-668,7
+670,9
@@
void BlitScreenToBitmap_RND(Bitmap *target_bitmap)
void BlitScreenToBitmap(Bitmap *target_bitmap)
{
void BlitScreenToBitmap(Bitmap *target_bitmap)
{
- if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+ if (level.game_engine_type == GAME_ENGINE_TYPE_BD)
+ BlitScreenToBitmap_BD(target_bitmap);
+ else if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
BlitScreenToBitmap_EM(target_bitmap);
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
BlitScreenToBitmap_SP(target_bitmap);
BlitScreenToBitmap_EM(target_bitmap);
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
BlitScreenToBitmap_SP(target_bitmap);
@@
-1026,6
+1030,10
@@
void FadeOut(int fade_mask)
fade_type_skip != FADE_MODE_SKIP_FADE_OUT)
BackToFront();
fade_type_skip != FADE_MODE_SKIP_FADE_OUT)
BackToFront();
+ // when using BD game engine, cover playfield before fading out after a game
+ if (game_bd.cover_screen)
+ CoverScreen_BD();
+
SetScreenStates_BeforeFadingOut();
SetTileCursorActive(FALSE);
SetScreenStates_BeforeFadingOut();
SetTileCursorActive(FALSE);
@@
-9678,7
+9686,9
@@
boolean isActivePlayer_EM(int player_nr)
unsigned int InitRND(int seed)
{
unsigned int InitRND(int seed)
{
- if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+ if (level.game_engine_type == GAME_ENGINE_TYPE_BD)
+ return InitEngineRandom_BD(seed);
+ else if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
return InitEngineRandom_EM(seed);
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
return InitEngineRandom_SP(seed);
return InitEngineRandom_EM(seed);
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
return InitEngineRandom_SP(seed);
@@
-11307,9
+11317,9
@@
static unsigned int test_uuid_random_function_better(int max)
static void TestGeneratingUUIDs_RunTest(int nr, int always_seed, int num_uuids)
{
struct hashtable *hash_seeds =
static void TestGeneratingUUIDs_RunTest(int nr, int always_seed, int num_uuids)
{
struct hashtable *hash_seeds =
- create_hashtable(16, 0.75, get_hash_from_
key, hash_key
s_are_equal);
+ create_hashtable(16, 0.75, get_hash_from_
string, hash_key_string
s_are_equal);
struct hashtable *hash_uuids =
struct hashtable *hash_uuids =
- create_hashtable(16, 0.75, get_hash_from_
key, hash_key
s_are_equal);
+ create_hashtable(16, 0.75, get_hash_from_
string, hash_key_string
s_are_equal);
static char message[100];
int i;
static char message[100];
int i;