diff --git a/Makefile b/Makefile index 5f04321..aa35cb9 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,11 @@ assets: tools/mapc make -C c1k3-assets tools/mapc: $(EXT_OBJ) +ifeq ($(OS),linux) $(CC) $(DBGSN_CFLAGS) tools/mapc.c -o tools/mapc $(EXT_OBJ) $(LFLAGS) +else + $(CC) $(DEBUG_CFLAGS) tools/mapc.c -o tools/mapc $(EXT_OBJ) $(LFLAGS) +endif %.o: %.c $(CC) $(OPT_FLAGS) -c $< -o $@ diff --git a/main.c b/main.c index 0d4f582..5bad822 100644 --- a/main.c +++ b/main.c @@ -54,7 +54,7 @@ text_surface_t * dq = NULL; text_surface_t * dennis = NULL; entity_t * demon = NULL; -void menu_init(){ +void menu_init() { // set level to menu map_set_level(2); diff --git a/map.c b/map.c index a820fb5..cb48b45 100644 --- a/map.c +++ b/map.c @@ -521,13 +521,13 @@ void map_parse() { mpack_map_parse((char *)data_menu, data_menu_len); } -void map_set_level(size_t i){ +void map_set_level(size_t i) { map_t * m = vector_at(map_data, i); map = m; } void map_load () { - + // loads from global map_t * map; for (uint32_t i = 0; i < map->e_size; i++) { entity_params_t * ref_ep = vector_at(map->map_entities, i);