alphabetized functions in input.c and moved declarations to input.h

Author: kurtmweber

.gitignore

@@ -4,6 +4,7 @@
 src/*.o
 src/.deps
 src/.deps/*
+src/.*
 .gitignore
 *core*
 src/*core*

ChangeLog

@@ -1,4 +1,5 @@
 for version 0.12
+  * code refactoring: alphabetized functions in input.c and moved declarations to input.h (kmw, 2017-12-26)
   * when a non-player creature kills another creature, that creature is properly killed in-game (i.e. via killCreature()) rather than just
     ignored (kmw, 2018-04-28)
   * code refactoring: alphabetized functions in game.c and moved declarations to game.h (kmw, 2017-12-26)

src/Makefile.am

@@ -14,9 +14,10 @@ lvt_SOURCES	=	allocator.c \
 			faction.c \
 			flooritems.c \
 			game.c \
+			input.c \
 			targeting.c \
 			leveldisp.c levelgen.c main.c pcg_basic.c random.c map.c screen.c \
-			move.c input.c stringlookups.c speciesinfo.c \
+			move.c stringlookups.c speciesinfo.c \
 			util.c messages.c questions.c name.c \
 			item.c look.c itemmgmt.c \
 			inventory.c spawnitem.c throw.c plantgen.c plantlist.c plantmgmt.c plants.c \
@@ -36,6 +37,7 @@ noinst_HEADERS	=	allocator.h \
 			faction.h \
 			flooritems.h \
 			game.h \
+			input.h \
 			levelgen.h \
 			targeting.h \
 			lvt.h level.h pcg_basic.h creature.h messages.h types.h move.h stringlookups.h \

src/Makefile.in

@@ -107,9 +107,9 @@ am_lvt_OBJECTS = allocator.$(OBJEXT) attack.$(OBJEXT) \
 	creatureinventory.$(OBJEXT) creaturelist.$(OBJEXT) \
 	creaturemgmt.$(OBJEXT) creaturemove.$(OBJEXT) eat.$(OBJEXT) \
 	faction.$(OBJEXT) flooritems.$(OBJEXT) game.$(OBJEXT) \
-	targeting.$(OBJEXT) leveldisp.$(OBJEXT) levelgen.$(OBJEXT) \
-	main.$(OBJEXT) pcg_basic.$(OBJEXT) random.$(OBJEXT) \
-	map.$(OBJEXT) screen.$(OBJEXT) move.$(OBJEXT) input.$(OBJEXT) \
+	input.$(OBJEXT) targeting.$(OBJEXT) leveldisp.$(OBJEXT) \
+	levelgen.$(OBJEXT) main.$(OBJEXT) pcg_basic.$(OBJEXT) \
+	random.$(OBJEXT) map.$(OBJEXT) screen.$(OBJEXT) move.$(OBJEXT) \
 	stringlookups.$(OBJEXT) speciesinfo.$(OBJEXT) util.$(OBJEXT) \
 	messages.$(OBJEXT) questions.$(OBJEXT) name.$(OBJEXT) \
 	item.$(OBJEXT) look.$(OBJEXT) itemmgmt.$(OBJEXT) \
@@ -279,9 +279,10 @@ lvt_SOURCES = allocator.c \
 			faction.c \
 			flooritems.c \
 			game.c \
+			input.c \
 			targeting.c \
 			leveldisp.c levelgen.c main.c pcg_basic.c random.c map.c screen.c \
-			move.c input.c stringlookups.c speciesinfo.c \
+			move.c stringlookups.c speciesinfo.c \
 			util.c messages.c questions.c name.c \
 			item.c look.c itemmgmt.c \
 			inventory.c spawnitem.c throw.c plantgen.c plantlist.c plantmgmt.c plants.c \
@@ -302,6 +303,7 @@ noinst_HEADERS = allocator.h \
 			faction.h \
 			flooritems.h \
 			game.h \
+			input.h \
 			levelgen.h \
 			targeting.h \
 			lvt.h level.h pcg_basic.h creature.h messages.h types.h move.h stringlookups.h \

src/game.c

@@ -29,6 +29,7 @@
 #include "creaturemgmt.h"
 #include "creaturemove.h"
 #include "eat.h"
+#include "input.h"
 #include "messages.h"
 
 bool freeAction = false;

src/input.h

@@ -0,0 +1,28 @@
+/*  This file is part of Lavender Throne.
+ *  Copyright 2017 by Kurt Weber
+ *
+ *  Lavender Throne is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Lavender Throne is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Lavender Throne.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _INPUT_H
+#define _INPUT_H
+
+#ifndef _INPUT_C
+void doMoveKey(unsigned int c);
+void doOpenDoor(unsigned int c);
+void doSearchDoors(unsigned int c);
+void doStairs(unsigned int c);
+#else
+#endif
+
+#endif

src/item.h

@@ -30,7 +30,7 @@ typedef enum armorSlots{
 	ARMOR_HELMET		=	0b000001000,
 	ARMOR_CLOAK		=	0b000010000,
 	ARMOR_GLOVES		=	0b000100000,
-	ARMOR_LEGGINGS	=	0b001000000,
+	ARMOR_LEGGINGS		=	0b001000000,
 	ARMOR_SHOES		=	0b010000000,
 	ARMOR_SHIELD		=	0b100000000,
 } armorSlots;

src/lvt.h

@@ -36,15 +36,6 @@
 #define ISODD(a) ((a) % 2 ? true : false)
 #define ISEVEN(a) ((a) % 2 ? false : true)
 
-#ifndef _INPUT_C
-void doMoveKey(unsigned int c);
-void doOpenDoor(unsigned int c);
-void doSearchDoors(unsigned int c);
-void doStairs(unsigned int c);
-void doLook(unsigned int c);
-#else
-#endif
-
 #ifndef _INVENTORY_C
 void doInventory();
 void doPickup();