fiddlerwoaroof/crawl - Change CIVOVEMMBYAR4NJ4GPNBW3B5YLY3Q2KUODXDEQN4TGACC5KEFKDAC

libgui: fix declaration consistency

Lots of little things here. The forward declarations for some of these functions simply did not match the function definitions.

clrscr() was declared twice
cprintf(), putch(), putwch(), window(), clrscr() all returned 'void' instead of 'int'.
getch() and strlwr() were defined extern "C", but not declared as such.

Also made libgui.cc functions behave like their ncurses equivalents, except that our functions always return the ncurses 'OK' (0) response.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Created by Steven Noonan on September 20, 2009

CIVOVEMMBYAR4NJ4GPNBW3B5YLY3Q2KUODXDEQN4TGACC5KEFKDAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/libgui.h at line 33 [3.5789586]
B:BD[3.5791690] → [3.5791690:5791709]
```
void clrscr(void);
```
Replacement in crawl-ref/source/libgui.h at line 36 [3.5789586]
B:BD[3.5791957] → [2.6812:6850]
```
void cprintf(const char *format,...);
```
[3.5791957]
[3.5791999]
```
int cprintf(const char *format,...);
```
Replacement in crawl-ref/source/libgui.h at line 45 [3.5789586]
B:BD[3.5792269] → [3.5792269:5792327]
```
void putch(unsigned char chr);
void putwch(unsigned chr);
```
[3.5792269]
[3.5792327]
```
int putch(unsigned char chr);
int putwch(unsigned chr);
```
Replacement in crawl-ref/source/libgui.h at line 57 [3.5789586]
B:BD[3.5792952] → [3.5792952:5792997]
```
void window(int x1, int y1, int x2, int y2);
```
[3.5792903]
[4.166986]
```
int window(int x1, int y1, int x2, int y2);
```
Replacement in crawl-ref/source/libgui.h at line 59 [3.5789586]
∅:D[4.166987] → [3.5793023:5793036]
B:BD[3.5793023] → [3.5793023:5793036]
```
int getch();
```
[4.166987]
[3.5793036]
```
extern "C" int getch();
```
Replacement in crawl-ref/source/libgui.h at line 61 [3.5789586]
B:BD[3.5793052] → [4.166988:167003]
```
void clrscr();
```
[3.5793052]
[4.167003]
```
int clrscr();
```
Replacement in crawl-ref/source/libgui.h at line 70 [3.5789586]
B:BD[4.167251] → [4.167251:167276]
```
char *strlwr(char *str);
```
[4.167251]
[4.167276]
```
extern "C" char *strlwr(char *str);
```
Replacement in crawl-ref/source/libgui.cc at line 105 [3.5793336]
B:BD[3.5839310] → [3.5839310:5839340]
```
void putch(unsigned char chr)
```
[3.5839310]
[3.5839340]
```
int putch(unsigned char chr)
```
Insertion in crawl-ref/source/libgui.cc at line 109 [3.5793336]
[4.167621]
[3.5839409]
```
    return 0;
```
Replacement in crawl-ref/source/libgui.cc at line 112 [3.5793336]
B:BD[3.5839412] → [3.5839412:5839438]
```
void putwch(unsigned chr)
```
[3.5839412]
[3.5839438]
```
int putwch(unsigned chr)
```
Insertion in crawl-ref/source/libgui.cc at line 116 [3.5793336]
[3.5839511]
[3.5839511]
```
    return 0;
```
Replacement in crawl-ref/source/libgui.cc at line 246 [3.5793336]
B:BD[3.5842340] → [3.5842340:5842377]
```
void cprintf(const char *format,...)
```
[3.5842340]
[3.5842377]
```
int cprintf(const char *format,...)
```
Insertion in crawl-ref/source/libgui.cc at line 255 [3.5793336]
[4.167836]
[3.5842669]
```
    return 0;
```
Replacement in crawl-ref/source/libgui.cc at line 310 [3.5793336]
B:BD[3.5844401] → [4.168187:168231]
```
void window(int x1, int y1, int x2, int y2)
```
[3.5844401]
[4.168231]
```
int window(int x1, int y1, int x2, int y2)
```
Insertion in crawl-ref/source/libgui.cc at line 312 [3.5793336]
[4.168233]
[4.168233]
```
    return 0;
```
Replacement in crawl-ref/source/libgui.cc at line 325 [3.5793336]
B:BD[3.5844572] → [4.168327:168341]
```
void clrscr()
```
[3.5844572]
[3.5844616]
```
int clrscr()
```
Replacement in crawl-ref/source/libgui.cc at line 327 [3.5793336]
B:BD[3.5844618] → [4.168342:168371]
```
    return (tiles.clrscr());
```
[3.5844618]
[3.5844657]
```
    tiles.clrscr();
    return 0;
```

libgui: fix declaration consistency

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/libgui.h at line 33 [3.5789586]

Replacement in crawl-ref/source/libgui.h at line 36 [3.5789586]

Replacement in crawl-ref/source/libgui.h at line 45 [3.5789586]

Replacement in crawl-ref/source/libgui.h at line 57 [3.5789586]

Replacement in crawl-ref/source/libgui.h at line 59 [3.5789586]

Replacement in crawl-ref/source/libgui.h at line 61 [3.5789586]

Replacement in crawl-ref/source/libgui.h at line 70 [3.5789586]

Replacement in crawl-ref/source/libgui.cc at line 105 [3.5793336]

Insertion in crawl-ref/source/libgui.cc at line 109 [3.5793336]

Replacement in crawl-ref/source/libgui.cc at line 112 [3.5793336]

Insertion in crawl-ref/source/libgui.cc at line 116 [3.5793336]

Replacement in crawl-ref/source/libgui.cc at line 246 [3.5793336]

Insertion in crawl-ref/source/libgui.cc at line 255 [3.5793336]

Replacement in crawl-ref/source/libgui.cc at line 310 [3.5793336]

Insertion in crawl-ref/source/libgui.cc at line 312 [3.5793336]

Replacement in crawl-ref/source/libgui.cc at line 325 [3.5793336]

Replacement in crawl-ref/source/libgui.cc at line 327 [3.5793336]