diff options
| author | Pekka Lampila <pekka.lampila@iki.fi> | 2013-10-18 22:11:37 +0300 |
|---|---|---|
| committer | Pekka Lampila <pekka.lampila@iki.fi> | 2013-10-18 22:12:57 +0300 |
| commit | a5d3c69d9522bc4b72ad8d3d0ab473ab1fcb418a (patch) | |
| tree | e28a56cbfe3c0cd69d8524b94bb14b3a6fb9cc39 /crawl-ref/source/tileweb.cc | |
| parent | 49704efeba306b120ebe06da4e4277c1ebc3f497 (diff) | |
| download | crawl-ref-a5d3c69d9522bc4b72ad8d3d0ab473ab1fcb418a.tar.gz crawl-ref-a5d3c69d9522bc4b72ad8d3d0ab473ab1fcb418a.zip | |
Revert "Only send the game state to the joining spectator"
This reverts commit 06ee7f8badf1e19f333e918a572bafb5a23317f8.
Conflicts:
crawl-ref/source/webserver/process_handler.py
crawl-ref/source/webserver/ws_handler.py
My approach here was flawed, and joining spectators could cause
glitches for the player and existing spectators.
Diffstat (limited to 'crawl-ref/source/tileweb.cc')
| -rw-r--r-- | crawl-ref/source/tileweb.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crawl-ref/source/tileweb.cc b/crawl-ref/source/tileweb.cc index 43de639c1f..6f88dadb13 100644 --- a/crawl-ref/source/tileweb.cc +++ b/crawl-ref/source/tileweb.cc @@ -240,12 +240,9 @@ void TilesFramework::send_message(const char *format, ...) finish_message(); } -void TilesFramework::flush_messages(bool joining_only) +void TilesFramework::flush_messages() { - if (joining_only) - send_message("*{\"msg\":\"flush_messages\",\"joining_only\":true}"); - else - send_message("*{\"msg\":\"flush_messages\"}"); + send_message("*{\"msg\":\"flush_messages\"}"); } void TilesFramework::_await_connection() @@ -309,9 +306,8 @@ wint_t TilesFramework::_handle_control_message(sockaddr_un addr, string data) } else if (msgtype == "spectator_joined") { - flush_messages(); _send_everything(); - flush_messages(true); + flush_messages(); } else if (msgtype == "menu_scroll") { |