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

Kill many warnings. Note: may waste bytes of memory!

This commit is contained in:
jeblanchard 2008-06-10 16:06:14 +00:00
parent 4b43a1429d
commit 84e7d10f38
6 changed files with 72 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/boards/a9711.cpp
View File

@ -44,15 +44,15 @@ static void UNLA9711PW(uint32 A, uint8 V)
setprg8(A,V&0x3F);
}
static DECLFW(UNLA9711Write8000)
{
//static DECLFW(UNLA9711Write8000)
//{
// FCEU_printf("bs %04x %02x\n",A,V);
// if(V&0x80)
// MMC3_CMDWrite(A,V);
// else
// MMC3_CMDWrite(A,m_perm[V&7]);
// if(V!=0x86) MMC3_CMDWrite(A,V);
}
//}
static DECLFW(UNLA9711WriteLo)
{

4
src/cheat.cpp
View File

@ -485,7 +485,7 @@ static int GGtobin(char c)
}
/* Returns 1 on success, 0 on failure. Sets *a,*v,*c. */
int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c)
int FCEUI_DecodeGG(const char *str, int *a, int *v, int *c)
{
uint16 A;
uint8 V,C;
@ -551,7 +551,7 @@ int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c)
return(0);
}
int FCEUI_DecodePAR(const char *str, uint16 *a, uint8 *v, int *c, int *type)
int FCEUI_DecodePAR(const char *str, int *a, int *v, int *c, int *type)
{
int boo[4];
if(strlen(str)!=8) return(0);

4
src/driver.h
View File

@ -204,8 +204,8 @@ void FCEUI_SaveSnapshot(void);
void FCEU_DispMessage(char *format, ...);
#define FCEUI_DispMessage FCEU_DispMessage
int FCEUI_DecodePAR(const char *code, uint16 *a, uint8 *v, int *c, int *type);
int FCEUI_DecodeGG(const char *str, uint16 *a, uint8 *v, int *c);
int FCEUI_DecodePAR(const char *code, int *a, int *v, int *c, int *type);
int FCEUI_DecodeGG(const char *str, int *a, int *v, int *c);
int FCEUI_AddCheat(const char *name, uint32 addr, uint8 val, int compare, int type);
int FCEUI_DelCheat(uint32 which);
int FCEUI_ToggleCheat(uint32 which);

4
src/drivers/common/cheat.cpp
View File

@ -245,9 +245,7 @@ static void ModifyCheat(int num)
static void AddCheatGGPAR(int which)
{
uint16 A;
uint8 V;
int C;
int A, V, C;
int type;
char name[256],code[256];

30
src/drivers/sdl/input.cpp
View File

@ -1225,35 +1225,35 @@ UpdateInput(Config *config)
if(device == "None") {
UsrInputType[i] = SI_NONE;
} else if(device.find("GamePad") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_GAMEPAD : SI_NONE;
UsrInputType[i] = (i < 2) ? (int)SI_GAMEPAD : (int)SIFC_NONE;
} else if(device.find("PowerPad.0") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_POWERPADA : SI_NONE;
UsrInputType[i] = (i < 2) ? (int)SI_POWERPADA : (int)SIFC_NONE;
} else if(device.find("PowerPad.1") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_POWERPADB : SI_NONE;
UsrInputType[i] = (i < 2) ? (int)SI_POWERPADB : (int)SIFC_NONE;
} else if(device.find("QuizKing") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_QUIZKING;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_QUIZKING;
} else if(device.find("HyperShot") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_HYPERSHOT;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_HYPERSHOT;
} else if(device.find("Mahjong") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_MAHJONG;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_MAHJONG;
} else if(device.find("TopRider") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_TOPRIDER;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_TOPRIDER;
} else if(device.find("FTrainer") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_FTRAINERA;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_FTRAINERA;
} else if(device.find("FamilyKeyBoard") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_FKB;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_FKB;
} else if(device.find("OekaKids") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_OEKAKIDS;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_OEKAKIDS;
} else if(device.find("Arkanoid") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_ARKANOID : SIFC_ARKANOID;
UsrInputType[i] = (i < 2) ? (int)SI_ARKANOID : (int)SIFC_ARKANOID;
} else if(device.find("Shadow") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_SHADOW;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_SHADOW;
} else if(device.find("Zapper") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_ZAPPER : SIFC_NONE;
UsrInputType[i] = (i < 2) ? (int)SI_ZAPPER : (int)SIFC_NONE;
} else if(device.find("BWorld") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_BWORLD;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_BWORLD;
} else if(device.find("4Player") != std::string::npos) {
UsrInputType[i] = (i < 2) ? SI_NONE : SIFC_4PLAYER;
UsrInputType[i] = (i < 2) ? (int)SI_NONE : (int)SIFC_4PLAYER;
} else {
// Unknown device
UsrInputType[i] = SI_NONE;

2
src/drivers/win/cheat.cpp
View File

@ -576,7 +576,7 @@ BOOL CALLBACK GGConvCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
GetDlgItemText(hGGConv,IDC_GAME_GENIE_CODE,GGcode,9);
if((strlen(GGcode) != 8) && (strlen(GGcode) != 6))break;
FCEUI_DecodeGG(GGcode, (uint16 *)&GGaddr, (uint8 *)&GGval, &GGcomp);
FCEUI_DecodeGG(GGcode, &GGaddr, &GGval, &GGcomp);
sprintf(str,"%04X",GGaddr);
SetDlgItemText(hGGConv,IDC_GAME_GENIE_ADDR,str);