From 8a89a598f85f155aa6aa59b870686bb6e89291cd Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 6 Jul 2008 02:35:00 +0000 Subject: [PATCH] If cheats file loaded, message is sent to window --- src/cheat.cpp | 3 ++- src/fceu.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cheat.cpp b/src/cheat.cpp index 8bb83bd6..798844d0 100644 --- a/src/cheat.cpp +++ b/src/cheat.cpp @@ -206,7 +206,8 @@ void FCEU_LoadGameCheats(FILE *override) if(!fp) return; } - FCEU_printf("Cheats file loaded.\n"); + FCEU_DispMessage("Cheats file loaded."); //Tells user a cheats file was loaded. + FCEU_printf("Cheats file loaded.\n"); //Sends message to message log. while(fgets(linebuf,2048,fp)>0) { char *tbuf=linebuf; diff --git a/src/fceu.cpp b/src/fceu.cpp index c35446c3..acbaaf80 100644 --- a/src/fceu.cpp +++ b/src/fceu.cpp @@ -383,16 +383,15 @@ endlseq: PowerNES(); FCEUSS_CheckStates(); - if(GameInfo->type!=GIT_NSF) - { FCEU_LoadGamePalette(); - FCEU_LoadGameCheats(0); - } FCEU_ResetPalette(); FCEU_ResetMessages(); // Save state, status messages, etc. - + + if(GameInfo->type!=GIT_NSF) + FCEU_LoadGameCheats(0); + return GameInfo; }