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
|
diff -urN Ri-li-2.0.1-orig/src//audio.cc Ri-li-2.0.1/src//audio.cc
--- Ri-li-2.0.1-orig/src//audio.cc 2007-11-02 12:48:15.000000000 +0100
+++ Ri-li-2.0.1/src//audio.cc 2010-12-14 21:54:10.533334011 +0100
@@ -22,13 +22,16 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include "audio.h"
#include "utils.h"
#include "preference.h"
+using std::cerr;
+using std::endl;
+
/*** Variable globales ***/
/*************************/
extern sPreference Pref;
diff -urN Ri-li-2.0.1-orig/src//ecran.cc Ri-li-2.0.1/src//ecran.cc
--- Ri-li-2.0.1-orig/src//ecran.cc 2007-11-02 12:48:16.000000000 +0100
+++ Ri-li-2.0.1/src//ecran.cc 2010-12-14 21:54:50.346667343 +0100
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
diff -urN Ri-li-2.0.1-orig/src//editeur.cc Ri-li-2.0.1/src//editeur.cc
--- Ri-li-2.0.1-orig/src//editeur.cc 2007-11-02 12:48:17.000000000 +0100
+++ Ri-li-2.0.1/src//editeur.cc 2010-12-14 21:55:25.770000677 +0100
@@ -25,7 +25,7 @@
#include <windows.h>
#endif
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -38,6 +38,9 @@
#include "tableau.h"
#include "mouse.h"
+using std::cerr;
+using std::endl;
+
/*** Variables globales ***/
/**************************/
extern SDL_Surface *sdlVideo;
diff -urN Ri-li-2.0.1-orig/src//jeux.cc Ri-li-2.0.1/src//jeux.cc
--- Ri-li-2.0.1-orig/src//jeux.cc 2007-11-02 12:48:17.000000000 +0100
+++ Ri-li-2.0.1/src//jeux.cc 2010-12-14 22:06:21.783334023 +0100
@@ -25,7 +25,7 @@
#include <windows.h>
#endif
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -urN Ri-li-2.0.1-orig/src//loco.cc Ri-li-2.0.1/src//loco.cc
--- Ri-li-2.0.1-orig/src//loco.cc 2007-11-02 12:48:18.000000000 +0100
+++ Ri-li-2.0.1/src//loco.cc 2010-12-14 22:06:40.183334009 +0100
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -urN Ri-li-2.0.1-orig/src//main.cc Ri-li-2.0.1/src//main.cc
--- Ri-li-2.0.1-orig/src//main.cc 2007-11-02 12:48:19.000000000 +0100
+++ Ri-li-2.0.1/src//main.cc 2010-12-14 22:07:15.993334009 +0100
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
#include <string.h>
#include <SDL/SDL.h>
#include <SDL/SDL_mixer.h>
@@ -39,6 +39,9 @@
#include "editeur.h"
#include "utils.h"
+using std::cerr;
+using std::endl;
+
/*** Variables globales ***/
/************************/
SDL_Surface *sdlVideo; // Pointe sur l'écran video
diff -urN Ri-li-2.0.1-orig/src//menu.cc Ri-li-2.0.1/src//menu.cc
--- Ri-li-2.0.1-orig/src//menu.cc 2007-11-02 12:48:19.000000000 +0100
+++ Ri-li-2.0.1/src//menu.cc 2010-12-14 22:07:55.990000676 +0100
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -34,6 +34,9 @@
#define PY 180
+using std::cerr;
+using std::endl;
+
/*** Variables globales ***/
/**************************/
extern int Horloge;
diff -urN Ri-li-2.0.1-orig/src//mouse.cc Ri-li-2.0.1/src//mouse.cc
--- Ri-li-2.0.1-orig/src//mouse.cc 2007-11-02 12:48:20.000000000 +0100
+++ Ri-li-2.0.1/src//mouse.cc 2010-12-14 22:08:11.696667343 +0100
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include "mouse.h"
#include "preference.h"
diff -urN Ri-li-2.0.1-orig/src//sprite.cc Ri-li-2.0.1/src//sprite.cc
--- Ri-li-2.0.1-orig/src//sprite.cc 2007-11-02 12:48:20.000000000 +0100
+++ Ri-li-2.0.1/src//sprite.cc 2010-12-14 22:09:17.650000676 +0100
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -30,6 +30,9 @@
#include "preference.h"
#include "utils.h"
+using std::cerr;
+using std::endl;
+
/*** Variables Globales ***/
/**************************/
extern SDL_Surface *sdlVideo;
@@ -39,8 +42,8 @@
extern int NSprites;
extern sPreference Pref;
-static char* OrdreTexte="ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-!?*+<>%$()&;";
-static char* OrdreTexte2="abcdefghijklmnopqrstuvwxyz0123456789,_|?*+<>%$[]&;";
+static char* OrdreTexte=(char *)"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-!?*+<>%$()&;";
+static char* OrdreTexte2=(char *)"abcdefghijklmnopqrstuvwxyz0123456789,_|?*+<>%$[]&;";
static int TableTexte[256];
char Langue[31][16]; // Mémorise les noms des langues
diff -urN Ri-li-2.0.1-orig/src//tableau.cc Ri-li-2.0.1/src//tableau.cc
--- Ri-li-2.0.1-orig/src//tableau.cc 2007-11-02 12:48:21.000000000 +0100
+++ Ri-li-2.0.1/src//tableau.cc 2010-12-14 22:09:32.603334046 +0100
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include "preference.h"
diff -urN Ri-li-2.0.1-orig/src//utils.cc Ri-li-2.0.1/src//utils.cc
--- Ri-li-2.0.1-orig/src//utils.cc 2007-11-02 12:48:22.000000000 +0100
+++ Ri-li-2.0.1/src//utils.cc 2010-12-14 22:09:58.343334046 +0100
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -36,6 +36,9 @@
#include "preference.h"
#include "sprite.h"
+using std::cerr;
+using std::endl;
+
/*** Variables globales ***/
/**************************/
extern sPreference Pref;
diff -urN Ri-li-2.0.1-orig/src/sprite.cc Ri-li-2.0.1/src/sprite.cc
--- Ri-li-2.0.1-orig/src/sprite.cc 2022-02-22 09:50:54.077854717 +0100
+++ Ri-li-2.0.1/src/sprite.cc 2022-02-22 09:55:05.251189551 +0100
@@ -354,7 +354,7 @@
// Fabrique la surface
Image[i]=SDL_CreateRGBSurface((Dim[i].bpp-3)*SDL_SRCALPHA,Dim[i].L,Dim[i].H,Dim[i].bpp*8,
0xff,0xff00,0xff0000,0xff000000*(Dim[i].bpp-3));
- if(Image[i]<=NULL) {
+ if(Image[i]==NULL) {
cerr <<"Impossible de créer une Surface SDL!"<<endl;
return false;
}
@@ -488,7 +488,7 @@
// Fabrique la surface
Image[0]=SDL_CreateRGBSurface((Dim[0].bpp-3)*SDL_SRCALPHA,Dim[0].L,Dim[0].H,Dim[0].bpp*8,
0xff,0xff00,0xff0000,0xff000000*(Dim[0].bpp-3));
- if(Image[0]<=NULL) {
+ if(Image[0]==NULL) {
cerr <<"Impossible de créer une Surface SDL!"<<endl;
return false;
}
diff -urN Ri-li-2.0.1-orig/src/tableau.cc Ri-li-2.0.1/src/tableau.cc
--- Ri-li-2.0.1-orig/src/tableau.cc 2022-02-22 09:50:54.077854717 +0100
+++ Ri-li-2.0.1/src/tableau.cc 2022-02-22 09:54:35.474522718 +0100
@@ -87,7 +87,7 @@
// Alloue la mémoire
Buf=new unsigned char [sizeof(s_Tableau)*N+sizeof(int)+1];
- if(Buf<=0) return false;
+ if(Buf==0) return false;
// Charge les tableaux
Buf[0]=N/256;
|