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

a little thing i forgot; fix errors and warnings in gcc.

This commit is contained in:
zeromus 2008-09-19 08:15:54 +00:00
parent b1e4934421
commit cddc94aa9b
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/GPU_osd.cpp
View File

@ -157,4 +157,4 @@ void OSDCLASS::addFixed(u16 x, u16 y, const char *fmt, ...)
} }
old_msg[512]=0; old_msg[512]=0;
needUpdate = true; needUpdate = true;
} }

2
desmume/src/GPU_osd.h
View File

@ -67,4 +67,4 @@ extern OSDCLASS *osd;
extern OSDCLASS *osdA; extern OSDCLASS *osdA;
extern OSDCLASS *osdB; extern OSDCLASS *osdB;
#endif #endif

6
desmume/src/gfx3d.h
View File

@ -90,9 +90,9 @@ struct GFX3D
} }
BOOL enableTexturing, enableAlphaTest, enableAlphaBlending, enableAntialiasing, enableEdgeMarking; BOOL enableTexturing, enableAlphaTest, enableAlphaBlending, enableAntialiasing, enableEdgeMarking;
enum : u32 { static const u32 TOON = 0;
TOON, HIGHLIGHT static const u32 HIGHLIGHT = 0;
} shading; u32 shading;
POLYLIST* polylist; POLYLIST* polylist;
VERTLIST* vertlist; VERTLIST* vertlist;

11
desmume/src/saves.cpp
View File

@ -314,12 +314,13 @@ static bool ReadStateChunk(std::istream* is, SFORMAT *sf, int size)
return false; return false;
read32le(&tsize,is); read32le(&tsize,is);
int count = SS_UNMULT(tsize);
int size = tsize & ~SS_FLAGS;
bool rlsb = (count!=0);
if((tmp=CheckS(sf,tsize,toa))) if((tmp=CheckS(sf,tsize,toa)))
{ {
int count = SS_UNMULT(tsize);
int size = tsize & ~SS_FLAGS;
bool rlsb = (count!=0);
if(count == 0) count=1; if(count == 0) count=1;
@ -337,7 +338,7 @@ static bool ReadStateChunk(std::istream* is, SFORMAT *sf, int size)
} }
} }
else else
is->seekg(tsize,std::ios::cur); is->seekg(size*count,std::ios::cur);
} // while(...) } // while(...)
return true; return true;
} }
@ -591,4 +592,4 @@ bool savestate_load(const char *file_name)
if(!f) return false; if(!f) return false;
return savestate_load(&f); return savestate_load(&f);
} }