summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/viewgeom.cc
diff options
context:
space:
mode:
authorFlorian Diebold <flodiebold@gmail.com>2011-10-06 23:05:31 +0200
committerFlorian Diebold <flodiebold@gmail.com>2011-10-15 23:18:00 +0200
commit50c127e8ad514a2817be501f8bd2acbeb1bce4e4 (patch)
tree073e5b5af7dbe680202740922a66fcdd537c1b08 /crawl-ref/source/viewgeom.cc
parentcde49cf01ee4d1acf2a4c36050fbeb8c228d1606 (diff)
downloadcrawl-ref-50c127e8ad514a2817be501f8bd2acbeb1bce4e4.tar.gz
crawl-ref-50c127e8ad514a2817be501f8bd2acbeb1bce4e4.zip
Make Webtiles output happen in parallel to the console display, and make the server record ttyrecs.
Crawl compiled with WEBTILES=y should now be playable normally (i.e. indistinguishable from one compiled without WEBTILES) when run from a terminal. (This is not yet completely the case.) The Webtiles data is written on a Unix-domain datagram socket; the Crawl parameter -webtiles-socket determines a path on which the Crawl process receives control messages. The Webtiles server then runs Crawl in a pseudo-terminal and records its console output into a ttyrec file. The goal of all this is of course to be able to watch Webtiles games from ssh, and later the reverse.
Diffstat (limited to 'crawl-ref/source/viewgeom.cc')
-rw-r--r--crawl-ref/source/viewgeom.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/viewgeom.cc b/crawl-ref/source/viewgeom.cc
index d816dbbf3b..759578c023 100644
--- a/crawl-ref/source/viewgeom.cc
+++ b/crawl-ref/source/viewgeom.cc
@@ -51,7 +51,7 @@ class _layout
#pragma GCC diagnostic ignored "-Wstrict-overflow"
void _assert_validity() const
{
-#ifndef USE_TILE
+#ifndef USE_TILE_LOCAL
// Check that all the panes fit in the view.
ASSERT((viewp+viewsz - termp).x <= termsz.x);
ASSERT((viewp+viewsz - termp).y <= termsz.y);
@@ -378,7 +378,7 @@ void crawl_view_geometry::init_geometry()
const _inline_layout lay_inline(termsz, hudsz);
const _mlist_col_layout lay_mlist(termsz, hudsz);
-#ifndef USE_TILE
+#ifndef USE_TILE_LOCAL
if ((termsz.x < MIN_COLS || termsz.y < MIN_LINES || !lay_inline.valid)
&& !crawl_state.need_save)
{
@@ -405,7 +405,7 @@ void crawl_view_geometry::init_geometry()
mlistp = winner->mlistp;
mlistsz = winner->mlistsz;
-#ifdef USE_TILE
+#ifdef USE_TILE_LOCAL
// libgui may redefine these based on its own settings.
gui_init_view_params(*this);
#endif