From 0abfc695fbffffb7997c0fd44185e873cd21f492 Mon Sep 17 00:00:00 2001
From: Daniel Evans <dan@rekt.io>
Date: Wed, 7 Sep 2016 22:05:46 +0100
Subject: [PATCH] Remove GameData::openFile

The openFile API is not useful for implementing the correct
behaviour, so the underlying FileIndex method will be removed
soon.
---
 rwengine/src/engine/GameData.cpp  | 12 +-----------
 rwengine/src/engine/GameData.hpp  |  2 --
 rwengine/src/engine/GameWorld.cpp |  2 +-
 tests/test_cutscene.cpp           |  2 +-
 tests/test_loaderdff.cpp          |  2 +-
 tests/test_rwbstream.cpp          |  2 +-
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/rwengine/src/engine/GameData.cpp b/rwengine/src/engine/GameData.cpp
index b2cef574..8182c188 100644
--- a/rwengine/src/engine/GameData.cpp
+++ b/rwengine/src/engine/GameData.cpp
@@ -383,7 +383,7 @@ void GameData::loadDFF(const std::string& name, bool async)
 
 void GameData::loadIFP(const std::string &name)
 {
-	auto f = openFile(name);
+	auto f = index.openFile(name);
 
 	if(f)
 	{
@@ -458,16 +458,6 @@ void GameData::loadSplash(const std::string &name)
 	engine->state->currentSplash = lower;
 }
 
-FileHandle GameData::openFile(const std::string &name)
-{
-	auto file = index.openFile(name);
-	if( file == nullptr )
-	{
-		logger->error("Data", "Unable to open file: " + name);
-	}
-	return file;
-}
-
 int GameData::getWaterIndexAt(const glm::vec3 &ws) const
 {
 	auto wX = (int) ((ws.x + WATER_WORLD_SIZE/2.f) / (WATER_WORLD_SIZE/WATER_HQ_DATA_SIZE));
diff --git a/rwengine/src/engine/GameData.hpp b/rwengine/src/engine/GameData.hpp
index bea054f5..7adc0cf5 100644
--- a/rwengine/src/engine/GameData.hpp
+++ b/rwengine/src/engine/GameData.hpp
@@ -147,8 +147,6 @@ public:
 
 	void loadSplash(const std::string& name);
 
-	FileHandle openFile(const std::string& name);
-
 	TextureData::Handle findTexture( const std::string& name, const std::string& alpha = "" )
 	{
 		return textures[{name, alpha}];
diff --git a/rwengine/src/engine/GameWorld.cpp b/rwengine/src/engine/GameWorld.cpp
index eefb7c40..ca16e548 100644
--- a/rwengine/src/engine/GameWorld.cpp
+++ b/rwengine/src/engine/GameWorld.cpp
@@ -844,7 +844,7 @@ void GameWorld::loadCutscene(const std::string &name)
 	std::string lowerName(name);
 	std::transform(lowerName.begin(), lowerName.end(), lowerName.begin(), ::tolower);
 
-	auto datfile = data->openFile(lowerName + ".dat");
+	auto datfile = data->index.openFile(lowerName + ".dat");
 
 	CutsceneData* cutscene = new CutsceneData;
 
diff --git a/tests/test_cutscene.cpp b/tests/test_cutscene.cpp
index 0f7c84fd..c2c014ba 100644
--- a/tests/test_cutscene.cpp
+++ b/tests/test_cutscene.cpp
@@ -9,7 +9,7 @@ BOOST_AUTO_TEST_SUITE(CutsceneTests)
 BOOST_AUTO_TEST_CASE(test_load)
 {
 	{
-		auto d = Global::get().e->data->openFile("intro.dat");
+		auto d = Global::get().e->data->index.openFile("intro.dat");
 
 		CutsceneTracks tracks;
 
diff --git a/tests/test_loaderdff.cpp b/tests/test_loaderdff.cpp
index 534b4a45..b293977c 100644
--- a/tests/test_loaderdff.cpp
+++ b/tests/test_loaderdff.cpp
@@ -10,7 +10,7 @@ BOOST_AUTO_TEST_SUITE(LoaderDFFTests)
 BOOST_AUTO_TEST_CASE(test_load_dff)
 {
 	{
-		auto d = Global::get().e->data->openFile("landstal.dff");
+		auto d = Global::get().e->data->index.openFile("landstal.dff");
 
 		LoaderDFF loader;
 
diff --git a/tests/test_rwbstream.cpp b/tests/test_rwbstream.cpp
index da51b6d0..49f8c6fb 100644
--- a/tests/test_rwbstream.cpp
+++ b/tests/test_rwbstream.cpp
@@ -8,7 +8,7 @@ BOOST_AUTO_TEST_SUITE(RWBStreamTests)
 BOOST_AUTO_TEST_CASE(iterate_stream_test)
 {
 	{
-		auto d = Global::get().e->data->openFile("landstal.dff");
+		auto d = Global::get().e->data->index.openFile("landstal.dff");
 		
 		RWBStream stream(d->data, d->length);