Ticket #2204: diff.txt

File diff.txt, 8.7 KB (added by Kirben, 19 years ago)

CVS changes that cause problem

Line 
1Index: scumm/gfx.cpp
2===================================================================
3RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
4retrieving revision 2.223
5retrieving revision 2.224
6diff -u -r2.223 -r2.224
7--- scumm/gfx.cpp 12 Oct 2003 12:03:17 -0000 2.223
8+++ scumm/gfx.cpp 12 Oct 2003 17:33:28 -0000 2.224
9@@ -15,7 +15,7 @@
10 * along with this program; if not, write to the Free Software
11 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
12 *
13- * $Header: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v 2.223 2003/10/12 12:03:17 kirben Exp $
14+ * $Header: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v 2.224 2003/10/12 17:33:28 fingolfin Exp $
15 *
16 */
17
18@@ -1770,7 +1770,7 @@
19 int x = 8;
20 do {
21 FILL_BITS;
22- *dst++ = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
23+ *dst++ = _vm->_roomPalette[color + _palette_mod];
24
25 againPos:
26 if (!READ_BIT) {
27@@ -1795,7 +1795,7 @@
28 if (!--height)
29 return;
30 }
31- *dst++ = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
32+ *dst++ = _vm->_roomPalette[color + _palette_mod];
33 } while (--reps);
34 bits >>= 8;
35 bits |= (*src++) << (cl - 8);
36@@ -1819,7 +1819,7 @@
37 do {
38 FILL_BITS;
39 if (color != _transparentColor)
40- *dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
41+ *dst = _vm->_roomPalette[color + _palette_mod];
42 dst++;
43
44 againPos:
45@@ -1846,7 +1846,7 @@
46 return;
47 }
48 if (color != _transparentColor)
49- *dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
50+ *dst = _vm->_roomPalette[color + _palette_mod];
51 dst++;
52 } while (--reps);
53 bits >>= 8;
54@@ -1870,7 +1870,7 @@
55 int x = 8;
56 do {
57 FILL_BITS;
58- *dst++ = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
59+ *dst++ = _vm->_roomPalette[color + _palette_mod];
60 if (!READ_BIT) {
61 } else if (!READ_BIT) {
62 FILL_BITS;
63@@ -1901,7 +1901,7 @@
64 do {
65 FILL_BITS;
66 if (color != _transparentColor)
67- *dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
68+ *dst = _vm->_roomPalette[color + _palette_mod];
69 dst++;
70 if (!READ_BIT) {
71 } else if (!READ_BIT) {
72@@ -1933,7 +1933,7 @@
73 int h = height;
74 do {
75 FILL_BITS;
76- *dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
77+ *dst = _vm->_roomPalette[color + _palette_mod];
78 dst += _vm->_screenWidth;
79 if (!READ_BIT) {
80 } else if (!READ_BIT) {
81@@ -1966,7 +1966,7 @@
82 do {
83 FILL_BITS;
84 if (color != _transparentColor)
85- *dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
86+ *dst = _vm->_roomPalette[color + _palette_mod];
87 dst += _vm->_screenWidth;
88 if (!READ_BIT) {
89 } else if (!READ_BIT) {
90Index: scumm/resource_v2.cpp
91===================================================================
92RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
93retrieving revision 1.37
94retrieving revision 1.38
95diff -u -r1.37 -r1.38
96--- scumm/resource_v2.cpp 5 Oct 2003 17:32:38 -0000 1.37
97+++ scumm/resource_v2.cpp 12 Oct 2003 17:33:28 -0000 1.38
98@@ -15,7 +15,7 @@
99 * along with this program; if not, write to the Free Software
100 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
101 *
102- * $Header: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v 1.37 2003/10/05 17:32:38 fingolfin Exp $
103+ * $Header: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v 1.38 2003/10/12 17:33:28 fingolfin Exp $
104 *
105 */
106
107@@ -196,7 +196,6 @@
108
109 _shadowPaletteSize = 256;
110
111- _roomPalette = (byte *) calloc(_shadowPaletteSize, 1); // FIXME - needs to be removed later
112 _shadowPalette = (byte *) calloc(_shadowPaletteSize, 1); // FIXME - needs to be removed later
113 allocateArrays();
114 }
115Index: scumm/resource_v3.cpp
116===================================================================
117RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
118retrieving revision 1.23
119retrieving revision 1.24
120diff -u -r1.23 -r1.24
121--- scumm/resource_v3.cpp 3 Oct 2003 18:33:55 -0000 1.23
122+++ scumm/resource_v3.cpp 12 Oct 2003 17:33:28 -0000 1.24
123@@ -16,7 +16,7 @@
124 * along with this program; if not, write to the Free Software
125 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
126 *
127- * $Header: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v 1.23 2003/10/03 18:33:55 fingolfin Exp $
128+ * $Header: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v 1.24 2003/10/12 17:33:28 fingolfin Exp $
129 *
130 */
131
132@@ -208,7 +208,6 @@
133
134 _shadowPaletteSize = 256;
135
136- _roomPalette = (byte *) calloc(_shadowPaletteSize, 1); // FIXME - needs to be removed later
137 _shadowPalette = (byte *) calloc(_shadowPaletteSize, 1); // FIXME - needs to be removed later
138 allocateArrays();
139 }
140Index: scumm/saveload.cpp
141===================================================================
142RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
143retrieving revision 1.113
144retrieving revision 1.114
145diff -u -r1.113 -r1.114
146--- scumm/saveload.cpp 8 Oct 2003 21:59:22 -0000 1.113
147+++ scumm/saveload.cpp 12 Oct 2003 17:33:28 -0000 1.114
148@@ -16,7 +16,7 @@
149 * along with this program; if not, write to the Free Software
150 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
151 *
152- * $Header: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v 1.113 2003/10/08 21:59:22 fingolfin Exp $
153+ * $Header: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v 1.114 2003/10/12 17:33:28 fingolfin Exp $
154 *
155 */
156
157@@ -615,7 +615,7 @@
158 s->saveLoadArrayOf(_shadowPalette, _shadowPaletteSize, 1, sleByte);
159 // _roomPalette didn't show up until V21 save games
160 if (savegameVersion >= VER(21) && _version < 5)
161- s->saveLoadArrayOf (_roomPalette, _shadowPaletteSize, 1, sleByte);
162+ s->saveLoadArrayOf(_roomPalette, sizeof(_roomPalette), 1, sleByte);
163 }
164
165 // PalManip data was not saved before V10 save games
166Index: scumm/scumm.h
167===================================================================
168RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
169retrieving revision 1.312
170retrieving revision 1.313
171diff -u -r1.312 -r1.313
172--- scumm/scumm.h 6 Oct 2003 19:21:18 -0000 1.312
173+++ scumm/scumm.h 12 Oct 2003 17:33:29 -0000 1.313
174@@ -16,7 +16,7 @@
175 * along with this program; if not, write to the Free Software
176 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
177 *
178- * $Header: /cvsroot/scummvm/scummvm/scumm/scumm.h,v 1.312 2003/10/06 19:21:18 fingolfin Exp $
179+ * $Header: /cvsroot/scummvm/scummvm/scumm/scumm.h,v 1.313 2003/10/12 17:33:29 fingolfin Exp $
180 *
181 */
182
183@@ -950,7 +950,7 @@
184
185 public:
186 byte _proc_special_palette[256];
187- byte *_roomPalette;
188+ byte _roomPalette[256];
189 byte *_shadowPalette;
190
191 protected:
192Index: scumm/scummvm.cpp
193===================================================================
194RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
195retrieving revision 2.434
196retrieving revision 2.435
197diff -u -r2.434 -r2.435
198--- scumm/scummvm.cpp 12 Oct 2003 17:25:27 -0000 2.434
199+++ scumm/scummvm.cpp 12 Oct 2003 17:33:29 -0000 2.435
200@@ -16,7 +16,7 @@
201 * along with this program; if not, write to the Free Software
202 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
203 *
204- * $Header: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v 2.434 2003/10/12 17:25:27 fingolfin Exp $
205+ * $Header: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v 2.435 2003/10/12 17:33:29 fingolfin Exp $
206 *
207 */
208
209@@ -276,6 +276,7 @@
210 // Init all vars - maybe now we can get rid of our custom new/delete operators?
211 _imuse = NULL;
212 _imuseDigital = NULL;
213+ _musicEngine = NULL;
214 _features = 0;
215 _verbs = NULL;
216 _objs = NULL;
217@@ -429,7 +430,6 @@
218 _palManipPalette = NULL;
219 _palManipIntermediatePal = NULL;
220 memset(gfxUsageBits, 0, sizeof(gfxUsageBits));
221- _roomPalette = NULL;
222 _shadowPalette = NULL;
223 _shadowPaletteSize = 0;
224 memset(_currentPalette, 0, sizeof(_currentPalette));
225@@ -664,9 +664,6 @@
226 _mixer->setMusicVolume(kDefaultMusicVolume);
227
228 // Init iMuse
229- _imuse = NULL;
230- _imuseDigital = NULL;
231- _musicEngine = NULL;
232 if (_features & GF_DIGI_IMUSE) {
233 _musicEngine = _imuseDigital = new IMuseDigital(this);
234 #ifndef __PALM_OS__
235@@ -754,8 +751,6 @@
236 fp.close();
237 }
238 }
239-
240- _audioNames = NULL;
241 }
242
243 ScummEngine::~ScummEngine() {
244@@ -780,7 +775,6 @@
245
246 delete _costumeRenderer;
247
248- free(_roomPalette);
249 free(_shadowPalette);
250
251 freeResources();
252@@ -1900,8 +1894,7 @@
253
254 if (_version < 7) {
255 for (i = 0; i < 256; i++) {
256- if (_features & GF_SMALL_HEADER)
257- _roomPalette[i] = i;
258+ _roomPalette[i] = i;
259 _shadowPalette[i] = i;
260 }
261 if (_features & GF_SMALL_HEADER)