Fixed many signs, GCC 4 happy.

This commit is contained in:
n-a-c-h
2005-07-19 20:01:07 +00:00
parent 1a1ce5afcc
commit e4160c0b8f
2 changed files with 22 additions and 21 deletions

View File

@@ -1047,7 +1047,7 @@ extern char GNextPath[1024];
extern char SGPath[1024]; extern char SGPath[1024];
void SplitSupport() void SplitSupport()
{ {
unsigned char *ROM = (unsigned char *)romdata; char *ROM = (char *)romdata;
SplittedROM = false; SplittedROM = false;
//Same Game add on //Same Game add on
@@ -1703,7 +1703,7 @@ unsigned int SPC7110IndexSize;
extern unsigned int SPC7110Entries; extern unsigned int SPC7110Entries;
void SPC7PackIndexLoad() void SPC7PackIndexLoad()
{ {
unsigned char *ROM = (unsigned char *)romdata; char *ROM = (char *)romdata;
FILE *fp = 0; FILE *fp = 0;
SPC7110IndexSize = 0; SPC7110IndexSize = 0;
@@ -1827,7 +1827,8 @@ unsigned int CalcCRC32 (unsigned char *start, unsigned int size)
} }
extern unsigned int MsgCount, MessageOn, CRC32; extern unsigned int MsgCount, MessageOn, CRC32;
extern unsigned char IPSPatched, *Msgptr; extern unsigned char IPSPatched;
extern char *Msgptr;
unsigned int showinfogui() unsigned int showinfogui()
{ {
@@ -1973,7 +1974,7 @@ void CheckROMType()
MirrorROM(); MirrorROM();
lorommapmode2 = 0; lorommapmode2 = 0;
if (!strncmp(ROM+0x207FC0, "DERBY STALLION 96", 17) || !strncmp(ROM+Lo, "SOUND NOVEL-TCOOL", 17)) if (!strncmp((char *)ROM+0x207FC0, "DERBY STALLION 96", 17) || !strncmp((char *)ROM+Lo, "SOUND NOVEL-TCOOL", 17))
{ {
lorommapmode2 = 1; lorommapmode2 = 1;
} }
@@ -2211,7 +2212,7 @@ void powercycle(bool sramload)
NextLineCache = 0; NextLineCache = 0;
curexecstate = 1; curexecstate = 1;
if (sramload) { loadSRAM(fnames+1); } if (sramload) { loadSRAM((char *)fnames+1); }
SetupROM(); SetupROM();
asm_call(initsnes); asm_call(initsnes);

View File

@@ -471,8 +471,8 @@ unsigned char firstsaveinc = 0;
extern unsigned int statefileloc, CurrentHandle, SfxRomBuffer, SfxCROM; extern unsigned int statefileloc, CurrentHandle, SfxRomBuffer, SfxCROM;
extern unsigned int SfxLastRamAdr, SfxRAMMem, MsgCount, MessageOn; extern unsigned int SfxLastRamAdr, SfxRAMMem, MsgCount, MessageOn;
extern unsigned char AutoIncSaveSlot, fnamest[512], cbitmode, NoPictureSave; extern unsigned char AutoIncSaveSlot, cbitmode, NoPictureSave;
extern unsigned char *Msgptr; extern char *Msgptr, fnamest[512];
extern unsigned short PrevPicture[64*56]; extern unsigned short PrevPicture[64*56];
static FILE *fhandle; static FILE *fhandle;
@@ -591,11 +591,11 @@ if (!num) \
void statesaver() void statesaver()
{ {
static unsigned char txtsavemsg[] = "STATE - SAVED."; static char txtsavemsg[] = "STATE - SAVED.";
static unsigned char txtrrsvmsg[] = "RR STATE - SAVED."; static char txtrrsvmsg[] = "RR STATE - SAVED.";
static unsigned char *txtsavenum = 0; static char *txtsavenum = 0;
static unsigned char *txtrrsvnum = 0; static char *txtrrsvnum = 0;
//Get the state number //Get the state number
INSERT_POSITION_NUMBER(txtsavemsg, txtsavenum); INSERT_POSITION_NUMBER(txtsavemsg, txtsavenum);
@@ -610,7 +610,7 @@ void statesaver()
if (MovieProcessing == 2) if (MovieProcessing == 2)
{ {
bool mzt_save(char *, bool, bool); bool mzt_save(char *, bool, bool);
if (mzt_save(fnamest+1, (cbitmode && !NoPictureSave) ? true : false, false)) if (mzt_save((char *)fnamest+1, (cbitmode && !NoPictureSave) ? true : false, false))
{ {
Msgptr = txtrrsvmsg; Msgptr = txtrrsvmsg;
MessageOn = MsgCount; MessageOn = MsgCount;
@@ -843,19 +843,19 @@ void zst_sram_load_compressed(FILE *fp)
} }
} }
void stateloader (unsigned char *statename, unsigned char keycheck, unsigned char xfercheck) void stateloader (char *statename, unsigned char keycheck, unsigned char xfercheck)
{ {
extern unsigned char PauseLoad; extern unsigned char PauseLoad;
static unsigned char txtloadmsg[] = "STATE - LOADED."; static char txtloadmsg[] = "STATE - LOADED.";
static unsigned char txtconvmsg[] = "STATE - TOO OLD."; static char txtconvmsg[] = "STATE - TOO OLD.";
static unsigned char txtnfndmsg[] = "UNABLE TO LOAD STATE -."; static char txtnfndmsg[] = "UNABLE TO LOAD STATE -.";
static unsigned char txtrrldmsg[] = "RR STATE - LOADED."; static char txtrrldmsg[] = "RR STATE - LOADED.";
static unsigned char *txtloadnum = 0; static char *txtloadnum = 0;
static unsigned char *txtconvnum = 0; static char *txtconvnum = 0;
static unsigned char *txtnfndnum = 0; static char *txtnfndnum = 0;
static unsigned char *txtrrldnum = 0; static char *txtrrldnum = 0;
//Get the state number //Get the state number
INSERT_POSITION_NUMBER(txtloadmsg, txtloadnum); INSERT_POSITION_NUMBER(txtloadmsg, txtloadnum);