/teeworlds

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix change_map command not always changing (close #1841) #1871

Merged
merged 3 commits into from Dec 16, 2018

Conversation

Reviewers

@oy oy

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@sepulzera @fokkonaut @Dune-jr @oy
@sepulzera
Copy link
Contributor

sepulzera commented Dec 15, 2018

After applying this PR, the change_map command will work even

  • when in warmup
  • when the map is not finished (sv_matches_per_map)

As this is my first PR for teeworlds, I hope to satisfy the code guidelines and quality standard :-)

sepulzera added some commits Dec 14, 2018

@sepulzera
Fix CycleMap end map matches
9adb31d
@sepulzera
Fix change_map command not always changing (close #1841) 
After applying this commit, the change_map command will work even
- when in warmup
- when the map is not finished (sv_matches_per_map)
Loading status checks…
82ac68b
@fokkonaut

This comment has been minimized.

Sign in to view
Copy link
Contributor

fokkonaut commented Dec 15, 2018

just remove that command, we have sv_map.
@Dune-jr

This comment has been minimized.

Sign in to view
Copy link
Member

Dune-jr commented Dec 15, 2018

Seems good.
I wouldn't mind change_map to no longer work with a parameter though.
@oy

oy reviewed Dec 15, 2018
View changes

src/game/server/gamecontroller.cpp Outdated
if(m_MatchCount >= m_GameInfo.m_MatchNum-1)
{
CycleMap();
break;

This comment has been minimized.

Sign in to view
Copy link
@oy

oy Dec 15, 2018

Member

this breaks the game in case sv_maprotation is empty.

This comment has been minimized.

Sign in to view
Copy link
@sepulzera

sepulzera Dec 16, 2018

Contributor

Thanks for the nice catch, oy!
I removed the break, now it works as intended, with and without sv_maprotation being set.

@oy oy merged commit 5ec0efd into teeworlds:master Dec 16, 2018
1 check passed

1 check passed

ci/circleci Your tests passed on CircleCI!
Details

@sepulzera sepulzera deleted the sepulzera:fix-1841 branch Dec 16, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment