progress
Some checks failed
Build and Test / friends (push) Successful in 9m35s
Build and Test / wii-u-chat (push) Has been cancelled
Build and Test / puyopuyo (push) Has been cancelled
Build and Test / sonic-transformed (push) Has been cancelled
Build and Test / super-mario-maker (push) Has been cancelled
Build and Test / minecraft-wiiu (push) Has been cancelled
Build and Test / wii-sports-club (push) Has been cancelled
Build and Test / splatoon (push) Has been cancelled
Build and Test / splatoon-testfire (push) Has been cancelled
Build and Test / fast-racing-neo (push) Has been cancelled
Build and Test / mario-tennis (push) Has been cancelled
Some checks failed
Build and Test / friends (push) Successful in 9m35s
Build and Test / wii-u-chat (push) Has been cancelled
Build and Test / puyopuyo (push) Has been cancelled
Build and Test / sonic-transformed (push) Has been cancelled
Build and Test / super-mario-maker (push) Has been cancelled
Build and Test / minecraft-wiiu (push) Has been cancelled
Build and Test / wii-sports-club (push) Has been cancelled
Build and Test / splatoon (push) Has been cancelled
Build and Test / splatoon-testfire (push) Has been cancelled
Build and Test / fast-racing-neo (push) Has been cancelled
Build and Test / mario-tennis (push) Has been cancelled
This commit is contained in:
parent
8db02c00ec
commit
47f7dea859
27 changed files with 160 additions and 170 deletions
|
|
@ -31,7 +31,7 @@ impl RnexManager for BaseManager {
|
|||
) -> Self::User {
|
||||
BaseUser {
|
||||
cid: this.cid_counter.fetch_add(1, Relaxed),
|
||||
bm: this,
|
||||
//bm: this,
|
||||
addr: init_data.addr,
|
||||
pid: init_data.pid,
|
||||
station_url: Default::default(),
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ pub async fn get_station_urls(
|
|||
#[rmc_struct(BaseProtocol)]
|
||||
#[derive(Debug)]
|
||||
pub struct BaseUser {
|
||||
pub(crate) bm: PassthroughInitModule<BaseManager>,
|
||||
// pub(crate) bm: PassthroughInitModule<BaseManager>,
|
||||
pub addr: SocketAddr,
|
||||
pub station_url: RwLock<Vec<StationUrl>>,
|
||||
pub pid: PID,
|
||||
|
|
|
|||
|
|
@ -21,5 +21,8 @@ nex-account = { version = "0.2.4", registry = "spbr" }
|
|||
hex = "0.4.3"
|
||||
thiserror = "2.0.18"
|
||||
|
||||
[features]
|
||||
friends = []
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
#![cfg(feature = "friends")]
|
||||
use crate::friends_handler::{FriendsGuest, FriendsUser};
|
||||
use nex_account::GUEST_PID;
|
||||
use rnex_fpd_protos::RemoteFriendRemote;
|
||||
|
|
|
|||
|
|
@ -210,11 +210,14 @@ impl ExtendedMatchmakeSession {
|
|||
|
||||
cfg_if! {
|
||||
if #[cfg(feature = "v3-5-0")]{
|
||||
use rnex_rmc::variant::Variant;
|
||||
use rnex_util::date_time::DateTime;
|
||||
use rnex_mm_protos::matchmake::MatchmakeParam;
|
||||
let mm_session = MatchmakeSession {
|
||||
gathering: Gathering {
|
||||
self_gid: gid,
|
||||
owner_pid: host.pid,
|
||||
host_pid: host.pid,
|
||||
owner_pid: host.base.pid,
|
||||
host_pid: host.base.pid,
|
||||
..session.gathering.clone()
|
||||
},
|
||||
datetime: DateTime::now(),
|
||||
|
|
|
|||
|
|
@ -57,10 +57,10 @@ impl RnexManager for RankingManager {
|
|||
|
||||
async fn init_new_user(
|
||||
this: rnex_server::PassthroughInitModule<Self>,
|
||||
mod_holder: &rnex_server::ModuleHolder,
|
||||
remote: &rnex_rmc::RmcConnection,
|
||||
_: &rnex_server::ModuleHolder,
|
||||
_: &rnex_rmc::RmcConnection,
|
||||
init_data: &Self::InitData,
|
||||
weak_user: rnex_server::WeakPassthroughInitModule<Self::User>,
|
||||
_: rnex_server::WeakPassthroughInitModule<Self::User>,
|
||||
) -> Self::User {
|
||||
RankingUser {
|
||||
rm: this,
|
||||
|
|
|
|||
Loading…
Reference in a new issue