Subversion Repositories spk

Rev

Rev 134 | Rev 147 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 134 Rev 143
Line 296... Line 296...
296
				char *newData = NULL;
296
				char *newData = NULL;
297
				size_t size = 0;
297
				size_t size = 0;
298
				size_t newSize = 0;
298
				size_t newSize = 0;
299
 
299
 
300
				if (f->GetData() && f->GetDataSize())
300
				if (f->GetData() && f->GetDataSize())
301
				{
-
 
302
					data = (char *)f->GetData();
301
					data = (char *)f->UncompressData((long *)&size, NULL);
303
					size = static_cast<size_t>(f->GetDataSize());
-
 
304
				}
-
 
305
				else if(f->isExternalFile())
302
				else if(f->isExternalFile())
306
					data = CFileIO(f->filePointer()).ReadToData(&size);
303
					data = CFileIO(f->filePointer()).ReadToData(&size);
307
				if (newfile->GetData() && newfile->GetDataSize())
304
				if (newfile->GetData() && newfile->GetDataSize())
308
				{
-
 
309
					newData = (char *)newfile->GetData();
305
					newData = (char *)f->UncompressData((long *)&newSize, NULL);
310
					newSize = static_cast<size_t>(newfile->GetDataSize());
-
 
311
				}
-
 
312
				else
306
				else
313
					newData = CFileIO(newfile->filePointer()).ReadToData(&newSize);
307
					newData = CFileIO(newfile->filePointer()).ReadToData(&newSize);
314
 
308
 
315
				// compare bytes
309
				// compare bytes
316
				bool matched = false;
310
				bool matched = false;
Line 325... Line 319...
325
							break;
319
							break;
326
						}
320
						}
327
					}
321
					}
328
				}
322
				}
329
 
323
 
330
				if (data && !f->GetData())
324
				if (data)
331
					delete data;
325
					delete data;
332
				if (newData && !newfile->GetData())
326
				if (newData)
333
					delete newData;
327
					delete newData;
334
 
328
 
335
				if (matched)
329
				if (matched)
336
				{
330
				{
337
					if(!f->game() || f->game() == GAME_ALLNEW)
331
					if(!f->game() || f->game() == GAME_ALLNEW)