Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,31 @@

enum e_simulation_entity_type
{
_simulation_entity_type_unit = 8 ,
_simulation_entity_type_item,
_simulation_entity_type_generic,
_simulation_entity_type_generic_garbage,
_simulation_entity_type_vehicle,
_simulation_entity_type_projectile,
_simulation_entity_type_weapon,
_simulation_entity_type_device,
/* $todo confirm k_simulation_entity_type_count = 22, */
/* $todo confirm k_simulation_entity_type_none = -1, */
/* $todo confirm k_simulation_entity_type_first_game_engine = 0, */
/* $todo confirm k_simulation_entity_type_last_game_engine = 9, */
_simulation_entity_type_sandbox_engine = 0,
_simulation_entity_type_custom_engine,
_simulation_entity_type_game_engine_player,
_simulation_entity_type_game_engine_megalo_team,

_simulation_entity_type_game_statborg,
_simulation_entity_type_breakable_surface_group,
_simulation_entity_type_map_variant,
_simulation_entity_type_debug_globals,

_simulation_entity_type_biped, // previously `_simulation_entity_type_unit`
_simulation_entity_type_item,
_simulation_entity_type_generic,
_simulation_entity_type_generic_garbage,
_simulation_entity_type_vehicle,
_simulation_entity_type_projectile,
_simulation_entity_type_weapon,
_simulation_entity_type_device,

k_simulation_entity_type_count,
/* $todo confirm k_simulation_entity_type_none = -1, */

k_simulation_entity_type_first_game_engine = _simulation_entity_type_sandbox_engine,
k_simulation_entity_type_last_game_engine = _simulation_entity_type_game_engine_megalo_team,

/* $todo confirm k_simulation_entity_type_bits = 5, */
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,64 @@

/* ---------- headers */

enum e_simulation_event_type
{
_simulation_event_type_damage_aftermath = 0,
_simulation_event_type_damage_section_response,
_simulation_event_type_breakable_surface_break,
_simulation_event_type_breakable_surface_damage_aoe,
_simulation_event_type_projectile_attached,
_simulation_event_type_projectile_detonate,
_simulation_event_type_projectile_impact_effect,
_simulation_event_type_projectile_object_impact_effect,
_simulation_event_type_biped_board_vehicle,
_simulation_event_type_biped_pickup,
_simulation_event_type_weapon_effect,
_simulation_event_type_weapon_empty_click,
_simulation_event_type_biped_melee_clang,
_simulation_event_type_player_account_balance_notification,
_simulation_event_type_incident,
_simulation_event_type_player_money_grant,
_simulation_event_type_unit_zoom,
_simulation_event_type_megalo_chud_message,
_simulation_event_type_authority_ignored_predicted_position,
_simulation_event_type_biped_exit_vehicle,
_simulation_event_type_device_touch,
_simulation_event_type_biped_debug_teleport,
_simulation_event_type_biped_assassinate,
_simulation_event_type_biped_equipment_activation,
_simulation_event_type_request_weapon_fire,
_simulation_event_type_action_weapon_fire,
_simulation_event_type_weapon_reload,
_simulation_event_type_biped_throw_initiate,
_simulation_event_type_biped_melee_initiate,
_simulation_event_type_vehicle_trick,
_simulation_event_type_biped_dodge,
_simulation_event_type_weapon_pickup,
_simulation_event_type_weapon_put_away,
_simulation_event_type_weapon_drop,
_simulation_event_type_weapon_tether_request,
_simulation_event_type_vehicle_flip,
_simulation_event_type_biped_throw_release,
_simulation_event_type_biped_melee_damage,
_simulation_event_type_biped_enter_vehicle,
_simulation_event_type_game_engine_request_boot_player,
_simulation_event_type_request_projectile_attach,
_simulation_event_type_biped_pickup_item_request,
_simulation_event_type_projectile_supercombine_request,
_simulation_event_type_object_refresh,
_simulation_event_type_player_editor_request,
_simulation_event_type_player_purchase_request,
_simulation_event_type_player_loadout_request,
_simulation_event_type_biped_laser_designation,
_simulation_event_type_player_set_respawn_target_transform,
_simulation_event_type_player_set_orbiting_camera_target,
_simulation_event_type_player_call_for_help_request,
_simulation_event_type_player_force_base_respawn,

k_simulation_event_type_count,
};

/* ---------- constants */

/* ---------- definitions */
Expand All @@ -15,4 +73,3 @@
/* ---------- public code */

#endif // __SIMULATION_GAME_EVENTS_H__

2 changes: 1 addition & 1 deletion src/source/omaha/simulation/simulation_entity_database.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ bool simulation_entity_type_is_object(enum e_simulation_entity_type entity_type)
bool entity_is_object = false;
switch (entity_type)
{
case _simulation_entity_type_unit:
case _simulation_entity_type_biped:
case _simulation_entity_type_item:
case _simulation_entity_type_generic:
case _simulation_entity_type_generic_garbage:
Expand Down
Loading