X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fpacman.h;h=a5b91dcd0163c9c3363c874375da149e33537c04;hp=bd6fbe4ae3b232e0a97f32f608780e56d3eddbc3;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hpb=39809ded547bdbb08207d3e514950425215b4410

diff --git a/hacks/pacman.h b/hacks/pacman.h
index bd6fbe4a..a5b91dcd 100644
--- a/hacks/pacman.h
+++ b/hacks/pacman.h
@@ -31,14 +31,7 @@
 
 #include "xlockmoreI.h"
 
-#if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM) || defined(HAVE_JWXYZ)
-# define USE_PIXMAP
-#include "xpm-pixmap.h"
-# else
-# if defined(USE_PIXMAP)
-#  undef USE_PIXMAP
-# endif
-#endif
+#include "ximage-loader.h"
 
 #define LEVHEIGHT 	32U
 #define LEVWIDTH 	40U
@@ -51,11 +44,7 @@
 #define SNB(v, n) ((v) |= (1 << (n)))
 #define UNSNB(v, n) ((v) &= ~(1 << (n)))
 #define GHOSTS 4U
-#if defined(USE_PIXMAP)
 #define MAXMOUTH 3
-#else
-#define MAXMOUTH 11
-#endif
 #define MAXGPOS 2
 #define MAXGDIR 4
 #define MAXGWAG 2