tangent128/base2020
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Create a PlayerId typedef, don't overload -1 for unassigned.

Browse source
This commit is contained in:
Tangent 2020-05-26 23:32:28 -04:00
parent 764e4d85cf
commit 750cfe1630
3 changed files with 9 additions and 7 deletions
src/net
mod.rs

8
src/net/mod.rs
View file

@ -3,6 +3,8 @@ use serde_json::Value;
pub mod server;
pub type PlayerId = usize;
#[derive(Deserialize, Debug)]
#[serde(tag = "t")]
pub enum ClientMessage<I = Value, S = Value> {
@ -14,13 +16,13 @@ pub enum ClientMessage<I = Value, S = Value> {
GetState { c: usize, s: S },
}
#[derive(Serialize, Debug)]
#[derive(Serialize, Debug, Clone)]
pub struct Meta {
pub helo: Option<String>,
pub version: &'static str,
}
#[derive(Serialize, Debug)]
#[derive(Serialize, Debug, Clone)]
#[serde(tag = "t")]
pub enum ServerMessage<I = Vec<Value>, S = Value> {
#[serde(rename = "m")]
@ -29,7 +31,7 @@ pub enum ServerMessage<I = Vec<Value>, S = Value> {
m: Meta,
},
#[serde(rename = "s")]
SetState { u: i8, s: S },
SetState { u: Option<PlayerId>, s: S },
#[serde(rename = "i")]
Input { i: I },
#[serde(rename = "g")]