Prepare master for merge

Debug/makefile

@@ -1,42 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ArenaWarSurvival
-
-# Tool invocations
-ArenaWarSurvival: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C Linker'
-	gcc  -o "ArenaWarSurvival" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(EXECUTABLES)$(OBJS)$(C_DEPS) ArenaWarSurvival
-	-@echo ' '
-
-.PHONY: all clean dependents
-
--include ../makefile.targets

Debug/objects.mk

@@ -1,8 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lSDL2 -lSDL2_image -lSDL2main
-

Debug/sources.mk

@@ -1,17 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-OBJ_SRCS := 
-ASM_SRCS := 
-C_SRCS := 
-O_SRCS := 
-S_UPPER_SRCS := 
-EXECUTABLES := 
-OBJS := 
-C_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-. \
-

Debug/subdir.mk

@@ -1,36 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../IAEngine.c \
-../arenaEngine.c \
-../fileHandler.c \
-../main.c \
-../playerInterface.c 
-
-OBJS += \
-./IAEngine.o \
-./arenaEngine.o \
-./fileHandler.o \
-./main.o \
-./playerInterface.o 
-
-C_DEPS += \
-./IAEngine.d \
-./arenaEngine.d \
-./fileHandler.d \
-./main.d \
-./playerInterface.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-%.o: ../%.c
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C Compiler'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-

launch.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+DATA_DIR='data'
+LOGS_DIR='logs'
+
+if [ ! -d "$DATA_DIR" ]; then
+  echo "WARNING ! Missing DATA dir, can't launch program."
+  echo "Exit..."
+fi
+
+if [ ! -d "$LOGS_DIR" ]; then
+  mkdir logs
+fi
+
+chmod +x ArenaSurvivalTournament
+./ArenaSurvivalTournament

makefile

@@ -0,0 +1,82 @@
+BUILD_DIR := build
+RM := rm -rf $(BUILD_DIR)
+
+OBJ_SRCS := 
+ASM_SRCS := 
+C_SRCS := 
+O_SRCS := 
+S_UPPER_SRCS := 
+EXECUTABLES := 
+OBJS := 
+C_DEPS := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+. \
+
+C_SRCS += \
+src/IAEngine.c \
+src/arenaEngine.c \
+src/arenaGUI.c \
+src/fileHandler.c \
+src/logHelper.c \
+src/main.c \
+src/menuGUI.c \
+src/playerInterface.c 
+
+OBJS += \
+build/IAEngine.o \
+build/arenaEngine.o \
+build/arenaGUI.o \
+build/fileHandler.o \
+build/logHelper.o \
+build/main.o \
+build/menuGUI.o \
+build/playerInterface.o 
+
+C_DEPS += \
+build/IAEngine.d \
+build/arenaEngine.d \
+build/arenaGUI.d \
+build/fileHandler.d \
+build/logHelper.d \
+build/main.d \
+build/menuGUI.d \
+build/playerInterface.d 
+
+
+build/%.o: src/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+LIBS := -lSDL2 -lSDL2main -lSDL2_image
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+endif
+
+.PHONY: all buildDir clean dependents
+
+# All Target
+all: buildDir ArenaSurvivalTournament
+
+buildDir:
+	[ -d $(BUILD_DIR) ] || mkdir -p $(BUILD_DIR)
+
+# Tool invocations
+ArenaSurvivalTournament: $(OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: GCC C Linker'
+	gcc  -o "ArenaSurvivalTournament" $(OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(EXECUTABLES)$(OBJS)$(C_DEPS) ArenaSurvivalTournament
+	-@echo ' '

src/main.h

@@ -0,0 +1,24 @@
+#ifndef MAIN_H_
+#define MAIN_H_
+
+#define A_WIDTH 30
+#define A_HEIGHT 30
+
+#define TILE_SIZE 32
+#define WINDOWS_WIDTH TILE_SIZE * A_WIDTH
+#define WINDOWS_HEIGHT TILE_SIZE * A_HEIGHT
+
+/*
+ * Generator tiles spawn rate (in percent)
+ */
+#define ROCK_GEN_RATE 30
+#define TREE_GEN_RATE 25
+#define WATER_GEN_RATE 8
+#define GOLD_GEN_RATE 10
+
+enum {DOWN, UP, LEFT, RIGHT};
+enum {GRASS, ROCK, TREE, WATER, GOLD, SPAWN};
+
+int random_lim(int max);
+
+#endif