v2.13 Update

crystalct · Nov 21, 2020 · 6050e0f · 6050e0f · SoOzAciD · Dec 13, 2020
1 parent a184b4d
commit 6050e0f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/source/.vs/VSWorkspaceState.json b/source/.vs/VSWorkspaceState.json
@@ -2,6 +2,6 @@
   "ExpandedNodes": [
     ""
   ],
-  "SelectedNode": "\\fba_rl_input.cpp",
+  "SelectedNode": "\\fba_rl_render.cpp",
   "PreviewInSolutionExplorer": false
 }
diff --git a/source/.vs/slnx.sqlite b/source/.vs/slnx.sqlite
diff --git a/source/.vs/source/v16/.suo b/source/.vs/source/v16/.suo
diff --git a/source/.vs/source/v16/Browse.VC.db b/source/.vs/source/v16/Browse.VC.db
diff --git a/source/.vs/source/v16/ipch/AutoPCH/ea7a07ee097cceb7/FBA_RL_SECTION.ipch b/source/.vs/source/v16/ipch/AutoPCH/ea7a07ee097cceb7/FBA_RL_SECTION.ipch
diff --git a/source/fba_rl_utility.cpp b/source/fba_rl_utility.cpp
@@ -256,7 +256,11 @@ void c_fbaRL::LaunchFBACore(char* arg1, char* arg2, char* arg3, char* arg4, char
             return;
 	}
 	if (strcmp(fgames[nSelectedGame]->sysmask, "MASKMEGADRIVE") == 0){
-		char core_path[]	= "/dev_hdd0/game/FBNE00123/USRDIR/cores/genesis_plus_gx.SELF";
+		char core_path[256];
+		if (strcmp(fgames[nSelectedGame]->subsystem, "megacd") == 0 || g_opt_nMegaDriveDefaultCore == 1)
+			sprintf(core_path, "/dev_hdd0/game/FBNE00123/USRDIR/cores/genesis_plus_gx.SELF");
+		else
+			sprintf(core_path, "/dev_hdd0/game/FBNE00123/USRDIR/cores/fb_neo.SELF");
 //		char core_path[]	= "/dev_hdd0/game/FBNE00123/USRDIR/cores/fb_neo.SELF";
 //		argv[11] = (char *)malloc(13);
 //        argv[12] = (char *)malloc(3);