enable third notification param on wiiu chat
This commit is contained in:
parent
678ec565a5
commit
65c3642439
5 changed files with 24 additions and 21 deletions
|
|
@ -2,6 +2,7 @@ wii-u-chat:
|
||||||
include-in-checkall: true
|
include-in-checkall: true
|
||||||
features:
|
features:
|
||||||
- prudpv1
|
- prudpv1
|
||||||
|
- third-notif-param
|
||||||
- v3-3-2
|
- v3-3-2
|
||||||
settings:
|
settings:
|
||||||
AUTH_REPORT_VERSION: "branch:origin/project/wup-agmj build:3_8_15_2004_0"
|
AUTH_REPORT_VERSION: "branch:origin/project/wup-agmj build:3_8_15_2004_0"
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,10 @@ guest_login = []
|
||||||
friends = ["guest_login", "database-support"]
|
friends = ["guest_login", "database-support"]
|
||||||
big_pid = []
|
big_pid = []
|
||||||
v3-3-2 = []
|
v3-3-2 = []
|
||||||
v3-5-0 = ["v3-3-2"]
|
third-notif-param = []
|
||||||
v3-8-15 = ["rmc_struct_header", "v3-5-0"]
|
v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
|
||||||
|
v3-5-0 = ["v3-4-0"]
|
||||||
|
v3-8-15 = ["v3-5-0"]
|
||||||
v4-3-11 = ["v3-8-15"]
|
v4-3-11 = ["v3-8-15"]
|
||||||
nx = ["big_pid"]
|
nx = ["big_pid"]
|
||||||
datastore = ["database-support", "v3-8-15", "dep:aws-sdk-s3", "dep:aws-config"]
|
datastore = ["database-support", "v3-8-15", "dep:aws-sdk-s3", "dep:aws-config"]
|
||||||
|
|
|
||||||
|
|
@ -232,7 +232,7 @@ impl ExtendedMatchmakeSession {
|
||||||
param_1: self.session.gathering.self_gid as PID,
|
param_1: self.session.gathering.self_gid as PID,
|
||||||
param_2: other_pid,
|
param_2: other_pid,
|
||||||
str_param: "".into(),
|
str_param: "".into(),
|
||||||
#[cfg(feature = "v3-5-0")]
|
#[cfg(feature = "third-notif-param")]
|
||||||
param_3: 0,
|
param_3: 0,
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
|
|
@ -265,7 +265,7 @@ impl ExtendedMatchmakeSession {
|
||||||
param_1: self.session.gathering.self_gid as PID,
|
param_1: self.session.gathering.self_gid as PID,
|
||||||
param_2: *pid,
|
param_2: *pid,
|
||||||
str_param: join_msg.clone(),
|
str_param: join_msg.clone(),
|
||||||
#[cfg(feature = "v3-5-0")]
|
#[cfg(feature = "third-notif-param")]
|
||||||
param_3: self.connected_players.len() as _,
|
param_3: self.connected_players.len() as _,
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
|
|
@ -288,7 +288,7 @@ impl ExtendedMatchmakeSession {
|
||||||
param_1: self.session.gathering.self_gid as PID,
|
param_1: self.session.gathering.self_gid as PID,
|
||||||
param_2: new_conn_pid,
|
param_2: new_conn_pid,
|
||||||
str_param: join_msg.clone(),
|
str_param: join_msg.clone(),
|
||||||
#[cfg(feature = "v3-5-0")]
|
#[cfg(feature = "third-notif-param")]
|
||||||
param_3: self.connected_players.len() as _,
|
param_3: self.connected_players.len() as _,
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
|
|
|
||||||
|
|
@ -463,7 +463,7 @@ impl MatchmakeExtension for User {
|
||||||
notif_type: REQUEST_JOIN_GATHERING * 1000,
|
notif_type: REQUEST_JOIN_GATHERING * 1000,
|
||||||
param_1,
|
param_1,
|
||||||
param_2,
|
param_2,
|
||||||
#[cfg(feature = "v3-5-0")]
|
#[cfg(feature = "third-notif-param")]
|
||||||
param_3: 0,
|
param_3: 0,
|
||||||
str_param,
|
str_param,
|
||||||
})
|
})
|
||||||
|
|
@ -476,7 +476,7 @@ impl MatchmakeExtension for User {
|
||||||
notif_type: END_GATHERING * 1000,
|
notif_type: END_GATHERING * 1000,
|
||||||
param_1,
|
param_1,
|
||||||
param_2,
|
param_2,
|
||||||
#[cfg(feature = "v3-5-0")]
|
#[cfg(feature = "third-notif-param")]
|
||||||
param_3: 0,
|
param_3: 0,
|
||||||
str_param,
|
str_param,
|
||||||
})
|
})
|
||||||
|
|
@ -554,7 +554,7 @@ impl Matchmake for User {
|
||||||
pid_source: self.pid,
|
pid_source: self.pid,
|
||||||
param_1: gid as PID,
|
param_1: gid as PID,
|
||||||
param_2: self.pid,
|
param_2: self.pid,
|
||||||
#[cfg(feature = "v3-5-0")]
|
#[cfg(feature = "third-notif-param")]
|
||||||
param_3: 0,
|
param_3: 0,
|
||||||
str_param: "".to_string(),
|
str_param: "".to_string(),
|
||||||
})
|
})
|
||||||
|
|
@ -576,7 +576,7 @@ impl Matchmake for User {
|
||||||
pid_source: self.pid,
|
pid_source: self.pid,
|
||||||
param_1: gid as PID,
|
param_1: gid as PID,
|
||||||
param_2: self.pid,
|
param_2: self.pid,
|
||||||
#[cfg(feature = "v3-5-0")]
|
#[cfg(feature = "third-notif-param")]
|
||||||
param_3: 0,
|
param_3: 0,
|
||||||
str_param: "".to_string(),
|
str_param: "".to_string(),
|
||||||
})
|
})
|
||||||
|
|
@ -612,7 +612,7 @@ impl Matchmake for User {
|
||||||
pid_source: self.pid,
|
pid_source: self.pid,
|
||||||
param_1: gid as PID,
|
param_1: gid as PID,
|
||||||
param_2: *candidate as PID,
|
param_2: *candidate as PID,
|
||||||
#[cfg(feature = "v3-5-0")]
|
#[cfg(feature = "third-notif-param")]
|
||||||
param_3: 0,
|
param_3: 0,
|
||||||
str_param: "".to_string(),
|
str_param: "".to_string(),
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -10,17 +10,17 @@ pub mod notification_types {
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg_if::cfg_if! {
|
cfg_if::cfg_if! {
|
||||||
if #[cfg(feature = "v3-5-0")]{
|
if #[cfg(feature = "third-notif-param")]{
|
||||||
#[derive(RmcSerialize, Debug, Default, Clone)]
|
#[derive(RmcSerialize, Debug, Default, Clone)]
|
||||||
#[rmc_struct(0)]
|
#[rmc_struct(0)]
|
||||||
pub struct NotificationEvent {
|
pub struct NotificationEvent {
|
||||||
pub pid_source: PID,
|
pub pid_source: PID,
|
||||||
pub notif_type: u32,
|
pub notif_type: u32,
|
||||||
pub param_1: PID,
|
pub param_1: PID,
|
||||||
pub param_2: PID,
|
pub param_2: PID,
|
||||||
pub str_param: String,
|
pub str_param: String,
|
||||||
pub param_3: PID,
|
pub param_3: PID,
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
#[derive(RmcSerialize, Debug, Default, Clone)]
|
#[derive(RmcSerialize, Debug, Default, Clone)]
|
||||||
#[rmc_struct(0)]
|
#[rmc_struct(0)]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue