diff options
| author | Jaedyn Draper | 2012-12-27 23:19:47 -0800 |
|---|---|---|
| committer | Jaedyn Draper | 2012-12-27 23:19:47 -0800 |
| commit | 3fff289e60df73b25c483807f5cf73c011804117 (patch) | |
| tree | d8a44c6256c2a7652b028525054e0e55d756ff15 /source/memmap.cpp | |
| parent | 74211924afc184870627c90ce522c4c5743761db (diff) | |
| parent | c01a2a42168695233ecc69c4a60ed918e7701fb9 (diff) | |
| download | snes9x2005-3fff289e60df73b25c483807f5cf73c011804117.tar.gz snes9x2005-3fff289e60df73b25c483807f5cf73c011804117.tar.bz2 snes9x2005-3fff289e60df73b25c483807f5cf73c011804117.zip | |
Merge pull request #26 from Nebuleon/master
Merge to CATSFC 1.10+
Diffstat (limited to 'source/memmap.cpp')
| -rw-r--r-- | source/memmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/memmap.cpp b/source/memmap.cpp index 65b8739..04bc621 100644 --- a/source/memmap.cpp +++ b/source/memmap.cpp @@ -146,7 +146,7 @@ int is_bsx(unsigned char *); int bs_name(unsigned char *); int check_char(unsigned); void S9xDeinterleaveType2 (bool8 reset=TRUE); -inline uint32 caCRC32(uint8 *array, uint32 size, register uint32 crc32 = 0xFFFFFFFF); +uint32 caCRC32(uint8 *array, uint32 size, register uint32 crc32 = 0xFFFFFFFF); extern char *rom_filename; @@ -395,7 +395,7 @@ char *CMemory::Safe (const char *s) /**********************************************************************************************/ /* Init() */ -/* This function allocates all the memory needed by the emulator */ +/* This function allocates and zeroes all the memory needed by the emulator */ /**********************************************************************************************/ bool8 CMemory::Init () { @@ -1213,7 +1213,7 @@ void S9xDeinterleaveType2 (bool8 reset) } //CRC32 for char arrays -inline uint32 caCRC32(uint8 *array, uint32 size, register uint32 crc32) +uint32 caCRC32(uint8 *array, uint32 size, register uint32 crc32) { for (register uint32 i = 0; i < size; i++) { |