From 32a6373c7a8072bfcb4567417f82f700084b6ab8 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Fri, 25 Jan 2008 18:11:54 +0000 Subject: 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 --- crawl-ref/source/view.cc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'crawl-ref/source/view.cc') diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 3a26d599d4..67755afb61 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -2466,26 +2466,26 @@ void draw_border(void) clrscr(); redraw_skill( you.your_name, player_title() ); - gotoxy(1, 2, GOTO_STAT); + cgotoxy(1, 2, GOTO_STAT); cprintf( "%s %s", species_name( you.species, you.experience_level ).c_str(), (you.wizard ? "*WIZARD*" : "" ) ); - gotoxy(1, 3, GOTO_STAT); cprintf("HP:"); - gotoxy(1, 4, GOTO_STAT); cprintf("Magic:"); - gotoxy(1, 5, GOTO_STAT); cprintf("AC:"); - gotoxy(1, 6, GOTO_STAT); cprintf("EV:"); - gotoxy(1, 7, GOTO_STAT); cprintf("Str:"); - gotoxy(1, 8, GOTO_STAT); cprintf("Int:"); - gotoxy(1, 9, GOTO_STAT); cprintf("Dex:"); - gotoxy(1, 10, GOTO_STAT); cprintf("Gold:"); + cgotoxy(1, 3, GOTO_STAT); cprintf("HP:"); + cgotoxy(1, 4, GOTO_STAT); cprintf("Magic:"); + cgotoxy(1, 5, GOTO_STAT); cprintf("AC:"); + cgotoxy(1, 6, GOTO_STAT); cprintf("EV:"); + cgotoxy(1, 7, GOTO_STAT); cprintf("Str:"); + cgotoxy(1, 8, GOTO_STAT); cprintf("Int:"); + cgotoxy(1, 9, GOTO_STAT); cprintf("Dex:"); + cgotoxy(1, 10, GOTO_STAT); cprintf("Gold:"); if (Options.show_turns) { - gotoxy(1 + 15, 10, GOTO_STAT); + cgotoxy(1 + 15, 10, GOTO_STAT); cprintf("Turn:"); } - gotoxy(1, 11, GOTO_STAT); cprintf("Experience:"); - gotoxy(1, 12, GOTO_STAT); cprintf("Level"); + cgotoxy(1, 11, GOTO_STAT); cprintf("Experience:"); + cgotoxy(1, 12, GOTO_STAT); cprintf("Level"); } // end draw_border() // Determines if the given feature is present at (x, y) in _grid_ coordinates. @@ -2768,18 +2768,18 @@ static void draw_level_map(int start_x, int start_y, bool travel_mode) formatted_string::parse_string("(Press ? for help)"); const int helplen = std::string(help).length(); - gotoxy(1, 1); + cgotoxy(1, 1); textcolor(WHITE); cprintf("%-*s", get_number_of_cols() - helplen, ("Level " + level_description_string()).c_str()); textcolor(LIGHTGREY); - gotoxy(get_number_of_cols() - helplen + 1, 1); + cgotoxy(get_number_of_cols() - helplen + 1, 1); help.display(); } - gotoxy(1, top); + cgotoxy(1, top); for (int screen_y = 0; screen_y < num_lines; screen_y++) { @@ -4343,7 +4343,7 @@ void view_update_at(const coord_def &pos) flash_colour = viewmap_flash_colour(); #ifndef USE_TILE - gotoxy(vp.x, vp.y); + cgotoxy(vp.x, vp.y); put_colour_ch(flash_colour? real_colour(flash_colour) : colour, ch); // Force colour back to normal, else clrscr() will flood screen -- cgit v1.2.3-54-g00ecf