From 83853ccd413c06a4a37a3c91f8c2cb270e42109c Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Fri, 13 Dec 2013 12:58:32 -0500 Subject: [PATCH] Remove support for optdepends.txt --- doc/lua_api.txt | 7 ------- src/mods.cpp | 10 ---------- 2 files changed, 17 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index a8b671eb..28d8b9cc 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -129,13 +129,6 @@ screenshot.png: description.txt: File containing desctiption to be shown within mainmenu. -optdepends.txt: - An alternative way of specifying optional dependencies. - Like depends.txt, a single line contains a single modname. - - NOTE: This file exists for compatibility purposes only and - support for it will be removed from the engine by the end of 2013. - init.lua: The main Lua script. Running this script should register everything it wants to register. Subsequent execution depends on minetest calling the diff --git a/src/mods.cpp b/src/mods.cpp index bcdda01e..90feee30 100644 --- a/src/mods.cpp +++ b/src/mods.cpp @@ -77,16 +77,6 @@ void parseModContents(ModSpec &spec) } } } - - // FIXME: optdepends.txt is deprecated - // remove this code at some point in the future - std::ifstream is2((spec.path+DIR_DELIM+"optdepends.txt").c_str()); - while(is2.good()){ - std::string dep; - std::set symbols; - if(parseDependsLine(is2, dep, symbols)) - spec.optdepends.insert(dep); - } } }