[Scummvm-git-logs] scummvm master -> 9dd2e198aec75791ed7052148997bac25a46ec55

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9dd2e198ae TITANIC: Remove redundant CFilesManager::fn4


Commit: 9dd2e198aec75791ed7052148997bac25a46ec55
    https://github.com/scummvm/scummvm/commit/9dd2e198aec75791ed7052148997bac25a46ec55
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-29T21:17:50-04:00

Commit Message:
TITANIC: Remove redundant CFilesManager::fn4

It looks like the original method scanned subfolders for the file,
and prefixed on the found path. We don't need this for ScummVM

Changed paths:
    engines/titanic/support/files_manager.cpp
    engines/titanic/support/files_manager.h
    engines/titanic/support/mouse_cursor.cpp



diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp
index 2d16c8f..3ee17e9 100644
--- a/engines/titanic/support/files_manager.cpp
+++ b/engines/titanic/support/files_manager.cpp
@@ -116,10 +116,6 @@ void CFilesManager::resetView() {
 	}
 }
 
-void CFilesManager::fn4(const CString &name) {
-	warning("TODO: CFilesManager::fn4");
-}
-
 void CFilesManager::preload(const CString &name) {
 	// We don't currently do any preloading of resources
 }
diff --git a/engines/titanic/support/files_manager.h b/engines/titanic/support/files_manager.h
index 454a72d..c530b05 100644
--- a/engines/titanic/support/files_manager.h
+++ b/engines/titanic/support/files_manager.h
@@ -94,8 +94,6 @@ public:
 	 */
 	void resetView();
 
-	void fn4(const CString &name);
-
 	/**
 	 * Preloads and caches a file for access shortly
 	 */
diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp
index 4f949a1..d342e6c 100644
--- a/engines/titanic/support/mouse_cursor.cpp
+++ b/engines/titanic/support/mouse_cursor.cpp
@@ -67,7 +67,6 @@ CMouseCursor::~CMouseCursor() {
 
 void CMouseCursor::loadCursorImages() {
 	const CResourceKey key("ycursors.avi");
-	g_vm->_filesManager->fn4(key.getString());
 
 	// Iterate through getting each cursor
 	for (int idx = 0; idx < NUM_CURSORS; ++idx) {