Correctly handles multi-line cheats

rileytestut · Apr 20, 2020 · e16b8aa · e16b8aa
1 parent b90b603
commit e16b8aa
Showing 1 changed file with 26 additions and 20 deletions.
diff --git a/SNESDeltaCore/Bridge/SNESEmulatorBridge.mm b/SNESDeltaCore/Bridge/SNESEmulatorBridge.mm
@@ -238,30 +238,36 @@ - (void)loadSaveStateFromURL:(NSURL *)URL
 
 - (BOOL)addCheatCode:(NSString *)cheatCode type:(NSString *)type
 {
-    BOOL success = YES;
-
-    uint32 address = 0;
-    uint8 byte = 0;
-
-    if ([type isEqualToString:CheatTypeGameGenie])
-    {
-        success = (S9xGameGenieToRaw([cheatCode UTF8String], address, byte) == NULL);
-    }
-    else if ([type isEqualToString:CheatTypeActionReplay])
-    {
-        success = (S9xProActionReplayToRaw([cheatCode UTF8String], address, byte) == NULL);
-    }
-    else
-    {
-        success = NO;
-    }
-
-    if (success)
+    NSArray<NSString *> *codes = [cheatCode componentsSeparatedByString:@"\n"];
+    for (NSString *code in codes)
     {
+        BOOL success = YES;
+
+        uint32 address = 0;
+        uint8 byte = 0;
+
+        if ([type isEqualToString:CheatTypeGameGenie])
+        {
+            success = (S9xGameGenieToRaw([code UTF8String], address, byte) == NULL);
+        }
+        else if ([type isEqualToString:CheatTypeActionReplay])
+        {
+            success = (S9xProActionReplayToRaw([code UTF8String], address, byte) == NULL);
+        }
+        else
+        {
+            success = NO;
+        }
+
+        if (!success)
+        {
+            return NO;
+        }
+
         S9xAddCheat(true, true, address, byte);
     }
 
-    return success;
+    return YES;
 }
 
 - (void)resetCheats