http://se.aminet.net/pub/Linux/distributions/slackware/slackware-10.1/source/xap...

[xscreensaver] / hacks / pacman.h

diff --git a/hacks/pacman.h b/hacks/pacman.h
index 3b8e40b449775b1e8564acdb11735a9a93147a17..ba336ff3581ff6c30f40166f577ef76213c983a9 100644 (file)
--- a/hacks/pacman.h
+++ b/hacks/pacman.h
@@ -27,6 +27,15 @@
 #include "config.h"
 #include "xlockmoreI.h"
 
+#if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM)
+#define USE_PIXMAP
+#include "xpm-pixmap.h"
+#else
+#if defined(USE_PIXMAP)
+#undef USE_PIXMAP
+#endif
+#endif
+
 #define LEVHEIGHT      32U
 #define LEVWIDTH       40U
 
@@ -35,7 +44,11 @@
 #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
@@ -111,10 +124,8 @@ typedef struct {
        ghoststruct     *ghosts;
        unsigned int    nghosts;
        Pixmap          pacmanPixmap[4][MAXMOUTH];
-/*     Pixmap          ghostPixmap[4][MAXGPOS];*/
-/*     Pixmap          ghostPixmap; */
+        Pixmap          pacmanMask[4][MAXMOUTH];
         Pixmap          ghostPixmap[4][MAXGDIR][MAXGWAG];
-/*          Pixmap          ghostMask[4][MAXGDIR][MAXGWAG]; */
         Pixmap          ghostMask;
        char            level[LEVHEIGHT * LEVWIDTH];
        unsigned int    wallwidth;