Skip to content

Commit eba1365

Browse files
committed
Code improvements in GameSession class
[ci skip]
1 parent 13785f0 commit eba1365

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

src/supertux/game_session.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,12 @@ GameSession::reset_level()
127127
void
128128
GameSession::on_player_added(int id)
129129
{
130-
if (m_savegame.get_player_status().m_num_players <= id)
131-
m_savegame.get_player_status().add_player();
130+
auto& player_status = m_savegame.get_player_status();
131+
if (player_status.m_num_players <= id)
132+
player_status.add_player();
132133

133134
// ID = 0 is impossible, so no need to write `(id == 0) ? "" : ...`
134-
auto& player = m_currentsector->add<Player>(m_savegame.get_player_status(), "Tux" + std::to_string(id + 1), id);
135+
auto& player = m_currentsector->add<Player>(player_status, "Tux" + std::to_string(id + 1), id);
135136

136137
player.multiplayer_prepare_spawn();
137138
}
@@ -262,21 +263,22 @@ GameSession::restart_level(bool after_death, bool preserve_music)
262263
if (!preserve_music)
263264
{
264265
auto& music_object = m_currentsector->get_singleton_by_type<MusicObject>();
265-
if (after_death == true) {
266+
if (after_death == true)
267+
{
266268
music_object.resume_music();
267-
} else {
269+
}
270+
else
271+
{
268272
SoundManager::current()->stop_music();
269273
music_object.play_music(LEVEL_MUSIC);
270274
}
271275
}
272276

273277
auto level_times = m_currentsector->get_objects_by_type<LevelTime>();
274-
auto it = level_times.begin();
275278

276-
while (it != level_times.end())
279+
for(auto& level_time : level_times)
277280
{
278-
it->set_time(it->get_time() - m_play_time);
279-
it++;
281+
level_time.set_time(level_time.get_time() - m_play_time);
280282
}
281283
}
282284

0 commit comments

Comments
 (0)