ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch by Magliocchetti Riccardo: 

fix shadowing of size variable, renamed the offender sz
This commit is contained in:
yabause 2008-11-10 22:18:54 +00:00
parent d6e9f00ebc
commit 6c8d4b2ff0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
desmume/src/saves.cpp
View File

@ -514,35 +514,35 @@ static bool ReadStateChunk(std::istream* is, SFORMAT *sf, int size)
while(is->tellg()<temp+size) while(is->tellg()<temp+size)
{ {
u32 size, count; u32 sz, count;
char toa[4]; char toa[4];
is->read(toa,4); is->read(toa,4);
if(is->fail()) if(is->fail())
return false; return false;
if(!read32le(&size,is)) return false; if(!read32le(&sz,is)) return false;
if(!read32le(&count,is)) return false; if(!read32le(&count,is)) return false;
if((tmp=CheckS(sf,size,count,toa))) if((tmp=CheckS(sf,sz,count,toa)))
{ {
if(size == 1) { if(sz == 1) {
//special case: read a huge byte array //special case: read a huge byte array
is->read((char *)tmp->v,count); is->read((char *)tmp->v,count);
} else { } else {
for(unsigned int i=0;i<count;i++) for(unsigned int i=0;i<count;i++)
{ {
is->read((char *)tmp->v + i*size,size); is->read((char *)tmp->v + i*sz,sz);
#ifndef LOCAL_LE #ifndef LOCAL_LE
if(rlsb) if(rlsb)
FlipByteOrder((u8*)tmp->v + i*size,size); FlipByteOrder((u8*)tmp->v + i*sz,sz);
#endif #endif
} }
} }
} }
else else
is->seekg(size*count,std::ios::cur); is->seekg(sz*count,std::ios::cur);
} // while(...) } // while(...)
return true; return true;
} }