From 4c8e0a8115cddfffccee693db7a0de1d0a5b01a0 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 28 Aug 2020 15:54:35 +0200 Subject: [PATCH] Clean up code a bit --- command.lua | 1 - gui.lua | 9 +++------ init.lua | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/command.lua b/command.lua index 795b396..fa94dee 100644 --- a/command.lua +++ b/command.lua @@ -1,7 +1,6 @@ local S = calendar._get_translator("calendar") minetest.register_chatcommand("calendar", { - param = "", description = S("Display calendar"), func = function( name, param ) calendar.show_calendar(name) diff --git a/gui.lua b/gui.lua index afd7a3e..2aca754 100644 --- a/gui.lua +++ b/gui.lua @@ -53,21 +53,17 @@ function calendar.show_calendar(player_name, settings, wanted_months, wanted_yea local days, months, years = calendar.get_date() local total_days = minetest.get_day_count() - local ddays, dmonths, dyears = calendar.get_date(nil, settings.ordinal) - local wanted_dmonths, wanted_dyears + local wanted_dyears if not wanted_months then wanted_months = months end if not wanted_years then wanted_years = years end - wanted_dmonths = wanted_months wanted_dyears = wanted_years if settings.ordinal then - wanted_dmonths = wanted_dmonths + 1 wanted_dyears = wanted_dyears + 1 end - local start_day, end_day local tdays = 0 tdays = tdays + wanted_years * (calendar.MONTHS * calendar.MONTH_DAYS) tdays = tdays + wanted_months * calendar.MONTH_DAYS @@ -212,7 +208,8 @@ function calendar.show_calendar(player_name, settings, wanted_months, wanted_yea formspec = "size["..size_x..","..size_y.."]" .. formspec minetest.show_formspec(player_name, "calendar:calendar", formspec) - player_current_calendars[player_name] = { years = wanted_years, months = wanted_months, settings = settings, caption_format = caption_format } + player_current_calendars[player_name] = + { years = wanted_years, months = wanted_months, settings = settings, caption_format = caption_format } end minetest.register_on_player_receive_fields(function(player, formname, fields) diff --git a/init.lua b/init.lua index f5ac17e..42e936e 100644 --- a/init.lua +++ b/init.lua @@ -30,7 +30,6 @@ else end local S = calendar._get_translator("calendar") -local F = minetest.formspec_escape dofile(minetest.get_modpath("calendar").."/gameconfig.lua")