Control: tags 811718 + patch
Control: tags 811718 + pending
Dear maintainer,
I've prepared an NMU for pacman (versioned as 10-17.2) and
uploaded it to unstable.
Please find attached the debdiff.
Regards,
Markus
diff -u pacman-10/debian/changelog pacman-10/debian/changelog
--- pacman-10/debian/changelog
+++ pacman-10/debian/changelog
@@ -1,3 +1,11 @@
+pacman (10-17.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC-6. (Closes: #811718)
+ * Declare compliance with Debian Policy 3.9.8.
+
+ -- Markus Koschany <a...@debian.org> Sun, 07 Aug 2016 00:16:45 +0200
+
pacman (10-17.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u pacman-10/debian/control pacman-10/debian/control
--- pacman-10/debian/control
+++ pacman-10/debian/control
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Joe Nahmias <je...@debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Build-Depends: debhelper (>= 9), xutils-dev, libncurses5-dev, libx11-dev,
libxext-dev
only in patch2:
unchanged:
--- pacman-10.orig/corner1.cc
+++ pacman-10/corner1.cc
@@ -3,6 +3,6 @@
Corner1::Corner1() {
consfn();
-pix(&pixmap,corner1_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)corner1_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/corner2.cc
+++ pacman-10/corner2.cc
@@ -3,6 +3,6 @@
Corner2::Corner2() {
consfn();
-pix(&pixmap,corner2_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)corner2_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/corner3.cc
+++ pacman-10/corner3.cc
@@ -3,6 +3,6 @@
Corner3::Corner3() {
consfn();
-pix(&pixmap,corner3_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)corner3_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/corner4.cc
+++ pacman-10/corner4.cc
@@ -3,6 +3,6 @@
Corner4::Corner4() {
consfn();
-pix(&pixmap,corner4_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)corner4_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/cross.cc
+++ pacman-10/cross.cc
@@ -3,7 +3,7 @@
Cross::Cross() {
consfn();
-pix(&pixmap,cross_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)cross_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/e0.cc
+++ pacman-10/e0.cc
@@ -3,6 +3,6 @@
E0::E0() {
consfn();
-pix(&pixmap,e0_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)e0_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
}
only in patch2:
unchanged:
--- pacman-10.orig/e180.cc
+++ pacman-10/e180.cc
@@ -3,6 +3,6 @@
E180::E180() {
consfn();
-pix(&pixmap,e180_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)e180_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
}
only in patch2:
unchanged:
--- pacman-10.orig/e270.cc
+++ pacman-10/e270.cc
@@ -3,6 +3,6 @@
E270::E270() {
consfn();
-pix(&pixmap,e270_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)e270_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
}
only in patch2:
unchanged:
--- pacman-10.orig/e90.cc
+++ pacman-10/e90.cc
@@ -3,5 +3,5 @@
E90::E90() {
consfn();
-pix(&pixmap,e90_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)e90_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
}
only in patch2:
unchanged:
--- pacman-10.orig/gblank.cc
+++ pacman-10/gblank.cc
@@ -3,7 +3,7 @@
G_Blank::G_Blank() {
consfn();
-pix(&pixmap,blank_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)blank_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
}
only in patch2:
unchanged:
--- pacman-10.orig/gbonlife.cc
+++ pacman-10/gbonlife.cc
@@ -3,7 +3,7 @@
G_BonusLife::G_BonusLife() {
consfn();
-pix(&pixmap,bonuslife_bits,Colour::BONUSLIFECOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)bonuslife_bits,Colour::BONUSLIFECOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/gbonpnt.cc
+++ pacman-10/gbonpnt.cc
@@ -3,7 +3,7 @@
G_BonusPoint::G_BonusPoint() {
consfn();
-pix(&pixmap,bonuspoint_bits,Colour::BONUSPOINTCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)bonuspoint_bits,Colour::BONUSPOINTCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/gfood.cc
+++ pacman-10/gfood.cc
@@ -3,7 +3,7 @@
G_Food::G_Food() {
consfn();
-pix(&pixmap,food_bits,Colour::FOODCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)food_bits,Colour::FOODCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/gghost.cc
+++ pacman-10/gghost.cc
@@ -3,8 +3,8 @@
G_Ghost::G_Ghost(COLOURTYPE farge) {
consfn();
-pix(&pixmapn,ghost_bits,farge,Colour::MYBACKGROUND);
-pix(&pixmapr,ghost_bits,Colour::RUNGHOSTCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmapn,(char*)ghost_bits,farge,Colour::MYBACKGROUND);
+pix(&pixmapr,(char*)ghost_bits,Colour::RUNGHOSTCOLOUR,Colour::MYBACKGROUND);
pixmap=pixmapn;
};
only in patch2:
unchanged:
--- pacman-10.orig/gpacman.cc
+++ pacman-10/gpacman.cc
@@ -4,11 +4,11 @@
G_Pacman::G_Pacman() {
consfn();
-pix(&pix0,pacman0_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
-pix(&pixl,pacmanleft_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
-pix(&pixr,pacmanright_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
-pix(&pixu,pacmanup_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
-pix(&pixd,pacmandown_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
+pix(&pix0,(char*)pacman0_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
+pix(&pixl,(char*)pacmanleft_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
+pix(&pixr,(char*)pacmanright_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
+pix(&pixu,(char*)pacmanup_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
+pix(&pixd,(char*)pacmandown_bits,Colour::PACMANCOLOUR,Colour::MYBACKGROUND);
pixmap=pixr;
look=right;
mouth=1;
only in patch2:
unchanged:
--- pacman-10.orig/gspecwal.cc
+++ pacman-10/gspecwal.cc
@@ -3,7 +3,7 @@
G_SpecialWall::G_SpecialWall() {
consfn();
-pix(&pixmap,specwall_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)specwall_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/gsupfood.cc
+++ pacman-10/gsupfood.cc
@@ -3,7 +3,7 @@
G_SuperFood::G_SuperFood() {
consfn();
-pix(&pixmap,superfood_bits,Colour::SUPERFOODCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)superfood_bits,Colour::SUPERFOODCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/horiwall.cc
+++ pacman-10/horiwall.cc
@@ -4,5 +4,5 @@
HorizontalWall::HorizontalWall() {
consfn();
-pix(&pixmap,horiwall_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)horiwall_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
};
only in patch2:
unchanged:
--- pacman-10.orig/shapes.h
+++ pacman-10/shapes.h
@@ -60,55 +60,55 @@
static SHAPETYPE t90_bits[]={0x3c,0x7c,0xfc,0xfc,0xfc,0xfc,0x7c,0x3c};
#else
-static SHAPETYPE pacman0_bits[]= {0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x3f, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xfc, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE pacmanleft_bits[]= {0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x3c, 0xc0, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xff, 0x00, 0xff, 0xc0, 0x3f, 0xc0, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE pacmanright_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0x3c, 0x03, 0x3c, 0x03, 0xff, 0x00, 0xff, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0xff, 0x00, 0xff, 0x00, 0xfc, 0x03, 0xfc, 0x03, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE pacmanup_bits[]= {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x03, 0xc0, 0x0f, 0xf0, 0x0f, 0xf0, 0x33, 0xfc, 0x33, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xfc, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE pacmandown_bits[]= {0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x3f, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x33, 0xfc, 0x33, 0xfc, 0x0f, 0xf0, 0x0f, 0xf0, 0x03, 0xc0, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE pacman0_bits[]= {0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x3f, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xfc, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE pacmanleft_bits[]= {0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x3c, 0xc0, 0x3c, 0x00, 0xff, 0x00, 0xff, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xff, 0x00, 0xff, 0xc0, 0x3f, 0xc0, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE pacmanright_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0x3c, 0x03, 0x3c, 0x03, 0xff, 0x00, 0xff, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0xff, 0x00, 0xff, 0x00, 0xfc, 0x03, 0xfc, 0x03, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE pacmanup_bits[]= {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x03, 0xc0, 0x0f, 0xf0, 0x0f, 0xf0, 0x33, 0xfc, 0x33, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xfc, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE pacmandown_bits[]= {0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x3f, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x33, 0xfc, 0x33, 0xfc, 0x0f, 0xf0, 0x0f, 0xf0, 0x03, 0xc0, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE vertwall_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE vertwall_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE horiwall_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE horiwall_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static SHAPETYPE blank_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE cross_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE cross_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE food_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE food_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE superfood_bits[]={0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE superfood_bits[]={0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE ghost_bits[]={0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0xcf, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x33, 0xcc, 0x33, 0xcc};
+static unsigned SHAPETYPE ghost_bits[]={0xc0, 0x03, 0xc0, 0x03, 0xfc, 0x3f, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0xcf, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x33, 0xcc, 0x33, 0xcc};
-static SHAPETYPE corner2_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x03, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE corner2_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x03, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE corner3_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE corner3_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE corner4_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xc0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0x3f, 0xf0, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE corner4_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xc0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0x3f, 0xf0, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE corner1_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x3f, 0xf0, 0x3f, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xc0, 0xff, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE corner1_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x3f, 0xf0, 0x3f, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xc0, 0xff, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE specwall_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE specwall_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE bonuspoint_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0c, 0x30, 0x0c, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0x30, 0x0c, 0x30, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE bonuspoint_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0c, 0x30, 0x0c, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0x30, 0x0c, 0x30, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE bonuslife_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03, 0xc0, 0x0f, 0xc0, 0x0f, 0xc0, 0x0f, 0xc0, 0x0f, 0xf0, 0x03, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE bonuslife_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0, 0x03, 0xc0, 0x0f, 0xc0, 0x0f, 0xc0, 0x0f, 0xc0, 0x0f, 0xf0, 0x03, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE e180_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xc0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xc0, 0xff, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE e180_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xc0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xc0, 0xff, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE e90_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE e90_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE e0_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x03, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE e0_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x03, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE e270_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE e270_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE t0_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xfc, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE t0_bits[]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xfc, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE t270_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE t270_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f};
-static SHAPETYPE t180_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x3f, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned SHAPETYPE t180_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xfc, 0x3f, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static SHAPETYPE t90_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x3f, 0xf0, 0x3f, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0x3f, 0xf0, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
+static unsigned SHAPETYPE t90_bits[]={0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x3f, 0xf0, 0x3f, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0xff, 0xf0, 0x3f, 0xf0, 0x3f, 0xf0, 0x0f, 0xf0, 0x0f};
#endif
only in patch2:
unchanged:
--- pacman-10.orig/t0.cc
+++ pacman-10/t0.cc
@@ -3,6 +3,6 @@
T0::T0() {
consfn();
-pix(&pixmap,t0_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)t0_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
}
only in patch2:
unchanged:
--- pacman-10.orig/t180.cc
+++ pacman-10/t180.cc
@@ -3,6 +3,6 @@
T180::T180() {
consfn();
-pix(&pixmap,t180_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)t180_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
}
only in patch2:
unchanged:
--- pacman-10.orig/t270.cc
+++ pacman-10/t270.cc
@@ -3,6 +3,6 @@
T270::T270() {
consfn();
-pix(&pixmap,t270_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)t270_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
}
only in patch2:
unchanged:
--- pacman-10.orig/t90.cc
+++ pacman-10/t90.cc
@@ -3,7 +3,7 @@
T90::T90() {
consfn();
-pix(&pixmap,t90_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)t90_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
}
only in patch2:
unchanged:
--- pacman-10.orig/vertwall.cc
+++ pacman-10/vertwall.cc
@@ -4,5 +4,5 @@
VerticalWall::VerticalWall() {
consfn();
-pix(&pixmap,vertwall_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
+pix(&pixmap,(char*)vertwall_bits,Colour::WALLCOLOUR,Colour::MYBACKGROUND);
};
