Remove unused parameters from NDS_LoadROM().

This commit is contained in:
riccardom 2009-06-02 18:52:54 +00:00
parent fb6bf65dfd
commit 327dc2c2b9
7 changed files with 10 additions and 23 deletions

View File

@ -713,9 +713,9 @@ static void NDS_SetROMSerial()
}
#ifdef EXPERIMENTAL_GBASLOT
int NDS_LoadROM( const char *filename, int bmtype, u32 bmsize)
int NDS_LoadROM( const char *filename)
#else
int NDS_LoadROM( const char *filename, int bmtype, u32 bmsize,
int NDS_LoadROM( const char *filename,
const char *cflash_disk_image_file)
#endif
{

View File

@ -274,9 +274,9 @@ void NDS_setPad(bool R,bool L,bool D,bool U,bool T,bool S,bool B,bool A,bool Y,b
void NDS_setPadFromMovie(u16 pad);
#ifdef EXPERIMENTAL_GBASLOT
int NDS_LoadROM(const char *filename, int bmtype, u32 bmsize);
int NDS_LoadROM(const char *filename);
#else
int NDS_LoadROM(const char *filename, int bmtype, u32 bmsize,
int NDS_LoadROM(const char *filename,
const char *cflash_disk_image_file);
#endif
void NDS_FreeROM(void);

View File

@ -60,9 +60,6 @@
volatile BOOL execute = FALSE;
int backupmemorytype=MC_TYPE_AUTODETECT;
u32 backupmemorysize=1;
static float nds_screen_size_ratio = 1.0f;
#define DISPLAY_FPS 1
@ -705,7 +702,7 @@ int main(int argc, char ** argv) {
backup_setManualBackupType(my_config.savetype);
if (NDS_LoadROM( my_config.nds_file, backupmemorytype, backupmemorysize, my_config.cflash_disk_image_file) < 0) {
if (NDS_LoadROM( my_config.nds_file, my_config.cflash_disk_image_file) < 0) {
fprintf(stderr, "error while loading %s\n", my_config.nds_file);
exit(-1);
}

View File

@ -68,9 +68,6 @@ SoundInterface_struct *SNDCoreList[] = {
NULL
};
static int backupmemorytype=MC_TYPE_AUTODETECT;
static u32 backupmemorysize=1;
struct NDS_fw_config_data firmware;
bool opengl_init()
@ -380,7 +377,7 @@ bool opengl_init()
flash = NULL;
//load the rom
if(!NDS_LoadROM([filename cStringUsingEncoding:NSUTF8StringEncoding], backupmemorytype, backupmemorysize, flash) > 0)
if(!NDS_LoadROM([filename cStringUsingEncoding:NSUTF8StringEncoding], flash) > 0)
{
//if it didn't work give an error and dont unpause
messageDialog(NSLocalizedString(@"Error", nil), @"Could not open file");

View File

@ -31,8 +31,6 @@ static BOOL regMainLoop = FALSE;
static BOOL noticed_3D=FALSE;
volatile BOOL execute = FALSE;
BOOL click = FALSE;
int savetype=MC_TYPE_AUTODETECT;
u32 savesize=1;
void desmume_mem_init();
@ -65,7 +63,7 @@ int desmume_open(const char *filename)
int i;
noticed_3D=FALSE;
clear_savestates();
i = NDS_LoadROM(filename, savetype, savesize, NULL);
i = NDS_LoadROM(filename, NULL);
return i;
}

View File

@ -66,9 +66,6 @@
#define HAVE_TIMEOUT 1
#endif
static int backupmemorytype=MC_TYPE_AUTODETECT;
static u32 backupmemorysize=1;
static const char *bad_glob_cflash_disk_image_file;
#define SCREENS_PIXEL_SIZE (256*192*2)
@ -562,7 +559,7 @@ static void ToggleStatusbarVisible(GtkToggleAction *action)
static int Open(const char *filename, const char *cflash_disk_image)
{
return NDS_LoadROM( filename, backupmemorytype, backupmemorysize, cflash_disk_image );
return NDS_LoadROM( filename, cflash_disk_image );
}
static void Launch()

View File

@ -255,8 +255,6 @@ GPU3DInterface *core3DList[] = {
int autoframeskipenab=0;
int frameskiprate=0;
int emu_paused = 0;
int backupmemorytype=MC_TYPE_AUTODETECT;
u32 backupmemorysize=1;
bool frameAdvance = false;
bool frameCounterDisplay = false;
bool FpsDisplay = false;
@ -1372,9 +1370,9 @@ static BOOL LoadROM(const char * filename, const char *cflash_disk_image)
//if (strcmp(filename,"")!=0) INFO("Attempting to load ROM: %s\n",filename);
#ifdef EXPERIMENTAL_GBASLOT
if (NDS_LoadROM(filename, backupmemorytype, backupmemorysize) > 0)
if (NDS_LoadROM(filename) > 0)
#else
if (NDS_LoadROM(filename, backupmemorytype, backupmemorysize, cflash_disk_image) > 0)
if (NDS_LoadROM(filename, cflash_disk_image) > 0)
#endif
{
INFO("Loading %s was successful\n",filename);