ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use correct directory configuration: BasicBot, Memory Watch, FDS BIOS ROM and Record Movie from savestate

This commit is contained in:
mauzus 2008-05-13 02:34:39 +00:00
parent 9e1f1d82e9
commit 014e0365e4
7 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver.h
View File

@ -239,10 +239,10 @@ void FCEUI_CheatSearchSetCurrentAsOriginal(void);
#define FCEUIOD_NV 2 #define FCEUIOD_NV 2
#define FCEUIOD_CHEATS 3 #define FCEUIOD_CHEATS 3
#define FCEUIOD_MISC 4 #define FCEUIOD_MISC 4
#define FCEUIOD_MEMW 5 #define FCEUIOD_MEMW 5
#define FCEUIOD_BBOT 6 #define FCEUIOD_BBOT 6
#define FCEUIOD_MACRO 7 #define FCEUIOD_MACRO 7
#define FCEUIOD_FDS 8 #define FCEUIOD_FDSROM 8
#define FCEUIOD__COUNT 9 #define FCEUIOD__COUNT 9

4
src/drivers/win/basicbot.cpp
View File

@ -2014,7 +2014,7 @@ static bool SaveBasicBot()
ofn.lpstrFile=nameo; ofn.lpstrFile=nameo;
ofn.nMaxFile=256; ofn.nMaxFile=256;
ofn.Flags=OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT; ofn.Flags=OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT;
ofn.lpstrInitialDir=BasicBotDir; ofn.lpstrInitialDir=FCEU_GetPath(FCEUMKF_BBOT);
if(GetSaveFileName(&ofn)) if(GetSaveFileName(&ofn))
{ {
/* /*
@ -2111,7 +2111,7 @@ static bool LoadBasicBot()
ofn.lpstrFile=nameo; ofn.lpstrFile=nameo;
ofn.nMaxFile=256; ofn.nMaxFile=256;
ofn.Flags=OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY; ofn.Flags=OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY;
ofn.lpstrInitialDir=BasicBotDir; ofn.lpstrInitialDir=FCEU_GetPath(FCEUMKF_BBOT);
if(GetOpenFileName(&ofn)) if(GetOpenFileName(&ofn))
{ {

2
src/drivers/win/main.cpp
View File

@ -168,7 +168,7 @@ void SetDirs()
FCEUIOD_MEMW, FCEUIOD_MEMW,
FCEUIOD_BBOT, FCEUIOD_BBOT,
FCEUIOD_MACRO, FCEUIOD_MACRO,
FCEUIOD_FDS, FCEUIOD_FDSROM,
FCEUIOD__COUNT}; FCEUIOD__COUNT};
FCEUI_SetSnapName(eoptions & EO_SNAPNAME); FCEUI_SetSnapName(eoptions & EO_SNAPNAME);

4
src/drivers/win/memwatch.cpp
View File

@ -276,7 +276,7 @@ static void SaveMemWatch()
ofn.lpstrFile=nameo; ofn.lpstrFile=nameo;
ofn.nMaxFile=256; ofn.nMaxFile=256;
ofn.Flags=OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT; ofn.Flags=OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT;
ofn.lpstrInitialDir=MemWatchDir; ofn.lpstrInitialDir=FCEU_GetPath(FCEUMKF_MEMW);
if(GetSaveFileName(&ofn)) if(GetSaveFileName(&ofn))
{ {
int i; int i;
@ -348,7 +348,7 @@ static void LoadMemWatch()
ofn.lpstrFile=nameo; ofn.lpstrFile=nameo;
ofn.nMaxFile=256; ofn.nMaxFile=256;
ofn.Flags=OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY; ofn.Flags=OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY;
ofn.lpstrInitialDir=MemWatchDir; ofn.lpstrInitialDir=FCEU_GetPath(FCEUMKF_MEMW);
if(GetOpenFileName(&ofn)) if(GetOpenFileName(&ofn))
{ {

2
src/drivers/win/replay.cpp
View File

@ -89,7 +89,7 @@ static char* GetSavePath(HWND hwndDlg)
_splitpath(fn, szDrive, szDirectory, szFilename, szExt); _splitpath(fn, szDrive, szDirectory, szFilename, szExt);
if(szDrive[0]=='\0' && szDirectory[0]=='\0') if(szDrive[0]=='\0' && szDirectory[0]=='\0')
{ {
char* newfn=FCEU_MakePath(FCEUMKF_MOVIE, fn); // need to make a full path char* newfn=FCEU_MakePath(FCEUMKF_STATE, fn); // need to make a full path
free(fn); free(fn);
fn=newfn; fn=newfn;
} }

34
src/file.cpp
View File

@ -645,13 +645,23 @@ char* FCEU_GetPath(int type)
case FCEUMKF_STATE:if(odirs[FCEUIOD_STATE]) case FCEUMKF_STATE:if(odirs[FCEUIOD_STATE])
ret=strdup(odirs[FCEUIOD_STATE]); ret=strdup(odirs[FCEUIOD_STATE]);
else else
asprintf(&ret,"%s"PSS"movie",BaseDirectory); asprintf(&ret,"%s"PSS"fcs",BaseDirectory);
break; break;
case FCEUMKF_MOVIE:if(odirs[FCEUIOD_MISC]) case FCEUMKF_MOVIE:if(odirs[FCEUIOD_MISC])
ret=strdup(odirs[FCEUIOD_MISC]); ret=strdup(odirs[FCEUIOD_MISC]);
else else
asprintf(&ret,"%s"PSS"movie",BaseDirectory); asprintf(&ret,"%s"PSS"movie",BaseDirectory);
break; break;
case FCEUMKF_MEMW:if(odirs[FCEUIOD_MEMW])
ret=strdup(odirs[FCEUIOD_MEMW]);
else
asprintf(&ret,"%s"PSS"memwatch",BaseDirectory);
break;
case FCEUMKF_BBOT:if(odirs[FCEUIOD_BBOT])
ret=strdup(odirs[FCEUIOD_BBOT]);
else
asprintf(&ret,"%s"PSS"basicbot",BaseDirectory);
break;
} }
return(ret); return(ret);
} }
@ -667,6 +677,11 @@ char *FCEU_MakePath(int type, const char* filebase)
else else
asprintf(&ret,"%s"PSS"movie"PSS"%s",BaseDirectory,filebase); asprintf(&ret,"%s"PSS"movie"PSS"%s",BaseDirectory,filebase);
break; break;
case FCEUMKF_STATE:if(odirs[FCEUIOD_STATE])
asprintf(&ret,"%s"PSS"%s",odirs[FCEUIOD_STATE],filebase);
else
asprintf(&ret,"%s"PSS"fcs"PSS"%s",BaseDirectory,filebase);
break;
} }
return(ret); return(ret);
} }
@ -785,13 +800,18 @@ char *FCEU_MakeFName(int type, int id1, char *cd1)
case FCEUMKF_IPS: asprintf(&ret,"%s"PSS"%s%s.ips",FileBaseDirectory,FileBase,FileExt); case FCEUMKF_IPS: asprintf(&ret,"%s"PSS"%s%s.ips",FileBaseDirectory,FileBase,FileExt);
break; break;
case FCEUMKF_GGROM:asprintf(&ret,"%s"PSS"gg.rom",BaseDirectory);break; case FCEUMKF_GGROM:asprintf(&ret,"%s"PSS"gg.rom",BaseDirectory);break;
case FCEUMKF_FDSROM:asprintf(&ret,"%s"PSS"disksys.rom",BaseDirectory);break; case FCEUMKF_FDSROM:
if(odirs[FCEUIOD_FDSROM])
asprintf(&ret,"%s"PSS"disksys.rom",odirs[FCEUIOD_FDSROM],FileBase);
else
asprintf(&ret,"%s"PSS"disksys.rom",BaseDirectory,FileBase);
break;
case FCEUMKF_PALETTE: case FCEUMKF_PALETTE:
if(odirs[FCEUIOD_MISC]) if(odirs[FCEUIOD_MISC])
asprintf(&ret,"%s"PSS"%s.pal",odirs[FCEUIOD_MISC],FileBase); asprintf(&ret,"%s"PSS"%s.pal",odirs[FCEUIOD_MISC],FileBase);
else else
asprintf(&ret,"%s"PSS"%s.pal",BaseDirectory,FileBase); asprintf(&ret,"%s"PSS"%s.pal",BaseDirectory,FileBase);
break; break;
case FCEUMKF_MOVIEGLOB: case FCEUMKF_MOVIEGLOB:
if(odirs[FCEUIOD_MISC]) if(odirs[FCEUIOD_MISC])
// asprintf(&ret,"%s"PSS"%s*.fcm",odirs[FCEUIOD_MISC],FileBase); // asprintf(&ret,"%s"PSS"%s*.fcm",odirs[FCEUIOD_MISC],FileBase);

2
src/file.h
View File

@ -41,5 +41,7 @@ char *FCEU_MakeFName(int type, int id1, char *cd1);
#define FCEUMKF_STATEGLOB 13 #define FCEUMKF_STATEGLOB 13
#define FCEUMKF_MOVIEGLOB2 14 #define FCEUMKF_MOVIEGLOB2 14
#define FCEUMKF_REWINDSTATE 15 #define FCEUMKF_REWINDSTATE 15
#define FCEUMKF_MEMW 16
#define FCEUMKF_BBOT 17
#endif #endif