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
|
--- pachi-1.0.orig/configure
+++ pachi-1.0/configure
@@ -1564,7 +1564,6 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1570 "configure"
#include "confdefs.h"
@@ -1598,7 +1597,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
#define $ac_tr_lib 1
EOF
- LIBS="-lpthread $LIBS"
else
echo "$ac_t""no" 1>&6
@@ -1960,7 +1958,7 @@ if test "$enable_devel" = "yes"; then
SCOREDIR="."
else
DATADIR="$datadir/$PACKAGE"
- SCOREDIR="/var/lib/games/$PACKAGE"
+ SCOREDIR="/var/games/$PACKAGE"
fi
eval DATAPATH=`eval echo "$DATADIR"`
--- pachi-1.0.orig/data/Makefile.in
+++ pachi-1.0/data/Makefile.in
@@ -229,8 +229,8 @@ maintainer-clean-generic clean mostlycle
install-data-local:
for file in $(score_DATA); do\
- chgrp $(group) $(scoredir)/$$file; \
- chmod $(perms) $(scoredir)/$$file; \
+ chgrp $(group) $(DESTDIR)$(scoredir)/$$file; \
+ chmod $(perms) $(DESTDIR)$(scoredir)/$$file; \
done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- pachi-1.0.orig/src/input.c
+++ pachi-1.0/src/input.c
@@ -68,7 +68,7 @@ void hiscore_events()
{
namechar=0;
for(n=0;n<10;n++)
- playername[n] = '.';
+ playername[n] = ' ';
}
}
}
@@ -167,7 +167,6 @@ void menu_events()
void code_events()
{
- int n;
SDL_Event event;
while(SDL_PollEvent(&event)==1)
@@ -304,7 +303,6 @@ void check_joystick_events(SDL_Event *ev
void game_events()
{
- int n;
SDL_Event event;
Uint8 *keys;
--- pachi-1.0.orig/src/output.c
+++ pachi-1.0/src/output.c
@@ -300,7 +300,6 @@ void showposter(int num)
if(num==CEMETERY || num==CAVES || num==CASTLE || num==CASTLE+1 || num==LAB)
{
escape_exit=0;
- SDL_Surface *temp;
switch(num)
{
case CEMETERY:
--- pachi-1.0.orig/src/text.c
+++ pachi-1.0/src/text.c
@@ -15,7 +15,7 @@ void print_text(SDL_Surface *font, SDL_S
srctxt.y = 0;
int linecounter = 0 ; // este contador se utiliza para saber en que linea imprimimos el texto
int charpos = 0;
- for(int charcounter = 0; charcounter <= (strlen(texto));charcounter++)
+ for(unsigned charcounter = 0; charcounter <= (strlen(texto));charcounter++)
{
int curchar=texto[charcounter];
if(curchar == 94)
--- pachi-1.0.orig/src/game.c
+++ pachi-1.0/src/game.c
@@ -324,7 +324,7 @@ void chk_sequence()
}
}
int object_is_here=0; // esta variable indica si el objeto que sigue en la secuencia esta en la pantalla actual
- int bright_x, bright_y; // variables que indica en que posicion debe aparecer el brillo del proximo objeto a recoger
+ int bright_x = 0, bright_y = 0; // variables que indica en que posicion debe aparecer el brillo del proximo objeto a recoger
for(n=0;n<5;n++)
{
if(mobject[(R_current-1)*5+n].seq==sequence)
--- pachi-1.0.orig/src/gameover.c
+++ pachi-1.0/src/gameover.c
@@ -21,7 +21,6 @@ void show_hiscores()
SDL_SetColorKey(scorefont,SDL_SRCCOLORKEY,SDL_MapRGB(scorefont->format,0,0,0));
SDL_SetColorKey(scorefont1,SDL_SRCCOLORKEY,SDL_MapRGB(scorefont1->format,0,0,0));
SDL_SetColorKey(scorefont1,SDL_SRCCOLORKEY,SDL_MapRGB(scorefont1->format,0,0,0));
- char plyername[]=" ";
char diflevel[] =" ";
print_text(scorefont1,screen,16,16,30, 55," PACHI EL MARCIANO TOP TEN ");//scorename[a]);
print_text(scorefont1,screen,16,16,30, 95,"NAME STAGE TIME LEVEL SCORE ");//scorename[a]);
@@ -103,7 +102,8 @@ void do_gameover()
hiscore_events();
SDL_FillRect(screen,&box,SDL_MapRGB(screen->format,0,0,0));
print_text(scorefont1,screen,16,16,box.x+10,box.y+5,"ENTER YOUR NAME");
- print_text(scorefont1,screen,16,16,box.x+51+(namechar*16),box.y+29,".");
+ for (int i = namechar; i < 10; i++)
+ print_text(scorefont1,screen,16,16,box.x+51+(i*16),box.y+29,".");
print_text(scorefont,screen,16,16,box.x+51,box.y+24,"%s",playername);
SDL_Flip(screen);
}
--- pachi-1.0.orig/src/intro.c
+++ pachi-1.0/src/intro.c
@@ -52,7 +52,6 @@ void intro()
double introtime=0;
escape_exit=0;
float title_alpha=0;
- int title_done=0;
int n=1;
while(escape_exit==0)
{
|
