From fe752bb67a2a43c49c3f1b6d25eb646b1f7d9847 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 11 Jun 2012 20:16:03 +0200 Subject: Lua: Remove dead "patches" code --- lib/core/init.lua | 37 ------------------------------------- lib/core/util.lua | 26 -------------------------- lib/mods/theme/core/init.lua | 37 ------------------------------------- lib/mods/theme/core/util.lua | 26 -------------------------- 4 files changed, 126 deletions(-) (limited to 'lib') diff --git a/lib/core/init.lua b/lib/core/init.lua index 230a07a7..74486ba2 100644 --- a/lib/core/init.lua +++ b/lib/core/init.lua @@ -16,43 +16,6 @@ tome_dofile_anywhere(ANGBAND_DIR_CORE, "objects.lua") tome_dofile_anywhere(ANGBAND_DIR_CORE, "monsters.lua") tome_dofile_anywhere(ANGBAND_DIR_CORE, "dungeon.lua") --- The dofile functions for each patch -patch_dofile = {} - --- Now load patches -function load_patches() - scansubdir(ANGBAND_DIR_PATCH) - for i = 0, scansubdir_max - 1 do - if (scansubdir_result[i + 1] ~= ".") and (scansubdir_result[i + 1] ~= "..") then - local dir = path_build(ANGBAND_DIR_PATCH, scansubdir_result[i + 1]) - local file = path_build(dir, "patch.lua") - if file_exist(file) == TRUE then - patch_init = nil - tome_dofile_anywhere(dir, "patch.lua", TRUE) - unset_safe_globals() - if patch_init == nil then - set_safe_globals() - quit("Patch in "..file.." did not include a patch_init() function") - else - set_safe_globals() - - -- create the dofile function - patch_dofile[scansubdir_result[i + 1]] = function(f) - tome_dofile_anywhere(%dir, f, TRUE) - end - - local name, version = patch_init() - if name == nil or version == nil then - quit("Patch in "..file.." did not return valid name or version.\nIt must return name, version") - end - patch_version(name, version) - end - end - end - end -end -load_patches() - -------------------------------------------------------------- -------------------------------------------------------------- -------------------------------------------------------------- diff --git a/lib/core/util.lua b/lib/core/util.lua index 2d437d61..185c0982 100644 --- a/lib/core/util.lua +++ b/lib/core/util.lua @@ -20,32 +20,6 @@ end set_safe_globals() --- Patch modules -__patch_modules = {} - -function patch_version(name, version) - assert(not __patch_modules[name], "Patch " .. name .. " already loaded!!!") - __patch_modules[name] = version -end - -function patchs_list() - local k, e, first - first = FALSE - for k, e in __patch_modules do - if first == FALSE then print_hook("\n\n [Patch modules]\n") first = TRUE end - print_hook("\n "..k.." version "..e) - end - if first == TRUE then print_hook("\n") end -end - -function patchs_display() - local k, e - for k, e in __patch_modules do - msg_print("Patch: "..k.." version "..e) - end -end - - -- Better hook interface __hooks_list_callback = {} __hooks_list_callback_max = 0 diff --git a/lib/mods/theme/core/init.lua b/lib/mods/theme/core/init.lua index 230a07a7..74486ba2 100644 --- a/lib/mods/theme/core/init.lua +++ b/lib/mods/theme/core/init.lua @@ -16,43 +16,6 @@ tome_dofile_anywhere(ANGBAND_DIR_CORE, "objects.lua") tome_dofile_anywhere(ANGBAND_DIR_CORE, "monsters.lua") tome_dofile_anywhere(ANGBAND_DIR_CORE, "dungeon.lua") --- The dofile functions for each patch -patch_dofile = {} - --- Now load patches -function load_patches() - scansubdir(ANGBAND_DIR_PATCH) - for i = 0, scansubdir_max - 1 do - if (scansubdir_result[i + 1] ~= ".") and (scansubdir_result[i + 1] ~= "..") then - local dir = path_build(ANGBAND_DIR_PATCH, scansubdir_result[i + 1]) - local file = path_build(dir, "patch.lua") - if file_exist(file) == TRUE then - patch_init = nil - tome_dofile_anywhere(dir, "patch.lua", TRUE) - unset_safe_globals() - if patch_init == nil then - set_safe_globals() - quit("Patch in "..file.." did not include a patch_init() function") - else - set_safe_globals() - - -- create the dofile function - patch_dofile[scansubdir_result[i + 1]] = function(f) - tome_dofile_anywhere(%dir, f, TRUE) - end - - local name, version = patch_init() - if name == nil or version == nil then - quit("Patch in "..file.." did not return valid name or version.\nIt must return name, version") - end - patch_version(name, version) - end - end - end - end -end -load_patches() - -------------------------------------------------------------- -------------------------------------------------------------- -------------------------------------------------------------- diff --git a/lib/mods/theme/core/util.lua b/lib/mods/theme/core/util.lua index 2d437d61..185c0982 100644 --- a/lib/mods/theme/core/util.lua +++ b/lib/mods/theme/core/util.lua @@ -20,32 +20,6 @@ end set_safe_globals() --- Patch modules -__patch_modules = {} - -function patch_version(name, version) - assert(not __patch_modules[name], "Patch " .. name .. " already loaded!!!") - __patch_modules[name] = version -end - -function patchs_list() - local k, e, first - first = FALSE - for k, e in __patch_modules do - if first == FALSE then print_hook("\n\n [Patch modules]\n") first = TRUE end - print_hook("\n "..k.." version "..e) - end - if first == TRUE then print_hook("\n") end -end - -function patchs_display() - local k, e - for k, e in __patch_modules do - msg_print("Patch: "..k.." version "..e) - end -end - - -- Better hook interface __hooks_list_callback = {} __hooks_list_callback_max = 0 -- cgit v1.2.3