diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asset_defs.h | 6 | ||||
| -rw-r--r-- | include/map.h | 1 | ||||
| -rw-r--r-- | include/objects.h | 13 | ||||
| -rw-r--r-- | include/players.h | 11 | ||||
| -rw-r--r-- | include/protocol.h | 2 |
5 files changed, 23 insertions, 10 deletions
diff --git a/include/asset_defs.h b/include/asset_defs.h index 60ad94a..97cea1c 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -34,10 +34,10 @@ image* img_disconnected; image* img_icon_grenade; image* img_icon_molotov; -// Objects +// Objects // @NEWOBJECT image* img_spawner; -image* img_obj_plants; -image* img_obj_wall1; +image* img_space_control_panel; +image* img_space_window; image* img_metal_wall; image* img_metal_wall2; diff --git a/include/map.h b/include/map.h index ed8cbed..8b11634 100644 --- a/include/map.h +++ b/include/map.h @@ -67,6 +67,7 @@ typedef struct t_extracted_map_data { light_emitter light_emitters[MAX_LIGHT_EMITTERS]; } extracted_map_data; +extern int player_zoom; map_data map_to_load = {0}; extracted_map_data loaded_map = {0}; diff --git a/include/objects.h b/include/objects.h index 62396fa..4444253 100644 --- a/include/objects.h +++ b/include/objects.h @@ -20,10 +20,10 @@ typedef struct t_light_emitter { typedef enum t_object_type { OBJECT_NONE, - OBJECT_COBBLESTONEWALL1, - OBJECT_PLANTBOX1, - OBJECT_METAL_WALL, - OBJECT_METAL_WALL2, + OBJECT_SPACE_CONTROL_PANEL = 1, + OBJECT_SPACE_WINDOW = 2, + OBJECT_METAL_WALL = 3, + OBJECT_METAL_WALL2 = 4, OBJECT_END, } object_type; @@ -47,9 +47,10 @@ typedef struct t_box { vec2f br_u; } box; +// @NEWOBJECT object object_dict[OBJECT_END] = { - {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_COBBLESTONEWALL1}, - {0,(vec3f){0, 0, 0},{1,1,2},OBJECT_PLANTBOX1}, + {0,(vec3f){0, 0, 0},{1,3,1},OBJECT_SPACE_CONTROL_PANEL}, + {0,(vec3f){0, 0, 0},{1,1,2},OBJECT_SPACE_WINDOW}, {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL}, {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL2}, }; diff --git a/include/players.h b/include/players.h index d230d0c..ccf91b9 100644 --- a/include/players.h +++ b/include/players.h @@ -19,9 +19,16 @@ typedef enum t_player_interact_state { INTERACT_IDLE, INTERACT_RELOADING, - INTERACT_DEAD + INTERACT_DEAD, } player_interact_state; +typedef enum t_player_move_state +{ + PLAYER_MOVE_STATE_RUNNING, + PLAYER_MOVE_STATE_IDLE, + PLAYER_MOVE_STATE_JUMPING, +} player_move_state; + typedef enum t_player_direction { DIRECTION_UP, DIRECTION_RIGHT, @@ -58,6 +65,7 @@ typedef struct t_player { float guny; float dirx; float diry; + player_move_state move_state; float gun_height; float sec_since_last_step; player_direction direction; @@ -70,6 +78,7 @@ typedef struct t_player { u64 ping; sprite sprite; sprite sprite_death; + sprite sprite_idle; network_state connection_state; u32 points; struct { diff --git a/include/protocol.h b/include/protocol.h index 6113682..9ca7226 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -100,6 +100,8 @@ typedef enum t_protocol_move_type MOVE_UPLEFT, MOVE_DOWNRIGHT, MOVE_DOWNLEFT, + + MOVE_NONE, } protocol_move_type; typedef struct t_protocol_move |