From 0666c6968037f1b5ecab84a42ec9bba0ba62a097 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sun, 20 Mar 2016 04:22:09 +1100 Subject: [PATCH] Moved scenes into one folder --- client/makefile | 5 ++- client/menu_scenes/makefile | 32 ------------------- .../disconnected_screen.cpp | 0 .../disconnected_screen.hpp | 0 client/{menu_scenes => scenes}/lobby_menu.cpp | 0 client/{menu_scenes => scenes}/lobby_menu.hpp | 0 client/{menu_scenes => scenes}/main_menu.cpp | 0 client/{menu_scenes => scenes}/main_menu.hpp | 0 client/{gameplay_scenes => scenes}/makefile | 0 .../{menu_scenes => scenes}/options_menu.cpp | 0 .../{menu_scenes => scenes}/options_menu.hpp | 0 .../{menu_scenes => scenes}/splash_screen.cpp | 0 .../{menu_scenes => scenes}/splash_screen.hpp | 0 client/{gameplay_scenes => scenes}/world.cpp | 0 client/{gameplay_scenes => scenes}/world.hpp | 0 todo.txt | 1 + 16 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 client/menu_scenes/makefile rename client/{menu_scenes => scenes}/disconnected_screen.cpp (100%) rename client/{menu_scenes => scenes}/disconnected_screen.hpp (100%) rename client/{menu_scenes => scenes}/lobby_menu.cpp (100%) rename client/{menu_scenes => scenes}/lobby_menu.hpp (100%) rename client/{menu_scenes => scenes}/main_menu.cpp (100%) rename client/{menu_scenes => scenes}/main_menu.hpp (100%) rename client/{gameplay_scenes => scenes}/makefile (100%) rename client/{menu_scenes => scenes}/options_menu.cpp (100%) rename client/{menu_scenes => scenes}/options_menu.hpp (100%) rename client/{menu_scenes => scenes}/splash_screen.cpp (100%) rename client/{menu_scenes => scenes}/splash_screen.hpp (100%) rename client/{gameplay_scenes => scenes}/world.cpp (100%) rename client/{gameplay_scenes => scenes}/world.hpp (100%) diff --git a/client/makefile b/client/makefile index bbba8d9..de75884 100644 --- a/client/makefile +++ b/client/makefile @@ -1,5 +1,5 @@ #include directories -INCLUDES+=. client_utilities entities gameplay_scenes menu_scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities +INCLUDES+=. client_utilities entities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities #libraries #the order of the $(LIBS) is important, at least for MinGW @@ -31,8 +31,7 @@ OUT=$(addprefix $(OUTDIR)/,client) all: $(OBJ) $(OUT) $(MAKE) -C client_utilities $(MAKE) -C entities - $(MAKE) -C gameplay_scenes - $(MAKE) -C menu_scenes + $(MAKE) -C scenes $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) $(OBJ): | $(OBJDIR) diff --git a/client/menu_scenes/makefile b/client/menu_scenes/makefile deleted file mode 100644 index f03de53..0000000 --- a/client/menu_scenes/makefile +++ /dev/null @@ -1,32 +0,0 @@ -#config -INCLUDES+=. .. ../client_utilities ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities -LIBS+= -CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) - -#source -CXXSRC=$(wildcard *.cpp) - -#objects -OBJDIR=obj -OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o)) - -#output -OUTDIR=.. -OUT=$(addprefix $(OUTDIR)/,client.a) - -#targets -all: $(OBJ) $(OUT) - ar -crs $(OUT) $(OBJ) - -$(OBJ): | $(OBJDIR) - -$(OUT): | $(OUTDIR) - -$(OBJDIR): - mkdir $(OBJDIR) - -$(OUTDIR): - mkdir $(OUTDIR) - -$(OBJDIR)/%.o: %.cpp - $(CXX) $(CXXFLAGS) -c -o $@ $< diff --git a/client/menu_scenes/disconnected_screen.cpp b/client/scenes/disconnected_screen.cpp similarity index 100% rename from client/menu_scenes/disconnected_screen.cpp rename to client/scenes/disconnected_screen.cpp diff --git a/client/menu_scenes/disconnected_screen.hpp b/client/scenes/disconnected_screen.hpp similarity index 100% rename from client/menu_scenes/disconnected_screen.hpp rename to client/scenes/disconnected_screen.hpp diff --git a/client/menu_scenes/lobby_menu.cpp b/client/scenes/lobby_menu.cpp similarity index 100% rename from client/menu_scenes/lobby_menu.cpp rename to client/scenes/lobby_menu.cpp diff --git a/client/menu_scenes/lobby_menu.hpp b/client/scenes/lobby_menu.hpp similarity index 100% rename from client/menu_scenes/lobby_menu.hpp rename to client/scenes/lobby_menu.hpp diff --git a/client/menu_scenes/main_menu.cpp b/client/scenes/main_menu.cpp similarity index 100% rename from client/menu_scenes/main_menu.cpp rename to client/scenes/main_menu.cpp diff --git a/client/menu_scenes/main_menu.hpp b/client/scenes/main_menu.hpp similarity index 100% rename from client/menu_scenes/main_menu.hpp rename to client/scenes/main_menu.hpp diff --git a/client/gameplay_scenes/makefile b/client/scenes/makefile similarity index 100% rename from client/gameplay_scenes/makefile rename to client/scenes/makefile diff --git a/client/menu_scenes/options_menu.cpp b/client/scenes/options_menu.cpp similarity index 100% rename from client/menu_scenes/options_menu.cpp rename to client/scenes/options_menu.cpp diff --git a/client/menu_scenes/options_menu.hpp b/client/scenes/options_menu.hpp similarity index 100% rename from client/menu_scenes/options_menu.hpp rename to client/scenes/options_menu.hpp diff --git a/client/menu_scenes/splash_screen.cpp b/client/scenes/splash_screen.cpp similarity index 100% rename from client/menu_scenes/splash_screen.cpp rename to client/scenes/splash_screen.cpp diff --git a/client/menu_scenes/splash_screen.hpp b/client/scenes/splash_screen.hpp similarity index 100% rename from client/menu_scenes/splash_screen.hpp rename to client/scenes/splash_screen.hpp diff --git a/client/gameplay_scenes/world.cpp b/client/scenes/world.cpp similarity index 100% rename from client/gameplay_scenes/world.cpp rename to client/scenes/world.cpp diff --git a/client/gameplay_scenes/world.hpp b/client/scenes/world.hpp similarity index 100% rename from client/gameplay_scenes/world.hpp rename to client/scenes/world.hpp diff --git a/todo.txt b/todo.txt index cea3760..f576031 100644 --- a/todo.txt +++ b/todo.txt @@ -2,6 +2,7 @@ TODO: Resource manager TODO: Consistency for bounds names TODO: Cross compiler (to replace dead linux PC ;_;) TODO: New button graphics +TODO: New typeface TODO: Account passwords (list) * backbone account server OR * social network login OR