bonkmaykr/ojrc
1
0 Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Add minimal Pit implementation (without win conditions) #34

Browse Source
This commit is contained in:
NG (Graham) committed 2025-09-09 23:36:34 -04:00
1 parent e33a499415
commit f2de67b338
13 files changed
+427 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

rc_multiplayer/src/events/mod.rs
+4 -4
View File
@@ -4,7 +4,7 @@ mod all_loading_progress;
mod weapon_select;
mod activate_sync;
mod loading_done;
//mod player_input;
mod player_input;
mod spot_player;
mod kill_player;
mod client_unregister;
@@ -25,14 +25,14 @@ pub async fn handler(init_ctx: &crate::InitConfig) -> crate::handler::LnlEventHa
.add(weapon_select::handler(init_ctx))
.add(activate_sync::handler(init_ctx))
.add(loading_done::handler(init_ctx))
//.add(player_input::handler(init_ctx))
.add(crate::handlers::Broadcaster::<
.add(player_input::handler(init_ctx))
/*.add(crate::handlers::Broadcaster::<
true,
{rlnl::event_code::NetworkEvent::OnPlayerInputChanged as i16},
{rlnl::event_code::NetworkEvent::OnServerReceivedInputChange as i16},
{literustlib::packet::Property::Unreliable as u8},
rlnl::events::ingame::PlayerIdAndInputData,
>::handler(init_ctx))
>::handler(init_ctx))*/
.add(flipper_start::handler(init_ctx))
/*.add(crate::handlers::Broadcaster::<
true,
rc_multiplayer/src/events/player_input.rs
+6 -8
View File
@@ -2,8 +2,8 @@ pub struct PlayerInput {
msg_router: tokio::sync::mpsc::Sender<crate::matches::GameMessage>,
}
pub(super) fn handler(init_ctx: &crate::InitConfig) -> crate::handlers::simple_typed::SimpleRlnl<rlnl::events::ingame::MultiPlayerInputChanged, PlayerInput> {
crate::handlers::simple_typed::SimpleRlnl::new(PlayerInput::new(init_ctx))
pub(super) fn handler(init_ctx: &crate::InitConfig) -> crate::handlers::SimpleRlnl<rlnl::events::ingame::PlayerIdAndInputData, PlayerInput> {
crate::handlers::SimpleRlnl::new(PlayerInput::new(init_ctx))
}
impl PlayerInput {
@@ -15,17 +15,15 @@ impl PlayerInput {
}
#[async_trait::async_trait]
impl crate::handlers::simple_typed::RlnlEventCodeHandler for PlayerInput {
type In = rlnl::events::ingame::MultiPlayerInputChanged;
impl crate::handlers::RlnlEventCodeHandler for PlayerInput {
type In = rlnl::events::ingame::PlayerIdAndInputData;
const CODE: rlnl::event_code::NetworkEvent = rlnl::event_code::NetworkEvent::OnPlayerInputChanged;
async fn handle(&self, data: Self::In, _peer: &std::sync::Arc<literustlib_server::Connection<crate::PacketData>>, user: &crate::UserData, _sender: &std::sync::Arc<literustlib_server::DataSender<crate::PacketData>>) {
if let Some(user_info) = user.user().await {
super::log_channel_send_failure(self.msg_router.send(crate::matches::GameMessage::BroadcastRlnl {
super::log_channel_send_failure(self.msg_router.send(crate::matches::GameMessage::PlayerInputChanged {
user_id: user_info.user_id(),
event: rlnl::event_code::NetworkEvent::OnServerReceivedInputChange,
property: literustlib::packet::Property::Unreliable,
data: Some(Box::new(data)),
data,
}).await);
} else {
log::error!("Failed to rebroadcast OnPlayerInputChanged for user (no auth!)");