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

fix merge conflict

This commit is contained in:
zeromus 2019-03-18 00:14:12 -04:00
parent 320c868ebd
commit 3a14fc724c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fceu.cpp
View File

@ -404,7 +404,7 @@ int FDSLoad(const char *name, FCEUFILE *fp);
int NSFLoad(const char *name, FCEUFILE *fp); int NSFLoad(const char *name, FCEUFILE *fp);
//char lastLoadedGameName [2048] = {0,}; // hack for movie WRAM clearing on record from poweron //char lastLoadedGameName [2048] = {0,}; // hack for movie WRAM clearing on record from poweron
bool archiveManuallyCanceled; extern bool archiveManuallyCanceled;
//name should be UTF-8, hopefully, or else there may be trouble //name should be UTF-8, hopefully, or else there may be trouble
FCEUGI *FCEUI_LoadGameVirtual(const char *name, int OverwriteVidMode, bool silent) FCEUGI *FCEUI_LoadGameVirtual(const char *name, int OverwriteVidMode, bool silent)