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
|
Description: fix gcc 6 compiling troubles
This allows gcc 6 works properly and avoid compiling errors
about ambiguous reference
Forwarded: not-needed
Author: Elías Alejandro Año Mendoza <ealmdz@gmail.com>
Last-Update: 2016-07-14
--- jigzo-0.6.1.orig/src/main.cxx
+++ jigzo-0.6.1/src/main.cxx
@@ -165,7 +165,7 @@ enum Mode {
start_play,
play,
end_play,
- end
+ endgame
};
Mode mode,next_mode,next_next_mode;
@@ -984,9 +984,9 @@ void Randomize(void)
nextGroup = 0;
for (int i = 0; i < n; i++)
v[i] = i;
- float cx = 0.f;
- float cy = 0.f;
- int cn = 0;
+ float cx = 0.f;
+ float cy = 0.f;
+ int cn = 0;
for (it = puzzlePieces.begin(); it != puzzlePieces.end(); it++) {
int r = rand() % n;
int i = v[r];
@@ -1594,7 +1594,7 @@ int main(int argc, char **argv)
int i;
Uint8 *keys = SDL_GetKeyState(&i);
SDL_Event event;
- while (mode!=end) {
+ while (mode!=endgame) {
//static Uint32 mark = 0;
SDL_Delay(10);
while (SDL_PollEvent(&event)) {
@@ -1633,7 +1633,7 @@ int main(int argc, char **argv)
if (clickLeave)
{
if (mode == intro)
- FadeOutTo(end_intro,end);
+ FadeOutTo(end_intro,endgame);
else if (mode == browse) {
FadeOutTo(end_browse,start_intro);
} else {
@@ -1641,7 +1641,7 @@ int main(int argc, char **argv)
}
}
if (event.type == SDL_QUIT) {
- mode = end;
+ mode = endgame;
break;
}
}
|
