1 files changed, 17 insertions, 35 deletions

diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp
index 094bb839d3..69e8da3526 100644
--- a/backends/platform/n64/osys_n64_base.cpp
+++ b/backends/platform/n64/osys_n64_base.cpp
@@ -30,6 +30,8 @@
 #include "pakfs_save_manager.h"
 #include "framfs_save_manager.h"
 #include "backends/fs/n64/n64-fs-factory.h"
+#include "backends/saves/default/default-saves.h"
+#include "backends/timer/default/default-timer.h"
 
 typedef unsigned long long uint64;
 
@@ -137,9 +139,7 @@ OSystem_N64::OSystem_N64() {
 	_mouseMaxX = _overlayWidth;
 	_mouseMaxY = _overlayHeight;
 
-	_savefile = 0;
 	_mixer = 0;
-	_timer = 0;
 
 	_dirtyOffscreen = false;
 
@@ -154,10 +154,7 @@ OSystem_N64::OSystem_N64() {
 }
 
 OSystem_N64::~OSystem_N64() {
-	delete _savefile;
 	delete _mixer;
-	delete _timer;
-	delete _fsFactory;
 }
 
 void OSystem_N64::initBackend() {
@@ -170,7 +167,7 @@ void OSystem_N64::initBackend() {
 
 	if (FRAM_Detect()) { // Use FlashRAM
 		initFramFS();
-		_savefile = new FRAMSaveManager();
+		_savefileManager = new FRAMSaveManager();
 	} else { // Use PakFS
 		// Init Controller Pak
 		initPakFs();
@@ -185,28 +182,36 @@ void OSystem_N64::initBackend() {
 			}
 		}
 
-		_savefile = new PAKSaveManager();
+		_savefileManager = new PAKSaveManager();
 	}
 
-	_timer = new DefaultTimerManager();
+	_timerManager = new DefaultTimerManager();
 
 	setTimerCallback(&timer_handler, 10);
 
 	setupMixer();
 
-	OSystem::initBackend();
-
+	EventsBaseBackend::initBackend();
 }
 
 bool OSystem_N64::hasFeature(Feature f) {
-	return (f == kFeatureCursorHasPalette);
+	return (f == kFeatureCursorPalette);
 }
 
 void OSystem_N64::setFeatureState(Feature f, bool enable) {
-	return;
+	if (f == kFeatureCursorPalette) {
+		_cursorPaletteDisabled = !enable;
+
+		// Rebuild cursor hicolor buffer
+		rebuildOffscreenMouseBuffer();
+
+		_dirtyOffscreen = true;
+	}
 }
 
 bool OSystem_N64::getFeatureState(Feature f) {
+	if (f == kFeatureCursorPalette)
+		return !_cursorPaletteDisabled;
 	return false;
 }
 
@@ -437,15 +442,6 @@ void OSystem_N64::setCursorPalette(const byte *colors, uint start, uint num) {
 	_dirtyOffscreen = true;
 }
 
-void OSystem_N64::disableCursorPalette(bool disable) {
-	_cursorPaletteDisabled = disable;
-
-	// Rebuild cursor hicolor buffer
-	rebuildOffscreenMouseBuffer();
-
-	_dirtyOffscreen = true;
-}
-
 void OSystem_N64::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
 	//Clip the coordinates
 	if (x < 0) {
@@ -852,21 +848,11 @@ void OSystem_N64::quit() {
 	return;
 }
 
-Common::SaveFileManager *OSystem_N64::getSavefileManager() {
-	assert(_savefile);
-	return _savefile;
-}
-
 Audio::Mixer *OSystem_N64::getMixer() {
 	assert(_mixer);
 	return _mixer;
 }
 
-Common::TimerManager *OSystem_N64::getTimerManager() {
-	assert(_timer);
-	return _timer;
-}
-
 void OSystem_N64::getTimeAndDate(TimeDate &t) const {
 	// No RTC inside the N64, read mips timer to simulate
 	// passing of time, not a perfect solution, but can't think
@@ -884,10 +870,6 @@ void OSystem_N64::getTimeAndDate(TimeDate &t) const {
 	return;
 }
 
-FilesystemFactory *OSystem_N64::getFilesystemFactory() {
-	return _fsFactory;
-}
-
 void OSystem_N64::setTimerCallback(TimerProc callback, int interval) {
 	assert (interval > 0);