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

Add a missing free of a NDS_header struct. While at it cleanup things a bit.

This commit is contained in:
riccardom 2009-01-31 13:23:31 +00:00
parent 3221fc2a88
commit 97b86029a6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/NDSSystem.cpp
View File

@ -218,7 +218,7 @@ BOOL NDS_SetROM(u8 * rom, u32 mask)
NDS_header * NDS_getROMHeader(void)
{
NDS_header * header = new NDS_header();
NDS_header * header = new NDS_header;
memcpy(header->gameTile, MMU.CART_ROM, 12);
memcpy(header->gameCode, MMU.CART_ROM + 12, 4);
@ -261,8 +261,6 @@ NDS_header * NDS_getROMHeader(void)
memcpy(header->reserved, MMU.CART_ROM + 352, 160);
return header;
//return (NDS_header *)MMU.CART_ROM;
}
void NDS_setTouchPos(u16 x, u16 y)
@ -503,6 +501,7 @@ int NDS_LoadROM( const char *filename, int bmtype, u32 bmsize,
}
INFO("\nROM serial: %s\n\n", buf);
strncpy(ROMserial, buf, sizeof(ROMserial));
delete header;
return i;
}

4
desmume/src/NDSSystem.h
View File

@ -52,7 +52,7 @@ extern char pathFilenameToROMwithoutExt[MAX_PATH];
//#define LOG_ARM9
//#define LOG_ARM7
typedef struct
struct NDS_header
{
char gameTile[12];
char gameCode[4];
@ -101,7 +101,7 @@ typedef struct
u16 logoCRC16;
u16 headerCRC16;
u8 reserved[160];
} NDS_header;
};
extern void debug();
void emu_halt();