projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with not recognizing ".mode_loop: false" for music
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index c14445814bdcce85ab0ab3fd4e7b2f1090cf71e9..a11f692eb2d66a2abd495ceab77017d10b0de2ca 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-8115,7
+8115,7
@@
int getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir)
boolean getTeamMode_EM()
{
boolean getTeamMode_EM()
{
- 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)
@@
-9215,7
+9215,10
@@
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()
@@
-9391,6
+9394,13
@@
void ResetFontStatus()
SetFontStatus(-1);
}
SetFontStatus(-1);
}
+void SetLevelSetInfo(char *identifier, int level_nr)
+{
+ setString(&levelset.identifier, identifier);
+
+ levelset.level_nr = level_nr;
+}
+
boolean CheckIfPlayfieldViewportHasChanged()
{
// if game status has not changed, playfield viewport has not changed either
boolean CheckIfPlayfieldViewportHasChanged()
{
// if game status has not changed, playfield viewport has not changed either