diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-25 18:11:54 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-25 18:11:54 +0000 |
commit | 32a6373c7a8072bfcb4567417f82f700084b6ab8 (patch) | |
tree | 248900b93f0f79c36123dc92364ccf9b0db3bcee /crawl-ref/source/libw32c.cc | |
parent | 0136740f19467e681f934718d109748458fa49c6 (diff) | |
download | crawl-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/libw32c.cc')
-rw-r--r-- | crawl-ref/source/libw32c.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/libw32c.cc b/crawl-ref/source/libw32c.cc index 786d50f17d..db758eee12 100644 --- a/crawl-ref/source/libw32c.cc +++ b/crawl-ref/source/libw32c.cc @@ -151,7 +151,7 @@ void writeChar(char c) bFlush(); // reposition - gotoxy(1, cy+2); + cgotoxy(1, cy+2); return; } @@ -458,7 +458,7 @@ void _setcursortype_internal(bool curstype) // now, if we just changed from NOCURSOR to CURSOR, // actually move screen cursor if (cursor_is_enabled) - gotoxy(cx+1, cy+1); + cgotoxy(cx+1, cy+1); } // This will force the cursor down to the next line. @@ -498,7 +498,7 @@ void clrscr(void) WriteConsoleOutput(outbuf, screen, screensize, source, &target); // reset cursor to 1,1 for convenience - gotoxy(1,1); + cgotoxy(1,1); } void gotoxy_sys(int x, int y) @@ -603,7 +603,7 @@ static void scroll_message_window() // Cursor also scrolls up so prompts don't look brain-damaged. if (wherey() == screensize.Y) - gotoxy(wherex(), wherey() - 1); + cgotoxy(wherex(), wherey() - 1); } void message_out(int which_line, int colour, const char *s, int firstcol, @@ -612,7 +612,7 @@ void message_out(int which_line, int colour, const char *s, int firstcol, if (!firstcol) firstcol = Options.delay_message_clear? 2 : 1; - gotoxy(firstcol - 1 + crawl_view.msgp.x, + cgotoxy(firstcol - 1 + crawl_view.msgp.x, which_line + crawl_view.msgp.y); textcolor(colour); @@ -998,7 +998,7 @@ void puttext(int x1, int y1, int x2, int y2, const screen_buffer_t *buf) { for (int y = y1; y <= y2; ++y) { - gotoxy(x1, y); + cgotoxy(x1, y); for (int x = x1; x <= x2; x++) { textattr( buf[1] ); |