linter fixes

Makefile

@@ -82,17 +82,14 @@ endef
 lint:
 	@echo "==> Merging..."
 	@rm -f $(LINT_TMP_LUA) $(LINT_TMP_MAP)
-	@touch $(LINT_TMP_LUA)
 	@line=1; \
 	while IFS= read -r f || [ -n "$$f" ]; do \
 	    [ -z "$$f" ] && continue; \
-	    before=$$(wc -l < $(LINT_TMP_LUA)); \
+	    linecount=$$(awk 'END{print NR}' "$(SRC_DIR)/$$f"); \
-	    cat "$(SRC_DIR)/$$f" >> $(LINT_TMP_LUA); \
-	    printf '\n' >> $(LINT_TMP_LUA); \
-	    after=$$(wc -l < $(LINT_TMP_LUA)); \
-	    linecount=$$((after - before)); \
 	    echo "$$line $$linecount $(SRC_DIR)/$$f" >> $(LINT_TMP_MAP); \
-	    line=$$((line + linecount)); \
+	    cat "$(SRC_DIR)/$$f" >> $(LINT_TMP_LUA); \
+	    echo "" >> $(LINT_TMP_LUA); \
+	    line=$$((line + linecount + 1)); \
 	done < $(ORDER)
 	@echo "==> luacheck..."
 	@luacheck --no-max-line-length $(LINT_TMP_LUA) 2>&1 | awk -v map=$(LINT_TMP_MAP) ' \
@@ -117,7 +114,7 @@ lint:
 	    rest   = substr(rest2, colon3); \
 	    found  = 0; \
 	    for (i = 0; i < NR_map; i++) { \
-	        end_line = start[i] + count[i] -1; \
+	        end_line = start[i] + count[i]; \
 	        if (absline >= start[i] && absline <= end_line) { \
 	            relline = absline - start[i] + 1; \
 	            print fname[i] ":" relline ":" col ":" rest; \

inc/init/init.modules.lua

@@ -8,6 +8,7 @@ local AudioTestWindow = {}
 local MinigameButtonMashWindow = {}
 local MinigameRhythmWindow = {}
 local MinigameDDRWindow = {}
+
 Util = {}
 DesitionManager = {}
 ScreenManager = {} -- New declaration

inc/window/window.intro.lua

@@ -22,3 +22,4 @@ function IntroWindow.update()
     GameWindow.set_state(WINDOW_MENU)
   end
 end
+