|
|
@ -161,7 +161,22 @@ enum {
|
|
|
|
WDP_CENTER = -2,
|
|
|
|
WDP_CENTER = -2,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
|
|
|
StringID caption;
|
|
|
|
|
|
|
|
bool caret;
|
|
|
|
|
|
|
|
WindowClass wnd_class;
|
|
|
|
|
|
|
|
WindowNumber wnd_num;
|
|
|
|
|
|
|
|
uint16 maxlen, maxwidth;
|
|
|
|
|
|
|
|
byte *buf;
|
|
|
|
|
|
|
|
} querystr_d;
|
|
|
|
|
|
|
|
|
|
|
|
#define WP(ptr,str) (*(str*)(ptr)->custom)
|
|
|
|
#define WP(ptr,str) (*(str*)(ptr)->custom)
|
|
|
|
|
|
|
|
// querystr_d is the bigest struct that comes in w->custom
|
|
|
|
|
|
|
|
// because 64-bit systems use 64-bit pointers, it is bigger on a 64-bit system
|
|
|
|
|
|
|
|
// then on a 32-bit system. Therefor the size is calculated from querystr_d
|
|
|
|
|
|
|
|
// instead of a hardcoded number.
|
|
|
|
|
|
|
|
// if any struct becomes bigger the querystr_d, it should be replaced.
|
|
|
|
|
|
|
|
#define WINDOW_CUSTOM_SIZE sizeof(querystr_d)
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
typedef struct {
|
|
|
|
uint16 count, cap, pos;
|
|
|
|
uint16 count, cap, pos;
|
|
|
@ -186,7 +201,7 @@ struct Window {
|
|
|
|
//const WindowDesc *desc;
|
|
|
|
//const WindowDesc *desc;
|
|
|
|
uint32 desc_flags;
|
|
|
|
uint32 desc_flags;
|
|
|
|
|
|
|
|
|
|
|
|
byte custom[16];
|
|
|
|
byte custom[WINDOW_CUSTOM_SIZE];
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
typedef struct {
|
|
|
@ -250,15 +265,6 @@ typedef struct {
|
|
|
|
byte gender;
|
|
|
|
byte gender;
|
|
|
|
} facesel_d;
|
|
|
|
} facesel_d;
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
|
|
|
StringID caption;
|
|
|
|
|
|
|
|
bool caret;
|
|
|
|
|
|
|
|
WindowClass wnd_class;
|
|
|
|
|
|
|
|
WindowNumber wnd_num;
|
|
|
|
|
|
|
|
uint16 maxlen, maxwidth;
|
|
|
|
|
|
|
|
byte *buf;
|
|
|
|
|
|
|
|
} querystr_d;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
typedef struct {
|
|
|
|
int sel;
|
|
|
|
int sel;
|
|
|
|
byte cargo;
|
|
|
|
byte cargo;
|
|
|
|