[Commits] [wesnoth/wesnoth] 56e685: fixup server controller tweaks, dont tweak host
GitHub
noreply at github.com
Sun Oct 25 10:02:02 UTC 2015
Branch: refs/heads/master
Home: https://github.com/wesnoth/wesnoth
Commit: 56e685b7e0560a275ee63eef5930a5022b44da9a
https://github.com/wesnoth/wesnoth/commit/56e685b7e0560a275ee63eef5930a5022b44da9a
Author: Chris Beck <render787 at gmail.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
fixup server controller tweaks, dont tweak host
In 1.11.x cycle, we moved all "client-side controller tweaks" to
be effected by the server, so that clients won't on their own
change the data they find in a level config at game start. This
had some benefits:
- Only host and server are ever modifying the level data
- Easier to keep observers and clients synced correctly
- Easier to change client behavior with server side patches
The server-sided tweaks happened at the following point in time:
1. Host clicks start game button, a [start] signal is sent to
server.
2. Server now checks the level config and tries to make sense of
it, making sure every side has an owner and such. Then it issues
controller change commands to all clients, making sure they match
its picture of what is going on.
3. Server passes the [start] signal on to the other clients.
This introduced some bad behaviors, however, because the host
does not wait to recieve [start] and instead goes right into the
game.
- When host gets controller change signals for AIs it controls, it
would overwrite the names of their leaders with the host names.
(bug #23021)
- It would cause some GUI flashing at game start for the host
(bug #21156)
In this commit, we make sure not to send controller tweak messages
to the host about sides that it controls.
We still may send messages to the host about sides it doesn't
control. If there is the possibility that a game may start and
an AI side is assigned to someone other than the host, then this
commit won't fix the resulting renaming problems. (However afaik
that cannot happen at this revision.)
Conflicts:
src/server/game.cpp
Commit: 8c4febad76a3e56286b3c029a36974068ee2b87c
https://github.com/wesnoth/wesnoth/commit/8c4febad76a3e56286b3c029a36974068ee2b87c
Author: Charles Dang <exodia339 at gmail.com>
Date: 2015-10-25 (Sun, 25 Oct 2015)
Changed paths:
M src/server/game.cpp
Log Message:
-----------
Merge pull request #380 from cbeck88/fixup_server_controller_tweaks
fixup server controller tweaks, dont tweak host
Compare: https://github.com/wesnoth/wesnoth/compare/9ad56b8d8880...8c4febad76a3
More information about the Commits
mailing list