Revision 362
corrected minor error
| proj/maps/map1.h | ||
|---|---|---|
| 1 | 1 |
#ifndef MAP1_H_INCLUDED |
| 2 | 2 |
#define MAP1_H_INCLUDED |
| 3 | 3 |
|
| 4 |
#include "map1.xpm" |
|
| 5 |
#include "map1_collide.xpm" |
|
| 6 |
|
|
| 7 | 4 |
#include "libs.h" |
| 8 | 5 |
|
| 9 | 6 |
static map_t* get_map1(void){
|
| proj/project/src/proj.c | ||
|---|---|---|
| 75 | 75 |
bsp_zombie = get_zombie (); if(bsp_zombie == NULL) printf("Failed to get zombie\n");
|
| 76 | 76 |
bsp_pistol = get_pistol (); if(bsp_pistol == NULL) printf("Failed to get pistol\n");
|
| 77 | 77 |
bsp_nothing = get_nothing (); if(bsp_nothing == NULL) printf("Failed to get nothing\n");
|
| 78 |
bsp_bullet = get_bullet (); if(bsp_bullet == NULL) printf("Failed to get bullet\n"); printf("%s, L78\n", __func__);
|
|
| 79 |
map1 = get_map1 (); if(map1 == NULL) printf("Failed to get map1\n"); printf("%s, L79\n", __func__);
|
|
| 78 |
bsp_bullet = get_bullet (); if(bsp_bullet == NULL) printf("Failed to get bullet\n");
|
|
| 79 |
map1 = get_map1 (); if(map1 == NULL) printf("Failed to get map1\n");
|
|
| 80 | 80 |
|
| 81 | 81 |
sp_crosshair = sprite_ctor(bsp_crosshair); if(sp_crosshair == NULL) printf("Failed to get crosshair sprite\n");
|
| 82 |
}printf("L82\n");
|
|
| 82 |
} |
|
| 83 | 83 |
|
| 84 | 84 |
menu_t *main_menu = menu_ctor(font_get_default()); |
| 85 | 85 |
menu_add_item(main_menu, "Single player"); |
| 86 | 86 |
menu_add_item(main_menu, "Multiplayer"); |
| 87 | 87 |
menu_add_item(main_menu, "Chat"); |
| 88 |
menu_add_item(main_menu, "Exit");printf("L88\n");
|
|
| 88 |
menu_add_item(main_menu, "Exit"); |
|
| 89 | 89 |
|
| 90 | 90 |
//uint32_t refresh_count_value = sys_hz() / REFRESH_RATE; |
| 91 | 91 |
uint8_t last_lb = 0; |
| proj/Makefile | ||
|---|---|---|
| 12 | 12 |
SRCS= list.c queue.c graph.c kbc.c keyboard.c mouse.c utils.c timer.c interrupts_func.c fast_math.c xpm_utils.c rtc.c uart.c makecode_map.c menu.c proj_func.c rectangle.c font.c ent.c proj.c hltp.c zombies.c campaign.c singleplayer.c chat.c scoreboards.c |
| 13 | 13 |
IPATHS=-I./project/include -I./libs -I./libs/graph/include -I./libs/kbc/include -I./libs/rtc/include -I./libs/timer/include -I./libs/uart/include -I./libs/classes/include -I./libs/utils/include -I./maps -I./media/xpm |
| 14 | 14 |
|
| 15 |
CPPFLAGS += -pedantic ${IPATHS} -D LCOM_MACRO #-D __LCOM_OPTIMIZED__ -Wall -Wextra -Wshadow -Wunreachable-code #-Weverything -Wno-padded -Wno-unused-macros
|
|
| 15 |
CPPFLAGS += -pedantic ${IPATHS} -D LCOM_MACRO -D __LCOM_OPTIMIZED__ -Wall -Wextra -Wshadow -Wunreachable-code #-Weverything -Wno-padded -Wno-unused-macros
|
|
| 16 | 16 |
|
| 17 | 17 |
DPADD += ${LIBLCF}
|
| 18 | 18 |
LDADD += -llcf |
Also available in: Unified diff