[libretro] Detect SG-1000 roms based on file extension. Fix #103

Author: drhelius

platforms/libretro/libretro.cpp

@@ -556,7 +556,7 @@ bool retro_load_game(const struct retro_game_info *info)
 
     log_cb(RETRO_LOG_INFO, "Loading game: %s\n", retro_game_path);
 
-    if (!core->LoadROMFromBuffer(reinterpret_cast<const u8*>(info->data), info->size, &config))
+    if (!core->LoadROMFromBuffer(reinterpret_cast<const u8*>(info->data), info->size, &config, retro_game_path))
     {
         log_cb(RETRO_LOG_ERROR, "Invalid or corrupted ROM.\n");
         return false;

src/Cartridge.cpp

@@ -307,30 +307,7 @@ bool Cartridge::LoadFromFile(const char* path)
 
     Reset();
 
-    strcpy(m_szFilePath, path);
-
-    std::string pathstr(path);
-    std::string filename;
-
-    size_t pos = pathstr.find_last_of("\\");
-    if (pos != std::string::npos)
-    {
-        filename.assign(pathstr.begin() + pos + 1, pathstr.end());
-    }
-    else
-    {
-        pos = pathstr.find_last_of("/");
-        if (pos != std::string::npos)
-        {
-            filename.assign(pathstr.begin() + pos + 1, pathstr.end());
-        }
-        else
-        {
-            filename = pathstr;
-        }
-    }
-
-    strcpy(m_szFileName, filename.c_str());
+    SetROMPath(path);
 
     ifstream file(path, ios::in | ios::binary | ios::ate);
 
@@ -383,10 +360,12 @@ bool Cartridge::LoadFromFile(const char* path)
     return m_bReady;
 }
 
-bool Cartridge::LoadFromBuffer(const u8* buffer, int size)
+bool Cartridge::LoadFromBuffer(const u8* buffer, int size, const char* path)
 {
     if (IsValidPointer(buffer))
     {
+        SetROMPath(path);
+
         Log("Loading from buffer... Size: %d", size);
         // Some ROMs have 512 Byte File Headers
         if ((size % 1024) == 512)
@@ -432,6 +411,37 @@ bool Cartridge::TestValidROM(u16 location)
     return (strcmp(tmrsega, "TMR SEGA") == 0);
 }
 
+void Cartridge::SetROMPath(const char* path)
+{
+    if (!IsValidPointer(path))
+        return;
+
+    strcpy(m_szFilePath, path);
+
+    std::string pathstr(path);
+    std::string filename;
+
+    size_t pos = pathstr.find_last_of("\\");
+    if (pos != std::string::npos)
+    {
+        filename.assign(pathstr.begin() + pos + 1, pathstr.end());
+    }
+    else
+    {
+        pos = pathstr.find_last_of("/");
+        if (pos != std::string::npos)
+        {
+            filename.assign(pathstr.begin() + pos + 1, pathstr.end());
+        }
+        else
+        {
+            filename = pathstr;
+        }
+    }
+
+    strcpy(m_szFileName, filename.c_str());
+}
+
 bool Cartridge::GatherMetadata(u32 crc)
 {
     m_bPAL = false;

src/Cartridge.h

@@ -92,7 +92,7 @@ class Cartridge
     const char* GetFileName() const;
     u8* GetROM() const;
     bool LoadFromFile(const char* path);
-    bool LoadFromBuffer(const u8* buffer, int size);
+    bool LoadFromBuffer(const u8* buffer, int size, const char* path = NULL);
     void SetGameGenieCheat(const char* szCheat);
     void ClearGameGenieCheats();
 
@@ -101,6 +101,7 @@ class Cartridge
     void GetInfoFromDB(u32 crc);
     bool LoadFromZipFile(const u8* buffer, int size);
     bool TestValidROM(u16 location);
+    void SetROMPath(const char* path);
 
 private:
     u8* m_pROM;

src/GearsystemCore.cpp

@@ -169,9 +169,9 @@ bool GearsystemCore::LoadROM(const char* szFilePath, Cartridge::ForceConfigurati
         return false;
 }
 
-bool GearsystemCore::LoadROMFromBuffer(const u8* buffer, int size, Cartridge::ForceConfiguration* config)
+bool GearsystemCore::LoadROMFromBuffer(const u8* buffer, int size, Cartridge::ForceConfiguration* config, const char* szFilePath)
 {
-    if (m_pCartridge->LoadFromBuffer(buffer, size))
+    if (m_pCartridge->LoadFromBuffer(buffer, size, szFilePath))
     {
         if (IsValidPointer(config))
             m_pCartridge->ForceConfig(*config);

src/GearsystemCore.h

@@ -56,7 +56,7 @@ class GearsystemCore
     void Init(GS_Color_Format pixelFormat = GS_PIXEL_RGB888);
     bool RunToVBlank(u8* pFrameBuffer, s16* pSampleBuffer, int* pSampleCount, bool step = false, bool stopOnBreakpoints = false);
     bool LoadROM(const char* szFilePath, Cartridge::ForceConfiguration* config = NULL);
-    bool LoadROMFromBuffer(const u8* buffer, int size, Cartridge::ForceConfiguration* config = NULL);
+    bool LoadROMFromBuffer(const u8* buffer, int size, Cartridge::ForceConfiguration* config = NULL, const char* szFilePath = NULL);
     void SaveMemoryDump();
     void SaveDisassembledROM();
     bool GetRuntimeInfo(GS_RuntimeInfo& runtime_info);