diff --git a/common/include/fwd-window.h b/common/include/fwd-window.h index c7816414b..89c8f4c88 100644 --- a/common/include/fwd-window.h +++ b/common/include/fwd-window.h @@ -27,14 +27,6 @@ namespace dcx { class window; -template -using window_subfunction = window_event_result (*)(window *menu,const d_event &event, T *userdata); - -template -using window_subclass_subfunction = window_event_result (*)(T *menu,const d_event &event, void*); - -class unused_window_userdata_t; - int window_close(window *wind); window *window_get_front(); window *window_get_first(); diff --git a/common/include/window.h b/common/include/window.h index 63d4a5313..b85f393ff 100644 --- a/common/include/window.h +++ b/common/include/window.h @@ -26,8 +26,6 @@ namespace dcx { -constexpr const unused_window_userdata_t *unused_window_userdata = nullptr; - class window { public: diff --git a/common/main/game.h b/common/main/game.h index 3d8a01aa2..164e855e5 100644 --- a/common/main/game.h +++ b/common/main/game.h @@ -494,7 +494,6 @@ struct game_cheats : prohibit_void_ptr extern game_cheats cheats; game_window *game_setup(); -window_event_result game_handler(window *wind,const d_event &event, const unused_window_userdata_t *); window_event_result ReadControls(const d_event &event, control_info &Controls); bool allowed_to_fire_laser(const player_info &); void reset_globals_for_new_game();