ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/image.C
(Generate patch)

Comparing deliantra/server/common/image.C (file contents):
Revision 1.14 by root, Fri Feb 2 22:49:11 2007 UTC vs.
Revision 1.16 by root, Thu Feb 15 15:43:36 2007 UTC

264 * need to match what sum or other utility may come up with - 264 * need to match what sum or other utility may come up with -
265 * as long as we get the same results on the same real file 265 * as long as we get the same results on the same real file
266 * data, it does the job as it lets the client know if 266 * data, it does the job as it lets the client know if
267 * the file has the same data or not. 267 * the file has the same data or not.
268 */ 268 */
269 ROTATE_RIGHT (bmaps_checksum); 269 rotate_right (bmaps_checksum);
270 bmaps_checksum += value & 0xff; 270 bmaps_checksum += value & 0xff;
271 bmaps_checksum &= 0xffffffff; 271 bmaps_checksum &= 0xffffffff;
272 272
273 ROTATE_RIGHT (bmaps_checksum); 273 rotate_right (bmaps_checksum);
274 bmaps_checksum += (value >> 8) & 0xff; 274 bmaps_checksum += (value >> 8) & 0xff;
275 bmaps_checksum &= 0xffffffff; 275 bmaps_checksum &= 0xffffffff;
276 for (l = 0; l < strlen (q); l++) 276 for (l = 0; l < strlen (q); l++)
277 { 277 {
278 ROTATE_RIGHT (bmaps_checksum); 278 rotate_right (bmaps_checksum);
279 bmaps_checksum += q[l]; 279 bmaps_checksum += q[l];
280 bmaps_checksum &= 0xffffffff; 280 bmaps_checksum &= 0xffffffff;
281 } 281 }
282 282
283 xbm[nroffiles].number = value; 283 xbm[nroffiles].number = value;
296 new_faces[i].name = ""; 296 new_faces[i].name = "";
297 new_faces[i].number = i; 297 new_faces[i].number = i;
298 new_faces[i].visibility = 0; 298 new_faces[i].visibility = 0;
299 new_faces[i].magicmap = 255; 299 new_faces[i].magicmap = 255;
300 } 300 }
301
301 for (i = 0; i < nroffiles; i++) 302 for (i = 0; i < nroffiles; i++)
302 {
303 new_faces[xbm[i].number].name = xbm[i].name; 303 new_faces[xbm[i].number].name = xbm[i].name;
304 }
305 304
306 // non-pod datatype, likely not allowed 305 // non-pod datatype, likely not allowed
307 qsort (xbm, nroffiles, sizeof (struct bmappair), (int (*)(const void *, const void *)) compar); 306 qsort (xbm, nroffiles, sizeof (struct bmappair), (int (*)(const void *, const void *)) compar);
308 307
309 ReadFaceData (); 308 ReadFaceData ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines