--- pacman-10.orig/Imakefile +++ pacman-10/Imakefile @@ -18,12 +18,14 @@ t180.o t270.o t90.o timing.o usrinter.o vertwall.o \ walls.o -CURSES = -lcurses -ltermcap +CURSES = -lcurses /* most X11 screens are rather large, you might wisht to use "double" mode */ -/* CXXEXTRA_DEFINES = -DDOUBLE */ +CXXEXTRA_DEFINES = -DDOUBLE -fno-rtti -fno-exceptions -fPIC +CCLINK = g++ NormalProgramTarget(pacman,$(OBJS),$(DEPXLIB),$(CURSES),$(XLIB)) InstallProgram(pacman,$(BINDIR)) InstallManPage(pacman,$(MANDIR)) +AllTarget(pacman) DependTarget() --- pacman-10.orig/board.cc +++ pacman-10/board.cc @@ -119,7 +119,7 @@ oldtemp=oldlist; while (oldtemp) { //delete elements in the now previous sprite list oldnext=oldtemp->next; - delete oldnext; + delete oldtemp; oldtemp=oldnext; } if (zero && oldlist) { //personal thingie used for debug, not useful --- 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); }; --- 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); }; --- 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); }; --- 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); }; --- 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); }; --- pacman-10.orig/debian/changelog +++ pacman-10/debian/changelog @@ -0,0 +1,164 @@ +pacman (10-18build1) focal; urgency=medium + + * No-change rebuild for libgcc-s1 package name change. + + -- Matthias Klose Sun, 22 Mar 2020 16:53:19 +0100 + +pacman (10-18) unstable; urgency=medium + + * QA upload. + * Update Standards-Version to 4.4.1 + * Update compat level to 12 + * Mark maintainers as QA + + -- Sudip Mukherjee Thu, 19 Dec 2019 21:44:22 +0000 + +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 Mon, 08 Aug 2016 12:04:23 +0200 + +pacman (10-17.1) unstable; urgency=medium + + * Non-maintainer upload. + * Provide a desktop file and a new icon for pacman. Thanks to Paolo Naldini + for the report and initial patch. (Closes: #487276) + * Declare compliance with Debian Policy 3.9.6. + * debian/rules: Replace deprecated dh_clean -k with dh_prep. + * debian/rules: Add recommended build-arch and build-indep targets. + * debian/control: Add missing ${misc:Depends} substvar. + * Use compat level 9 and require debhelper >= 9. + * Use source format 1.0 explicitly. + + -- Markus Koschany Fri, 04 Dec 2015 18:19:49 +0100 + +pacman (10-17) unstable; urgency=low + + * imake has moved to xutils-dev, closes: #485214. + * use nanosleep to avoid chewing up the cpu, closes: #348425. + * add a menu icon, thanks Mark Purcell! Closes: #273457. + * bump debhelper compat to 6, no changes. + * Update std-ver to 3.8.0 + + change menu section to Games/Action [was Games/Arcade]. + * Updated copyright and license information. + + -- Joe Nahmias Mon, 16 Jun 2008 23:30:58 -0400 + +pacman (10-16) unstable; urgency=low + + * debian/control: xlibs-dev transition (closes: #346894). + * debian/control: bump Std-Ver, no changes. + * debian/menu: quote strings to satisfy lintian. + * debian/copyright: update address for FSF to satisfy lintian. + + -- Joe Nahmias Fri, 13 Jan 2006 04:26:04 +0000 + +pacman (10-15) unstable; urgency=low + + * New Maintainer (closes: #182985). + * Update build system to use debhelper. + * debian/control: Std-Ver (bumped to 3.6.1). + * pacman.man: escaped bare dash. + + -- Joe Nahmias Wed, 29 Oct 2003 12:52:30 -0500 + +pacman (10-14) unstable; urgency=low + + * Rebuilt with g++ 3.3 which fixes old libstdc++2.10-glibc2.2 dep (closes: #210503) + + -- Peter Joseph Fri, 12 Sep 2003 13:37:11 +0100 + +pacman (10-13) unstable; urgency=low + + * Fixed HPPA build problems thanks to Snowman (closes: #104861) + + -- Peter Joseph Mon, 16 Jul 2001 00:40:44 +0100 + +pacman (10-12) unstable; urgency=low + + * New Maintainer (closes: #89251) + + -- Peter Joseph Sun, 17 Jun 2001 23:44:27 +0100 + +pacman (10-11) unstable; urgency=low + + * Fixed initialisation bug that was causing segfault at startup for some user. Closes: #45027. + + -- Steve McIntyre <93sam@debian.org> Fri, 9 Mar 2001 22:34:27 -0000 + +pacman (10-10) unstable; urgency=low + + * Renamed Build-Depends-Indep to Build-Depends. Closes: #88734. + * Changed maintainer address. + + -- Steve McIntyre <93sam@debian.org> Wed, 7 Mar 2001 01:00:27 -0000 + +pacman (10-9) unstable; urgency=low + + * Added Build-Depends-Indep. Closes: #84650. + * Updated Standards-Version. + + -- Steve McIntyre Sun, 18 Feb 2001 21:21:46 -0000 + +pacman (10-8) unstable; urgency=low + + * Moved /usr/doc stuff to /usr/share/doc. + * Updated Standards-Version. + * Lots of lintian warning fixes. + + -- Steve McIntyre Sat, 23 Dec 2000 16:11:46 -0000 + +pacman (10-7) frozen unstable; urgency=low + + * Rebuilt against ncurses4 for slink. + * Needed to add -fno-rtti -fno-exceptions to compiler flags to fix linking problems. + + -- Steve McIntyre Sat, 31 Oct 1998 09:30:46 -0000 + +pacman (10-6) unstable; urgency=low + + * Moved binary to /usr/games and manpage to /usr/man/man6, to fit Policy section 4.9. + + -- Steve McIntyre Sat, 14 Mar 1998 21:34:02 -0000 + +pacman (10-5) unstable; urgency=low + + * Libc6 compilation - used patch in bug#16195 (now closed). + * Fixed debian/rules so fakeroot will work. + * New standards-version. + * Updated menu entry. + + -- Steve McIntyre Sat, 10 Jan 1998 17:56:21 -0000 + +pacman (10-4) unstable; urgency=low + + * Moved man page into section 6. + * Fixed perms on man page. + + -- Steve McIntyre Thu, 31 Jan 1997 20:14:38 -0000 + +pacman (10-3) unstable; urgency=low + + * New maintainer + * Moved menu entry again - now Games/Arcade + + -- Steve McIntyre Mon, 20 Jan 1997 11:21:38 -0000 + +pacman (10-2) unstable; urgency=low + + * Changed location of pacman in the menus according to joey's advice. + + -- Christoph Lameter Tue, 7 Jan 1997 13:21:38 -0800 + +pacman (10-1) unstable; urgency=low + + * Initial Release. + + -- Christoph Lameter Sun, 29 Dec 1996 15:54:27 -0800 + +Local variables: +mode: debian-changelog +End: --- pacman-10.orig/debian/control +++ pacman-10/debian/control @@ -0,0 +1,18 @@ +Source: pacman +Section: games +Priority: optional +Maintainer: Debian QA Group +Standards-Version: 4.4.1 +Build-Depends: debhelper-compat (= 12), xutils-dev, libncurses5-dev, libx11-dev, + libxext-dev + +Package: pacman +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Chase Monsters in a Labyrinth + You are Pacman, and you are supposed to eat all the small dots to get to + the next level. You are also supposed to keep away from the ghosts, + if they take you, you lose one life, unless you have eaten a large dot, + then you can, for a limited amount of time, chase and eat the ghosts. + There is also bonus available, for a limited amount of time. + An X gives just points, but a little pacman gives an extra life. --- pacman-10.orig/debian/copyright +++ pacman-10/debian/copyright @@ -0,0 +1,35 @@ +This package was originally debianized by Christoph Lameter clameter@debian.org on Sun, 29 Dec 1996 15:54:27 -0800, and is now maintained by Joe Nahmias . + +It was downloaded from ftp.cdrom.com:/pub/FreeBSD/distfiles + +Upstream Author: Roar Thronaes + +pacmania.xpm icon is courtesy of Douglas Gallagher from www.amazingdg.com + +Copyright: + +Copyright (C) 1995 Roar Thronaes +email: roart@nvg.unit.no + +Copyright applies to *.h and *.cc files, even though no copyright is +stated in them. + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- pacman-10.orig/debian/install +++ pacman-10/debian/install @@ -0,0 +1,2 @@ +pacman usr/games/ +debian/*.xpm usr/share/pixmaps/ --- pacman-10.orig/debian/manpages +++ pacman-10/debian/manpages @@ -0,0 +1 @@ +pacman._man --- pacman-10.orig/debian/menu +++ pacman-10/debian/menu @@ -0,0 +1,5 @@ +?package(pacman):needs="X11" \ + section="Games/Action" \ + title="PacMan" \ + command="/usr/games/pacman" \ + icon="/usr/share/pixmaps/pacmania.xpm" --- pacman-10.orig/debian/pacman.desktop +++ pacman-10/debian/pacman.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Pacman +GenericName=Arcade Game +Comment=A simple clone of the classic arcade game +Comment[de]=Ein simpler Klon des Arkadeklassikers Pacman +Exec=pacman +Icon=pacmania +Type=Application +Categories=Game;ArcadeGame; +Keywords=arcade;pacman;dots;ghosts;level; + --- pacman-10.orig/debian/pacmania.xpm +++ pacman-10/debian/pacmania.xpm @@ -0,0 +1,284 @@ +/* XPM */ +static char * pacmania_xpm[] = { +"32 32 249 2", +" c None", +". c #767676", +"+ c #393A34", +"@ c #3A3B3B", +"# c #5E6163", +"$ c #9EA59E", +"% c #454341", +"& c #555923", +"* c #A5A84B", +"= c #D2CC57", +"- c #F5EE83", +"; c #FEF885", +"> c #DCD675", +", c #A9A955", +"' c #696634", +") c #2B2D27", +"! c #9C9C9C", +"~ c #1A1C2B", +"{ c #212638", +"] c #7B7B7B", +"^ c #868B3A", +"/ c #EDE457", +"( c #FCF361", +"_ c #FBF5A9", +": c #FEFBC6", +"< c #FFFBD6", +"[ c #FEFAB7", +"} c #FEF798", +"| c #FEF876", +"1 c #A09D46", +"2 c #36352A", +"3 c #78736F", +"4 c #1E1E33", +"5 c #5F5C1F", +"6 c #EAE44D", +"7 c #FEF349", +"8 c #FEF452", +"9 c #E6E3A9", +"0 c #828569", +"a c #0B0B05", +"b c #43443D", +"c c #908F33", +"d c #FDF138", +"e c #BBB140", +"f c #5B5A5B", +"g c #5A5954", +"h c #8B8546", +"i c #E4DB53", +"j c #615A33", +"k c #575756", +"l c #9CA632", +"m c #F7E936", +"n c #7A772B", +"o c #181309", +"p c #0D100C", +"q c #151510", +"r c #4C3F18", +"s c #CECA68", +"t c #F6F5EA", +"u c #C3C0B9", +"v c #909090", +"w c #827E33", +"x c #F3E52C", +"y c #F8EA45", +"z c #EDE136", +"A c #E5DB46", +"B c #AEAE67", +"C c #A4A27E", +"D c #EBE128", +"E c #E8DC83", +"F c #E6E4E8", +"G c #DFE2D9", +"H c #D7D7D7", +"I c #474516", +"J c #E5DB36", +"K c #F6EB54", +"L c #F1EA78", +"M c #EDE374", +"N c #E7E5BA", +"O c #EFF0E8", +"P c #F2EFF1", +"Q c #EBE8C1", +"R c #E8E6D5", +"S c #C6CCCA", +"T c #86D3C9", +"U c #44626A", +"V c #C8C23D", +"W c #DEDFE2", +"X c #D9D7CB", +"Y c #CDD2D0", +"Z c #CFCBA6", +"` c #E4D92B", +" . c #DDD228", +".. c #D1CC83", +"+. c #C1BFC9", +"@. c #9BC0BF", +"#. c #56AAAA", +"$. c #58856B", +"%. c #53511C", +"&. c #ECE567", +"*. c #C6CFD1", +"=. c #84BEA7", +"-. c #D7CC45", +";. c #BDBA82", +">. c #859C9B", +",. c #20434D", +"'. c #7C7837", +"). c #A7A7A7", +"!. c #626262", +"~. c #B9B336", +"{. c #D6CB1D", +"]. c #D5CA27", +"^. c #D6D6BB", +"/. c #BDBEBC", +"(. c #BFBEC3", +"_. c #4F9597", +":. c #27423F", +"<. c #D4CA33", +"[. c #445421", +"}. c #988719", +"|. c #BBB224", +"1. c #262514", +"2. c #CAC21F", +"3. c #CBBB33", +"4. c #E6E49A", +"5. c #A9A98C", +"6. c #144333", +"7. c #242905", +"8. c #DDD232", +"9. c #C8BE1C", +"0. c #CCC223", +"a. c #BDB31E", +"b. c #B0AC31", +"c. c #4E4E2D", +"d. c #C4B927", +"e. c #958D5A", +"f. c #66655A", +"g. c #535A4E", +"h. c #837E25", +"i. c #75751B", +"j. c #D9CD32", +"k. c #D1C432", +"l. c #C2B43A", +"m. c #9D8725", +"n. c #726615", +"o. c #6D6B16", +"p. c #898616", +"q. c #DDD21B", +"r. c #B7AB27", +"s. c #977423", +"t. c #694515", +"u. c #49210C", +"v. c #541724", +"w. c #4B2215", +"x. c #695908", +"y. c #3D3C18", +"z. c #838383", +"A. c #D4CA38", +"B. c #AA9825", +"C. c #82651A", +"D. c #59370C", +"E. c #3E0B10", +"F. c #52151A", +"G. c #8B8B8B", +"H. c #AAA31B", +"I. c #6C4B0F", +"J. c #410B0C", +"K. c #500F1A", +"L. c #491116", +"M. c #50200C", +"N. c #736D0F", +"O. c #131402", +"P. c #B4AA1A", +"Q. c #8E731D", +"R. c #430D25", +"S. c #460C13", +"T. c #56540B", +"U. c #9B961A", +"V. c #572B11", +"W. c #3B080C", +"X. c #574704", +"Y. c #443B0E", +"Z. c #87840B", +"`. c #A2950F", +" + c #555413", +".+ c #181B11", +"++ c #696807", +"@+ c #A28328", +"#+ c #63251C", +"$+ c #2D3702", +"%+ c #8A7F0B", +"&+ c #956820", +"*+ c #63171B", +"=+ c #0E1102", +"-+ c #3C3C03", +";+ c #C4B133", +">+ c #9D6332", +",+ c #842A38", +"'+ c #631A25", +")+ c #303201", +"!+ c #B6733A", +"~+ c #9F3F55", +"{+ c #853427", +"]+ c #703E13", +"^+ c #898324", +"/+ c #353532", +"(+ c #2C2B01", +"_+ c #C58741", +":+ c #B95054", +"<+ c #8E3444", +"[+ c #7C242A", +"}+ c #6B2429", +"|+ c #DFCF3E", +"1+ c #D6A646", +"2+ c #C36B47", +"3+ c #AE4958", +"4+ c #A9444A", +"5+ c #963641", +"6+ c #8C3138", +"7+ c #80272A", +"8+ c #922E41", +"9+ c #312C02", +"0+ c #4C4707", +"a+ c #E4CB48", +"b+ c #C86E52", +"c+ c #C45659", +"d+ c #B54B52", +"e+ c #B0443E", +"f+ c #924B39", +"g+ c #B49534", +"h+ c #32280C", +"i+ c #322603", +"j+ c #A7A224", +"k+ c #DEBA4C", +"l+ c #D59752", +"m+ c #CD7F53", +"n+ c #C66B5B", +"o+ c #C3625E", +"p+ c #BB6052", +"q+ c #B9673F", +"r+ c #242402", +"s+ c #3A3204", +"t+ c #6C6415", +"u+ c #969227", +"v+ c #B9AF34", +"w+ c #D2BC39", +"x+ c #99962D", +"y+ c #5F6117", +"z+ c #1F2000", +" . + @ + @ # $ ", +" % & * = - ; ; - > , ' ) ! ~ { ] ", +" + ^ / ( ; _ : < < < [ } | ( 1 2 3 4 @ ", +" ] 5 6 7 8 | ; } } 9 9 _ _ } } ( / 0 % a ", +" b c 7 d 7 7 7 7 8 e f # g h i 7 ( e % j , + ", +" k l d d d d d d d m m n o p q r m m 6 s t t u % ", +" v w m m m x m m m m y x z A B C s x x D E F G H $ % ", +" I J z x z D z z z z K L M N O t P Q i D i R H S T U ", +" + V D J D J z D z z / - [ Q H W F X Y Z ` ...+.@.#.$.) ", +" %. .` .` J ` D z z &._ < X S H H *.T =.-. .` ;.>.,.I '.). ", +" !.~.{.]. .J ` ` ` ` A &._ : ^./.(./.@._.:.V <.<.].* [.}.|.) ", +" 1.2.3. . . . .J ` ` J A &.- 4.5.).).>.6.7.8.].].].9.0.a.b.c. ", +" %.d.].].]. . . . . .J 8.A A A = e.f.g.& ~.].].].].3.~.h.I 1. ", +" i.d.0.].].]. . . . . . . .8.8.j.8.<.<.]. .0.k.l.m.n.o.p ", +"v p.a.d.3.3.].].]. . . . . . . .q. .<.<.k.r.s.t.u.v.w.x.y. ", +"z.p.|.a.d.0.0.].].].].].].].].].j.A.B.C.D.E.F.v.v.v.v.D.o.!. ", +"G.p.H.a.a.0.0.0.0.0.].].0.k.d.m.I.w.J.K.K.K.L.F.F.v.M.M.N.O. ", +"v o.H.P.a.a.d.d.9.0.3.r.Q.t.L.R.E.E.S.K.E.K.K.L.F.v.v.v.x.1. ", +" T.U.H.P.P.a.a.B.C.V.W.S.E.J.J.S.S.S.S.S.K.K.K.K.K.F.v.X.Y. ", +" 7.Z.`.P.P.Q.V.E.S.S.W.S.W.J.J.E.S.W.S.E.E.E.K.S.K.F.F.D. +! ", +" .+++p.H.0.@+#+L.E.W.S.W.W.W.W.W.W.W.W.W.S.E.K.S.S.K.F.D.%.! ", +" ] $+o.%+r.~.&+*+S.W.W.W.W.W.W.W.W.W.W.W.W.S.S.S.K.K.K.I.%.! ", +" =+-+n.Z.9.;+>+,+'+E.W.W.W.W.W.W.W.W.W.W.W.S.S.S.S.*+C.y. ", +" f 7.)+T.N.~.3.!+~+{+*+S.W.W.W.W.W.W.W.W.W.W.S.K.v.]+^+/+ ", +" .+(+)+Y.X.b. ._+:+~+<+[+*+K.K.S.S.K.S.S.M.'+}+}+}.Y. ", +" =+)+(+)+-+^+|+1+2+:+3+4+5+6+7+7+7+[+7+,+8+{+s.' ] ", +" z.O.(+(+(+9+0+b.a+1+b+c+:+:+d+e+4+d+4+d+f+g+w % ", +" z.O.(+(+(+h+i+ +j+|+k+l+m+n+o+p+q+!+g+l.5 k ", +" q r+(+(+(+(+9+s+t+u+v+3.w+w+l.x+y+z+v ", +" f =+r+(+(+(+(+9+i+(+7.9+(+r+O./+ ", +" ] q O.z+r+(+(+7.r+O.a !. ", +" v G.z.G. "}; --- pacman-10.orig/debian/rules +++ pacman-10/debian/rules @@ -0,0 +1,71 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +export CFLAGS + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp +build-stamp: + dh_testdir + xmkmf -a + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) clean + dh_clean Makefile + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + dh_install + + #install desktop and icon + install -m 644 -D $(CURDIR)/debian/pacman.desktop \ + $(CURDIR)/debian/pacman/usr/share/applications/pacman.desktop + install -m 644 -D $(CURDIR)/debian/pacmania.xpm \ + $(CURDIR)/debian/pacman/usr/share/pixmaps/pacmania.xpm + +# Build architecture-independent files here. +binary-indep: +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installmenu + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- pacman-10.orig/debian/source/format +++ pacman-10/debian/source/format @@ -0,0 +1 @@ +1.0 --- 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); } --- 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); } --- 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); } --- 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); } --- pacman-10.orig/gamedata.cc +++ pacman-10/gamedata.cc @@ -1,3 +1,4 @@ +#include #include"gamedata.h" #include"board.h" #include"pac.h" --- 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); } --- 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); }; --- 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); }; --- 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); }; --- 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; }; --- pacman-10.orig/ghost.cc +++ pacman-10/ghost.cc @@ -165,7 +165,7 @@ } } -Ghost::go(Pacman *pac) { //go for pacman: do ghost code +int Ghost::go(Pacman *pac) { //go for pacman: do ghost code typ w; //what type is at next coordinates int i=1; //moved or not? int xx,yy; //coordinates --- pacman-10.orig/ghost.h +++ pacman-10/ghost.h @@ -31,7 +31,7 @@ Ghost(COLOURTYPE,int,int); //constructor with coordinates ~Ghost(); //destructor void draw(void); //draw the ghost -go(Pacman*); //go for pacman: do ghost code +int go(Pacman*); //go for pacman: do ghost code typ is_a(void) {return classGhost;} void eat(void); //when pacman eats ghost void getxy(int*,int*); --- 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; --- 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); }; --- 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); }; --- 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); }; --- pacman-10.orig/pac.cc +++ pacman-10/pac.cc @@ -107,7 +107,7 @@ gh[2]= new Ghost(Colour::GHOSTCOLOUR3,GHOST3X,GHOST3Y); //initializing ghost 3 gh[3]= new Ghost(Colour::GHOSTCOLOUR4,GHOST4X,GHOST4Y); //initializing ghost 4 -inp=u->getinput(); //gets whether the game is done +// inp=u->getinput(); //gets whether the game is done writetext(); --- pacman-10.orig/pacman.man +++ pacman-10/pacman.man @@ -3,9 +3,9 @@ .\" This program is free software. See the file COPYING for a list .\" of conditions. .\" -.TH PACMAN 1 +.TH PACMAN 6 .SH NAME -pacman - the game of pacman +pacman \- the game of pacman .SH SYNOPSIS .B "pacman" [grey] --- pacman-10.orig/point.cc +++ pacman-10/point.cc @@ -1,7 +1,7 @@ #include"point.h" Point::Point(int xx=0,int yy=0) { x=xx; y=yy; }; -Point::val_x() { return x; }; -Point::val_y() { return y; }; +int Point::val_x() { return x; }; +int Point::val_y() { return y; }; void Point::set_x(int xx) { x=xx; }; void Point::set_y(int yy) { y=yy; }; void Point::set_xy(int xx,int yy) { x=xx; y=yy; }; --- 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 --- 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); } --- 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); } --- 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); } --- 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); } --- pacman-10.orig/timing.cc +++ pacman-10/timing.cc @@ -10,6 +10,7 @@ static double tot_tid; //time diffenence static clock_t cl; //clock time static int toTid; //time + static struct timespec remain; #elif defined MSWIN static DWORD *tp1,*tp2; //current and previous time @@ -18,6 +19,7 @@ #ifdef UNIX #include +#include //write a such struct void printtp(struct timeval tp) { @@ -92,7 +94,8 @@ tot_tid=difftime(*tp2,*tp1); //compute difference between moments if (tot_tid<(0.25/super)) //if time interval not yet used up #ifdef UNIX - sleep(0); //sleep + remain.tv_sec = 0; remain.tv_nsec = ((0.25/super) - tot_tid) * 1000000000; + nanosleep(&remain, NULL); //sleep #elif MSWIN MSG msg; if (PeekMessage(&msg, NULL, NULL, NULL,PM_NOREMOVE)) //if there is msg --- 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); };