TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move get_multi_endlevel_poll2 into dsx

Browse source
This commit is contained in:
Kp 2020-08-28 00:18:45 +00:00
parent 02aa5c182e
commit 97315725fa
5 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/multi.h
View file

@ -474,10 +474,10 @@ void multi_consistency_error(int reset);
window_event_result multi_level_sync();
int multi_endlevel(int *secret);
using multi_endlevel_poll = int(newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *);
multi_endlevel_poll *get_multi_endlevel_poll2();
void multi_send_endlevel_packet();
#ifdef dsx
namespace dsx {
multi_endlevel_poll *get_multi_endlevel_poll2();
void multi_send_hostage_door_status(vcwallptridx_t wallnum);
void multi_prep_level_objects(const d_vclip_array &Vclip);
void multi_prep_level_player();

2
common/main/net_udp.h
View file

@ -38,9 +38,9 @@ void net_udp_send_data(const uint8_t *ptr, unsigned len, int priority);
namespace dsx {
void net_udp_leave_game();
int net_udp_endlevel(int *secret);
int net_udp_kmatrix_poll2( newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *);
}
#endif
int net_udp_kmatrix_poll2( newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *);
void net_udp_send_endlevel_packet();
void net_udp_dump_player(const _sockaddr &dump_addr, int why);
void net_udp_disconnect_player(int playernum);

5
similar/main/kmatrix.cpp
View file

@ -169,6 +169,8 @@ static void kmatrix_status_msg(grs_canvas &canvas, const fix time, const int rea
, time);
}
namespace dcx {
namespace {
struct kmatrix_screen : ignore_window_pointer_t
@ -181,6 +183,8 @@ struct kmatrix_screen : ignore_window_pointer_t
}
}
namespace dsx {
static void kmatrix_redraw(kmatrix_screen *km)
{
@ -382,6 +386,7 @@ static window_event_result kmatrix_handler(window *, const d_event &event, kmatr
}
return window_event_result::ignored;
}
}
kmatrix_result kmatrix_view(const kmatrix_network network)

4
similar/main/multi.cpp
View file

@ -1149,6 +1149,8 @@ int multi_endlevel(int *const secret)
return(result);
}
namespace dsx {
multi_endlevel_poll *get_multi_endlevel_poll2()
{
switch (multi_protocol)
@ -1162,6 +1164,8 @@ multi_endlevel_poll *get_multi_endlevel_poll2()
}
}
}
void multi_send_endlevel_packet()
{
switch (multi_protocol)

3
similar/main/net_udp.cpp
View file

@ -1445,6 +1445,8 @@ void net_udp_close()
#endif
}
namespace dsx {
// Same as above but used when player pressed ESC during kmatrix (host also does the packets for playing clients)
int net_udp_kmatrix_poll2( newmenu *,const d_event &event, const unused_newmenu_userdata_t *)
{
@ -1466,7 +1468,6 @@ int net_udp_kmatrix_poll2( newmenu *,const d_event &event, const unused_newmenu_
return rval;
}
namespace dsx {
int net_udp_endlevel(int *secret)
{
// Do whatever needs to be done between levels