summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/format.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-25 18:11:54 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-25 18:11:54 +0000
commit32a6373c7a8072bfcb4567417f82f700084b6ab8 (patch)
tree248900b93f0f79c36123dc92364ccf9b0db3bcee /crawl-ref/source/format.cc
parent0136740f19467e681f934718d109748458fa49c6 (diff)
downloadcrawl-ref-32a6373c7a8072bfcb4567417f82f700084b6ab8.tar.gz
crawl-ref-32a6373c7a8072bfcb4567417f82f700084b6ab8.zip
Fix collision between gotoxy(int,int,int) and DOS djgpp gotoxy().
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3337 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/format.cc')
-rw-r--r--crawl-ref/source/format.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/format.cc b/crawl-ref/source/format.cc
index 7d529315a3..9ac2cc71d2 100644
--- a/crawl-ref/source/format.cc
+++ b/crawl-ref/source/format.cc
@@ -51,7 +51,7 @@ formatted_string formatted_string::parse_block(
{
// Artificial newline - some terms erase to eol when printing a
// newline.
- fs.gotoxy(1, -1); // CR
+ fs.cgotoxy(1, -1); // CR
fs.movexy(0, 1); // LF
}
fs += parse_string(lines[i], eol_ends_format, process);
@@ -275,7 +275,7 @@ void formatted_string::display(int s, int e) const
ops[i].display();
}
-void formatted_string::gotoxy(int x, int y)
+void formatted_string::cgotoxy(int x, int y)
{
ops.push_back( fs_op(x, y) );
}
@@ -368,7 +368,7 @@ void formatted_string::fs_op::display() const
if (cy == -1)
cy = wherey();
}
- ::gotoxy(cx, cy);
+ ::cgotoxy(cx, cy);
break;
}
case FSOP_COLOUR: