1 diff -uNr mirrormagic-2.0.1.orig/src/libgame/gadgets.c mirrormagic-2.0.1/src/libgame/gadgets.c
2 --- mirrormagic-2.0.1.orig/src/libgame/gadgets.c Sun Jan 14 17:12:08 2001
3 +++ mirrormagic-2.0.1/src/libgame/gadgets.c Sat Aug 10 19:01:36 2002
6 int max_textsize = MAX_INFO_TEXTSIZE - 1;
8 - strncpy(gi->info_text, va_arg(ap, char *), max_textsize);
9 + strncpy(gi->info_text, (char *) va_arg(ap, int), max_textsize);
10 gi->info_text[max_textsize] = '\0';
17 - gi->type = va_arg(ap, unsigned long);
18 + gi->type = (unsigned long) va_arg(ap, int);
22 - gi->state = va_arg(ap, unsigned long);
23 + gi->state = (unsigned long) va_arg(ap, int);
27 - gi->checked = va_arg(ap, boolean);
28 + gi->checked = (boolean) va_arg(ap, int);
32 - gi->radio_nr = va_arg(ap, unsigned long);
33 + gi->radio_nr = (unsigned long) va_arg(ap, int);
36 case GDI_NUMBER_VALUE:
37 - gi->text.number_value = va_arg(ap, long);
38 + gi->text.number_value = (long) va_arg(ap, int);
39 sprintf(gi->text.value, "%d", gi->text.number_value);
40 gi->text.cursor_position = strlen(gi->text.value);
44 - gi->text.number_min = va_arg(ap, long);
45 + gi->text.number_min = (long) va_arg(ap, int);
46 if (gi->text.number_value < gi->text.number_min)
48 gi->text.number_value = gi->text.number_min;
53 - gi->text.number_max = va_arg(ap, long);
54 + gi->text.number_max = (long) va_arg(ap, int);
55 if (gi->text.number_value > gi->text.number_max)
57 gi->text.number_value = gi->text.number_max;
60 max_textsize = MIN(gi->text.size, MAX_GADGET_TEXTSIZE - 1);
62 - strncpy(gi->text.value, va_arg(ap, char *), max_textsize);
63 + strncpy(gi->text.value, (char *) va_arg(ap, int), max_textsize);
64 gi->text.value[max_textsize] = '\0';
65 gi->text.cursor_position = strlen(gi->text.value);
70 case GDI_DESIGN_UNPRESSED:
71 - gi->design[GD_BUTTON_UNPRESSED].bitmap = va_arg(ap, Bitmap *);
72 + gi->design[GD_BUTTON_UNPRESSED].bitmap = (Bitmap *) va_arg(ap, int);
73 gi->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
74 gi->design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
77 case GDI_DESIGN_PRESSED:
78 - gi->design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *);
79 + gi->design[GD_BUTTON_PRESSED].bitmap = (Bitmap *) va_arg(ap, int);
80 gi->design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
81 gi->design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
84 case GDI_ALT_DESIGN_UNPRESSED:
85 - gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= va_arg(ap, Bitmap *);
86 + gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= (Bitmap *) va_arg(ap, int);
87 gi->alt_design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
88 gi->alt_design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
91 case GDI_ALT_DESIGN_PRESSED:
92 - gi->alt_design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *);
93 + gi->alt_design[GD_BUTTON_PRESSED].bitmap = (Bitmap *) va_arg(ap, int);
94 gi->alt_design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
95 gi->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
100 case GDI_DECORATION_DESIGN:
101 - gi->deco.design.bitmap = va_arg(ap, Bitmap *);
102 + gi->deco.design.bitmap = (Bitmap *) va_arg(ap, int);
103 gi->deco.design.x = va_arg(ap, int);
104 gi->deco.design.y = va_arg(ap, int);
110 - gi->event_mask = va_arg(ap, unsigned long);
111 + gi->event_mask = (unsigned long) va_arg(ap, int);
115 @@ -475,11 +475,11 @@
118 case GDI_CALLBACK_INFO:
119 - gi->callback_info = va_arg(ap, gadget_function);
120 + gi->callback_info = (gadget_function) va_arg(ap, int);
123 case GDI_CALLBACK_ACTION:
124 - gi->callback_action = va_arg(ap, gadget_function);
125 + gi->callback_action = (gadget_function) va_arg(ap, int);