X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=6cbf30703d6f5088643952d494452099034e7b25;hb=1100054eec7c45458359fd56072341bd661f4a9c;hp=aeb5ec9cbeee81e88136c84a43d63fa0c2d338ac;hpb=49221e59bff18cdfbef8c877b588280266ae5037;p=rocksndiamonds.git

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index aeb5ec9c..6cbf3070 100644
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -1,25 +1,22 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1994-2000 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  gadgets.c                                               *
+* gadgets.c                                                *
 ***********************************************************/
 
 #include <stdarg.h>
-
-#include "libgame.h"
-
-#if 0
-#include "main_TMP.h"
-#endif
+#include <string.h>
 
 #include "gadgets.h"
+#include "text.h"
+#include "misc.h"
 
 
 /* values for DrawGadget() */
@@ -371,25 +368,25 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	break;
 
       case GDI_DESIGN_UNPRESSED:
-	gi->design[GD_BUTTON_UNPRESSED].bitmap = va_arg(ap, Bitmap);
+	gi->design[GD_BUTTON_UNPRESSED].bitmap = va_arg(ap, Bitmap *);
 	gi->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
 	gi->design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_DESIGN_PRESSED:
-	gi->design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap);
+	gi->design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *);
 	gi->design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
 	gi->design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_ALT_DESIGN_UNPRESSED:
-	gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= va_arg(ap, Bitmap);
+	gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= va_arg(ap, Bitmap *);
 	gi->alt_design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
 	gi->alt_design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_ALT_DESIGN_PRESSED:
-	gi->alt_design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap);
+	gi->alt_design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *);
 	gi->alt_design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
 	gi->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
 	break;
@@ -403,7 +400,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	break;
 
       case GDI_DECORATION_DESIGN:
-	gi->deco.design.bitmap = va_arg(ap, Bitmap);
+	gi->deco.design.bitmap = va_arg(ap, Bitmap *);
 	gi->deco.design.x = va_arg(ap, int);
 	gi->deco.design.y = va_arg(ap, int);
 	break;