1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
|
Description: This patch has been created by dpkg-source during the conversion
to format "3.0 (quilt)".
Author: Hugo Torres de Lima <hugotorres@protonmail.com>
Last-Update: 2021-12-11
===========================================================
--- pacman-10.orig/Imakefile
+++ pacman-10/Imakefile
@@ -18,12 +18,14 @@ OBJS = arg.o blank.o board.o bonus.o bon
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 @@ u->waitsync(); //don't return until ev
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/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 <stdlib.h>
#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 @@ if (i) { //if found
}
}
-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 @@ public:
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[1]= new Ghost(Colour::GHOSTCOLOUR2,GH
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 t180_bits[]={0x3c,0x7e,
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<unistd.h>
+#include<time.h>
//write a such struct
void printtp(struct timeval tp) {
@@ -92,7 +94,8 @@ do {
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);
};
|
