diff options
| author | Florian Diebold <flodiebold@gmail.com> | 2012-11-14 19:59:46 +0100 |
|---|---|---|
| committer | Florian Diebold <flodiebold@gmail.com> | 2012-11-14 20:02:44 +0100 |
| commit | b0df2b25b2c3b0232a0ace8dcd06b1bb15e69d7a (patch) | |
| tree | 08bbae956110f6d962ab52041ba7e3070641f084 /crawl-ref/source/tileweb-text.cc | |
| parent | 68bdec137909c3b2cdb8f57b60552cc0b8fd0ff0 (diff) | |
| download | crawl-ref-b0df2b25b2c3b0232a0ace8dcd06b1bb15e69d7a.tar.gz crawl-ref-b0df2b25b2c3b0232a0ace8dcd06b1bb15e69d7a.zip | |
Webtiles: Improve JSON generation functions; always send proper JSON.
Diffstat (limited to 'crawl-ref/source/tileweb-text.cc')
| -rw-r--r-- | crawl-ref/source/tileweb-text.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/crawl-ref/source/tileweb-text.cc b/crawl-ref/source/tileweb-text.cc index 84faad14f5..3dcd349184 100644 --- a/crawl-ref/source/tileweb-text.cc +++ b/crawl-ref/source/tileweb-text.cc @@ -172,19 +172,23 @@ void WebTextArea::send(bool force) { if (!sending) { - tiles.write_message("{msg:'txt',id:'%s'", + tiles.write_message("{\"msg\":\"txt\",\"id\":\"%s\"", m_client_side_name.c_str()); if (force) - tiles.write_message(",clear:1"); - tiles.write_message(",lines:{"); + tiles.write_message(",\"clear\":true"); + tiles.write_message(",\"lines\":{"); sending = true; } - tiles.write_message("%u:\"%s\",", y, html.c_str()); + tiles.json_write_comma(); + tiles.write_message("\"%u\":\"%s\"", y, html.c_str()); } } if (sending) - tiles.send_message("}}"); + { + tiles.write_message("}}"); + tiles.finish_message(); + } } void WebTextArea::on_resize() |