diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asset_defs.h | 10 | ||||
| -rw-r--r-- | include/audio.h | 2 | ||||
| -rw-r--r-- | include/game.h | 1 | ||||
| -rw-r--r-- | include/menu.h | 13 | ||||
| -rw-r--r-- | include/objects.h | 60 | ||||
| -rw-r--r-- | include/zombies.h | 3 |
6 files changed, 27 insertions, 62 deletions
diff --git a/include/asset_defs.h b/include/asset_defs.h index 23610b4..0d27bbe 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -101,6 +101,16 @@ image* img_painting7; image* img_painting8; image* img_painting9; image* img_painting10; +image* img_floormat1; +image* img_floormat2; +image* img_metal_wall3; +image* img_metal_wall4; +image* img_metal_wall5; +image* img_metal_wall6; +image* img_metal_wall7; +image* img_metal_wall8; +image* img_metal_wall9; +image* img_metal_wall10; // Throwables image* img_grenade; diff --git a/include/audio.h b/include/audio.h index 8319305..db979df 100644 --- a/include/audio.h +++ b/include/audio.h @@ -45,7 +45,7 @@ typedef struct t_audio_event { #define MAX_AUDIO_EVENTS (NUM_AUDIO_CHANNELS) audio_event audio_events[MAX_AUDIO_EVENTS] = {0}; int max_audio_events = MAX_AUDIO_EVENTS; -vec3f global_audio_source_position =(vec3f){-1,-1,-1}; +vec3f global_audio_source_position; void play_music(Mix_Music* music); void add_throwable_audio_event_to_queue(audio_event_type event, throwable_type throwable, u32 playerid, vec3f position); diff --git a/include/game.h b/include/game.h index 88fd0e1..20a7437 100644 --- a/include/game.h +++ b/include/game.h @@ -40,5 +40,6 @@ game global_state = {GAMESTATE_IDLE,DISCONNECTED,0,0}; void init_game(); void start_solo_game(); bool connect_to_game(char* ip, char* port); +void fill_game_structs(); #endif
\ No newline at end of file diff --git a/include/menu.h b/include/menu.h index fd74425..1623d51 100644 --- a/include/menu.h +++ b/include/menu.h @@ -7,18 +7,7 @@ extern int current_res_index; extern bool is_fullscreen; -vec2 available_resolutions[] = { - (vec2){1366, 769}, - (vec2){1440, 900}, - (vec2){1600, 900}, - (vec2){1920, 1080}, - (vec2){2560, 1080}, - (vec2){2560, 1440}, - (vec2){2560, 1600}, - (vec2){3440, 1440}, - (vec2){3840, 2160}, - (vec2){5120, 1440}, -}; +vec2 available_resolutions[10]; void update_menu(platform_window* window); diff --git a/include/objects.h b/include/objects.h index 9d22942..cb42a04 100644 --- a/include/objects.h +++ b/include/objects.h @@ -69,6 +69,16 @@ typedef enum t_object_type { OBJECT_PAINTING8 = 45, OBJECT_PAINTING9 = 46, OBJECT_PAINTING10 = 47, + OBJECT_FLOORMAT1 = 48, + OBJECT_FLOORMAT2 = 49, + OBJECT_METAL_WALL3 = 50, + OBJECT_METAL_WALL4 = 51, + OBJECT_METAL_WALL5 = 52, + OBJECT_METAL_WALL6 = 53, + OBJECT_METAL_WALL7 = 54, + OBJECT_METAL_WALL8 = 55, + OBJECT_METAL_WALL9 = 56, + OBJECT_METAL_WALL10 = 57, OBJECT_END, } object_type; @@ -103,55 +113,7 @@ typedef struct t_box { } box; // @NEWOBJECT -object object_dict[OBJECT_END] = { - {0,(vec3f){0, 0, 0},{1,3,0.5f},OBJECT_SPACE_CONTROL_PANEL, 1}, - {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_SPACE_WINDOW, 1}, - {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL, 1}, - {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL2, 1}, - {0,(vec3f){0, 0, 0},{3,1,0.5f},OBJECT_SPACE_CONTROL_PANEL2, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CHAIR_UP, 1}, - {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_SPACE_WINDOW_H, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5},OBJECT_ZOMBIE_SPAWNER, 1}, - {0,(vec3f){0, 0, 0},{1,1,0},OBJECT_LAMP_EAST, 0}, - {0,(vec3f){0, 0, 0},{3,1,0.5},OBJECT_METAL_TABLE_H, 1}, - {0,(vec3f){0, 0, 0},{2,2,0.5},OBJECT_CANTINE_GLASS, 1}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_GLASS_DOOR_H, 0}, - {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_LAMP_SOUTH, 0}, - {0,(vec3f){0, 0, 0},{3,7,0.5f},OBJECT_BIG_CONTROL_PANEL, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CHAIR_DOWN, 1}, - {0,(vec3f){0, 0, 0},{2,1,1.0f},OBJECT_COMPUTER_RACK, 1}, - {0,(vec3f){0, 0, 0},{8,2,1.0f},OBJECT_GENERATOR, 1}, - {0,(vec3f){0, 0, 0},{1,4,0.5f},OBJECT_SCHOOL_TABLE, 1}, - {0,(vec3f){0, 0, 0},{2,1,0.5f},OBJECT_SCHOOL_BENCH, 1}, - {0,(vec3f){0, 0, 0},{1,1,1.0f},OBJECT_LOCKER, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_BAR_H, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_BAR_V, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_BAR_HV, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT1, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT2, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT3, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT4, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_WALL1, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_WALL2, 1}, - {0,(vec3f){0, 0, 0},{1,1,1.0f},OBJECT_CLUB_WALL3, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT5, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT6, 1}, - {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT7, 1}, - {0,(vec3f){0, 0, 0},{13,3,0},OBJECT_BOWLING_LANE, 0}, - {0,(vec3f){0, 0, 0},{2,3,1},OBJECT_BOWLING_LANE_END, 1}, - {0,(vec3f){0, 0, 0},{1,2,1},OBJECT_GLASS_DOOR_V, 0}, - {0,(vec3f){0, 0, 0},{3,1,0.5f},OBJECT_BOWLING_MACHINE, 1}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING1, 0}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING2, 0}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING3, 0}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING4, 0}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING5, 0}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING6, 0}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING7, 0}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING8, 0}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING9, 0}, - {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING10, 0}, -}; +object object_dict[OBJECT_END]; // decoration objects laying on floor. object decoration_objects[MAX_DECORATION_OBJECTS] = {0}; diff --git a/include/zombies.h b/include/zombies.h index 85f66df..bb74d23 100644 --- a/include/zombies.h +++ b/include/zombies.h @@ -46,6 +46,9 @@ typedef struct t_spawner { // Despawn distance. #define MAX_DISTANCE_BETWEEN_ZOMBIE_AND_PLAYER 40 +// Spawners closer than this will not spawn. +#define MIN_DISTANCE_BETWEEN_ZOMBIE_AND_PLAYER 20 + #define MAX_SPAWNERS (25) spawner spawner_tiles[MAX_SPAWNERS] = {0}; |