projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
libgame
/
gadgets.h
diff --git
a/src/libgame/gadgets.h
b/src/libgame/gadgets.h
index 8c8d6c353bfd9b70a24a7792e9e8d11f9c394417..7b8ce7f52853527b3bdc338511bce666bea9c77f 100644
(file)
--- a/
src/libgame/gadgets.h
+++ b/
src/libgame/gadgets.h
@@
-135,7
+135,7
@@
struct GadgetDecoration
struct GadgetEvent
{
struct GadgetEvent
{
- unsigned
long type;
/* event type */
+ unsigned
int type;
/* event type */
int button; /* button number for button events */
int x, y; /* gadget position at event time */
boolean off_borders; /* mouse pointer outside gadget? */
int button; /* button number for button events */
int x, y; /* gadget position at event time */
boolean off_borders; /* mouse pointer outside gadget? */
@@
-150,14
+150,14
@@
struct GadgetDrawingArea
struct GadgetTextButton
{
struct GadgetTextButton
{
- char value[MAX_GADGET_TEXTSIZE
];
/* text written on the button */
+ char value[MAX_GADGET_TEXTSIZE
+ 1];
/* text written on the button */
int size; /* maximal size of button text */
};
struct GadgetTextInput
{
int size; /* maximal size of button text */
};
struct GadgetTextInput
{
- char value[MAX_GADGET_TEXTSIZE
];
/* text string in input field */
- char last_value[MAX_GADGET_TEXTSIZE
];
/* last text string in input field */
+ char value[MAX_GADGET_TEXTSIZE
+ 1];
/* text string in input field */
+ char last_value[MAX_GADGET_TEXTSIZE
+ 1];
/* last text string in input field */
int cursor_position; /* actual text cursor position */
int number_value; /* integer value, if numeric */
int number_min; /* minimal allowed numeric value */
int cursor_position; /* actual text cursor position */
int number_value; /* integer value, if numeric */
int number_min; /* minimal allowed numeric value */
@@
-167,8
+167,8
@@
struct GadgetTextInput
struct GadgetTextArea
{
struct GadgetTextArea
{
- char value[MAX_GADGET_TEXTSIZE
];
/* text string in input field */
- char last_value[MAX_GADGET_TEXTSIZE
];
/* last text string in input field */
+ char value[MAX_GADGET_TEXTSIZE
+ 1];
/* text string in input field */
+ char last_value[MAX_GADGET_TEXTSIZE
+ 1];
/* last text string in input field */
int cursor_position; /* actual text cursor position */
int cursor_x; /* actual x cursor position */
int cursor_y; /* actual y cursor position */
int cursor_position; /* actual text cursor position */
int cursor_x; /* actual x cursor position */
int cursor_y; /* actual y cursor position */
@@
-221,7
+221,7
@@
struct GadgetInfo
int id; /* internal gadget identifier */
int custom_id; /* custom gadget identifier */
int custom_type_id; /* custom gadget type identifier */
int id; /* internal gadget identifier */
int custom_id; /* custom gadget identifier */
int custom_type_id; /* custom gadget type identifier */
- char info_text[MAX_INFO_TEXTSIZE
];
/* short popup info text */
+ char info_text[MAX_INFO_TEXTSIZE
+ 1];
/* short popup info text */
int x, y; /* gadget position */
int width, height; /* gadget size */
unsigned int type; /* type (button, text input, ...) */
int x, y; /* gadget position */
int width, height; /* gadget size */
unsigned int type; /* type (button, text input, ...) */