diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-12-15 11:37:58 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-12-15 11:37:58 +0100 |
| commit | 1e11d23c6d787d723f61422422ec020e9a8e1542 (patch) | |
| tree | 08b55e95995665aa5e32dc55ce87b9710f58bf80 /crawl-ref/source/libgui.h | |
| parent | b40b28c874d4c870c0f1d877405468587b518dc3 (diff) | |
| parent | 16e1641c1ef14f6bcfdea67df6966bcbbe5dbf4f (diff) | |
| download | crawl-ref-1e11d23c6d787d723f61422422ec020e9a8e1542.tar.gz crawl-ref-1e11d23c6d787d723f61422422ec020e9a8e1542.zip | |
Merge branch 'master' into messagewindow
Conflicts:
crawl-ref/source/libgui.cc
crawl-ref/source/libgui.h
crawl-ref/source/message.cc
Diffstat (limited to 'crawl-ref/source/libgui.h')
| -rw-r--r-- | crawl-ref/source/libgui.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/libgui.h b/crawl-ref/source/libgui.h index b3b5b58921..2606c52fd8 100644 --- a/crawl-ref/source/libgui.h +++ b/crawl-ref/source/libgui.h @@ -57,7 +57,7 @@ int window(int x1, int y1, int x2, int y2); extern "C" int getch(); int getch_ck(); int clrscr(); -void cgotoxy(int x, int y, int region = GOTO_CRT); +void cgotoxy(int x, int y, GotoRegion region = GOTO_CRT); void delay(int ms); void update_screen(); int kbhit(); |