remove some xchar vestiges
This commit is contained in:
@@ -83,7 +83,7 @@ extern void Gem_cliparound(int, int);
|
|||||||
#ifdef POSITIONBAR
|
#ifdef POSITIONBAR
|
||||||
extern void Gem_update_positionbar(char *);
|
extern void Gem_update_positionbar(char *);
|
||||||
#endif
|
#endif
|
||||||
extern void Gem_print_glyph(winid, xchar, xchar, const glyph_info *,
|
extern void Gem_print_glyph(winid, coordxy, coordxy, const glyph_info *,
|
||||||
const glyph_info *);
|
const glyph_info *);
|
||||||
extern void Gem_raw_print(const char *);
|
extern void Gem_raw_print(const char *);
|
||||||
extern void Gem_raw_print_bold(const char *);
|
extern void Gem_raw_print_bold(const char *);
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ int amii_doprev_message (void);
|
|||||||
void amii_display_nhwindow(winid , boolean );
|
void amii_display_nhwindow(winid , boolean );
|
||||||
void amii_display_file(const char * , boolean );
|
void amii_display_file(const char * , boolean );
|
||||||
void amii_curs(winid , int , int );
|
void amii_curs(winid , int , int );
|
||||||
void amii_print_glyph(winid , xchar , xchar , int, int );
|
void amii_print_glyph(winid , coordxy , coordxy , int, int );
|
||||||
void DoMenuScroll(int , int );
|
void DoMenuScroll(int , int );
|
||||||
void DisplayData(int , int , int );
|
void DisplayData(int , int , int );
|
||||||
void SetPropInfo(struct Window * , struct Gadget * , long , long , long );
|
void SetPropInfo(struct Window * , struct Gadget * , long , long , long );
|
||||||
|
|||||||
@@ -1515,8 +1515,7 @@ boolean blocking;
|
|||||||
void
|
void
|
||||||
amii_curs(window, x, y)
|
amii_curs(window, x, y)
|
||||||
winid window;
|
winid window;
|
||||||
register int x, y; /* not xchar: perhaps xchar is unsigned and
|
register int x, y;
|
||||||
curx-x would be unsigned as well */
|
|
||||||
{
|
{
|
||||||
register struct amii_WinDesc *cw;
|
register struct amii_WinDesc *cw;
|
||||||
register struct Window *w;
|
register struct Window *w;
|
||||||
@@ -1954,7 +1953,7 @@ port_help()
|
|||||||
void
|
void
|
||||||
amii_print_glyph(win, x, y, glyph, bkglyph)
|
amii_print_glyph(win, x, y, glyph, bkglyph)
|
||||||
winid win;
|
winid win;
|
||||||
xchar x, y;
|
coordxy x, y;
|
||||||
int glyph, bkglyph;
|
int glyph, bkglyph;
|
||||||
{
|
{
|
||||||
struct amii_WinDesc *cw;
|
struct amii_WinDesc *cw;
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ void amii_resume_nhwindows(void);
|
|||||||
void amii_bell(void);
|
void amii_bell(void);
|
||||||
void removetopl(int cnt);
|
void removetopl(int cnt);
|
||||||
void port_help(void);
|
void port_help(void);
|
||||||
void amii_print_glyph(winid win, xchar x, xchar y, int glyph, int bkglyph);
|
void amii_print_glyph(winid win, coordxy x, coordxy y, int glyph, int bkglyph);
|
||||||
void amii_raw_print(const char *s);
|
void amii_raw_print(const char *s);
|
||||||
void amii_raw_print_bold(const char *s);
|
void amii_raw_print_bold(const char *s);
|
||||||
void amii_update_inventory(void);
|
void amii_update_inventory(void);
|
||||||
|
|||||||
@@ -1192,7 +1192,7 @@ restore_savefile()
|
|||||||
{
|
{
|
||||||
static int savelev;
|
static int savelev;
|
||||||
long saveTemp, lev;
|
long saveTemp, lev;
|
||||||
xchar levc;
|
xint8 levc;
|
||||||
struct version_info version_data;
|
struct version_info version_data;
|
||||||
|
|
||||||
/* level 0 file contains:
|
/* level 0 file contains:
|
||||||
@@ -1264,7 +1264,7 @@ restore_savefile()
|
|||||||
levRefNum = open_levelfile(lev);
|
levRefNum = open_levelfile(lev);
|
||||||
if (levRefNum >= 0) {
|
if (levRefNum >= 0) {
|
||||||
/* any or all of these may not exist */
|
/* any or all of these may not exist */
|
||||||
levc = (xchar) lev;
|
levc = (xint8) lev;
|
||||||
|
|
||||||
(void) write_savefile(saveRefNum, (Ptr) &levc, sizeof(levc));
|
(void) write_savefile(saveRefNum, (Ptr) &levc, sizeof(levc));
|
||||||
|
|
||||||
|
|||||||
@@ -880,7 +880,7 @@ int x, y;
|
|||||||
* position and glyph are always correct (checked there)!
|
* position and glyph are always correct (checked there)!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void mar_print_gl_char(winid, xchar, xchar, int);
|
void mar_print_gl_char(winid, coordxy, coordxy, int);
|
||||||
|
|
||||||
extern int mar_set_rogue(int);
|
extern int mar_set_rogue(int);
|
||||||
|
|
||||||
@@ -889,7 +889,7 @@ extern void mar_add_pet_sign(winid, int, int);
|
|||||||
void
|
void
|
||||||
Gem_print_glyph(window, x, y, glyph, bkglyph)
|
Gem_print_glyph(window, x, y, glyph, bkglyph)
|
||||||
winid window;
|
winid window;
|
||||||
xchar x, y;
|
coordxy x, y;
|
||||||
int glyph, bkglyph;
|
int glyph, bkglyph;
|
||||||
{
|
{
|
||||||
/* Move the cursor. */
|
/* Move the cursor. */
|
||||||
@@ -908,12 +908,12 @@ int glyph, bkglyph;
|
|||||||
mar_print_gl_char(window, x, y, glyph);
|
mar_print_gl_char(window, x, y, glyph);
|
||||||
}
|
}
|
||||||
|
|
||||||
void mar_print_char(winid, xchar, xchar, char, int);
|
void mar_print_char(winid, coordxy, coordxy, char, int);
|
||||||
|
|
||||||
void
|
void
|
||||||
mar_print_gl_char(window, x, y, glyph)
|
mar_print_gl_char(window, x, y, glyph)
|
||||||
winid window;
|
winid window;
|
||||||
xchar x, y;
|
coordxy x, y;
|
||||||
int glyph;
|
int glyph;
|
||||||
{
|
{
|
||||||
int ch;
|
int ch;
|
||||||
|
|||||||
@@ -26,11 +26,10 @@ typedef signed char schar;
|
|||||||
#define CHAR_P char
|
#define CHAR_P char
|
||||||
#define SCHAR_P schar
|
#define SCHAR_P schar
|
||||||
#define UCHAR_P uchar
|
#define UCHAR_P uchar
|
||||||
#define XCHAR_P xchar
|
#define COORDXY_P coordxy
|
||||||
#define SHORT_P short
|
#define SHORT_P short
|
||||||
#define BOOLEAN_P boolean
|
#define BOOLEAN_P boolean
|
||||||
#define ALIGNTYP_P aligntyp
|
#define ALIGNTYP_P aligntyp
|
||||||
typedef signed char xchar;
|
|
||||||
#include "wingem.h"
|
#include "wingem.h"
|
||||||
#undef CHAR_P
|
#undef CHAR_P
|
||||||
#undef SCHAR_P
|
#undef SCHAR_P
|
||||||
|
|||||||
@@ -2036,8 +2036,7 @@ erase_tty_screen(void)
|
|||||||
void
|
void
|
||||||
tty_curs(
|
tty_curs(
|
||||||
winid window,
|
winid window,
|
||||||
int x, int y) /* not xchar: perhaps xchar is unsigned
|
int x, int y) /* coordinates (and curx-x) must be signed */
|
||||||
* then curx-x would be unsigned too */
|
|
||||||
{
|
{
|
||||||
struct WinDesc *cw = 0;
|
struct WinDesc *cw = 0;
|
||||||
int cx = ttyDisplay->curx;
|
int cx = ttyDisplay->curx;
|
||||||
|
|||||||
Reference in New Issue
Block a user