This commit is contained in:
simon.kagstrom 2010-02-28 18:49:41 +00:00
parent af79896457
commit bf100cef0f

View File

@ -183,21 +183,8 @@ void C64::NewPrefs(Prefs *prefs)
TheDisplay->NewPrefs(prefs);
#ifdef __riscos__
// Changed order of calls. If 1541 mode hasn't changed the order is insignificant.
if (prefs->Emul1541Proc) {
// New prefs have 1541 enabled ==> if old prefs had disabled free drives FIRST
TheIEC->NewPrefs(prefs);
TheJob1541->NewPrefs(prefs);
} else {
// New prefs has 1541 disabled ==> if old prefs had enabled free job FIRST
TheJob1541->NewPrefs(prefs);
TheIEC->NewPrefs(prefs);
}
#else
TheIEC->NewPrefs(prefs);
TheJob1541->NewPrefs(prefs);
#endif
TheREU->NewPrefs(prefs);
TheSID->NewPrefs(prefs);
@ -582,9 +569,6 @@ void C64::SaveSnapshot(const char *filename)
}
fclose(f);
#ifdef __riscos__
TheWIMP->SnapshotSaved(true);
#endif
}
@ -665,18 +649,12 @@ bool C64::LoadSnapshot(const char *filename)
}
#endif
Load1541JobState(f);
#ifdef __riscos__
TheWIMP->ThePrefsToWindow();
#endif
} else if (ThePrefs.Emul1541Proc) { // No emulation in snapshot, but currently active?
Prefs *prefs = new Prefs(ThePrefs);
prefs->Emul1541Proc = false;
NewPrefs(prefs);
ThePrefs = *prefs;
delete prefs;
#ifdef __riscos__
TheWIMP->ThePrefsToWindow();
#endif
}
#ifndef FRODO_SC
@ -702,37 +680,6 @@ bool C64::LoadSnapshot(const char *filename)
}
}
#ifdef __BEOS__
#include "C64_Be.h"
#endif
#ifdef AMIGA
#include "C64_Amiga.h"
#endif
#ifdef __unix
# if defined(QTOPIA) or defined(MAEMO)
# include "C64_Embedded.h"
# elif defined(HAVE_SDL)
# include "C64_SDL.h"
# else
# include "C64_x.h"
# endif
#endif
#ifdef GEKKO
# include "C64_SDL.h"
#endif
#ifdef __mac__
#include "C64_mac.h"
#endif
#ifdef WIN32
#include "C64_WIN32.h"
#endif
#ifdef __riscos__
#include "C64_Acorn.h"
#endif