Skip to content
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 maprotation condition #1145

Merged
merged 1 commit into from Jan 4, 2020
Merged

fix maprotation condition #1145

merged 1 commit into from Jan 4, 2020

Conversation

@Gireen
Copy link
Member

Gireen commented Dec 26, 2019

possible fix for #1142

@illwieckz illwieckz added the T-Bug label Dec 26, 2019
@illwieckz

This comment has been minimized.

Copy link
Member

illwieckz commented Dec 26, 2019

On that topic (but that would be another PR), I would like to be able to ship multiple layouts in a map dpk archive, and be able to load them. I would even like to be able to override the builtin bsp layout (in that case, asking for builtin would load the one named default in dpk), that would make entity editing and buildable placement an easy job: just create a map with almost nothing, load in engine, make a layout, dump the layout, store it in dpk and voilà.

@Gireen

This comment has been minimized.

Copy link
Member Author

Gireen commented Dec 26, 2019

that is already mostly possible, layouts can be shipped with maps (see parpax mini)
and with #1144 you can set the default layout. What would be needed is a way to distinguish between builtin-default and server default

@illwieckz

This comment has been minimized.

Copy link
Member

illwieckz commented Dec 26, 2019

hmm, I wanted to write this comment in the #1144 thread, oops 🤭

src/sgame/sg_maprotation.cpp Show resolved Hide resolved
src/sgame/sg_maprotation.cpp Outdated Show resolved Hide resolved
@illwieckz

This comment has been minimized.

Copy link
Member

illwieckz commented Dec 29, 2019

My server is currently using this code and it works, and I see no unattended side effect.

See #1146 for an issue that make this code not really useful: numClients currently count bots…

@Gireen Gireen force-pushed the Gireen:maprotation branch from 2bdc5e0 to c84696a Dec 31, 2019
@illwieckz illwieckz merged commit e66d274 into Unvanquished:master Jan 4, 2020
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.