aboutsummaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authortwinaphex2021-06-04 22:37:50 +0200
committertwinaphex2021-06-04 22:37:50 +0200
commita17e300a2277f4a890320ce12c82917f68165a83 (patch)
treee54b414939ab0cbdf7ab3bc870270b2bdd463273 /source
parent21df2cef5be2e3865f2826072ab3ef979e0eda1e (diff)
downloadsnes9x2005-a17e300a2277f4a890320ce12c82917f68165a83.tar.gz
snes9x2005-a17e300a2277f4a890320ce12c82917f68165a83.tar.bz2
snes9x2005-a17e300a2277f4a890320ce12c82917f68165a83.zip
Rename LOAD_FROM_MEMORY_TEST to LOAD_FROM_MEMORY
Diffstat (limited to 'source')
-rw-r--r--source/memmap.c7
-rw-r--r--source/memmap.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/source/memmap.c b/source/memmap.c
index 98dd0c3..da04eb4 100644
--- a/source/memmap.c
+++ b/source/memmap.c
@@ -349,8 +349,7 @@ void S9xDeinitMemory(void)
}
}
-#ifndef LOAD_FROM_MEMORY_TEST
-
+#ifndef LOAD_FROM_MEMORY
/* Read variable size MSB int from a file */
static int32_t ReadInt(FILE* f, uint32_t nbytes)
{
@@ -564,7 +563,7 @@ static uint32_t FileLoader(uint8_t* buffer, const char* filename, int32_t maxsiz
/**********************************************************************************************/
bool LoadROM(
-#ifdef LOAD_FROM_MEMORY_TEST
+#ifdef LOAD_FROM_MEMORY
const struct retro_game_info* game
#else
const char* filename
@@ -589,7 +588,7 @@ bool LoadROM(
retry_count = 0;
again:
-#ifdef LOAD_FROM_MEMORY_TEST
+#ifdef LOAD_FROM_MEMORY
strncpy(Memory.ROMFilename, game->path, sizeof(Memory.ROMFilename));
Memory.HeaderCount = 0;
diff --git a/source/memmap.h b/source/memmap.h
index a17a207..5afc18d 100644
--- a/source/memmap.h
+++ b/source/memmap.h
@@ -33,7 +33,7 @@
#define BIGFIRST 2
#define SMALLFIRST 3
-#ifdef LOAD_FROM_MEMORY_TEST
+#ifdef LOAD_FROM_MEMORY
bool LoadROM(const struct retro_game_info* game);
#else
bool LoadROM(const char*);