ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort cryps

Browse Source
This commit is contained in:
ntr 2019-01-05 16:51:25 +11:00
parent f359332cf4
commit 1e4f2ccc80
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/scenes/background.js
View File

@ -134,7 +134,7 @@ const CustomPipeline = new Phaser.Class({
Phaser.Renderer.WebGL.Pipelines.TextureTintPipeline.call(this, { Phaser.Renderer.WebGL.Pipelines.TextureTintPipeline.call(this, {
game, game,
renderer: game.renderer, renderer: game.renderer,
fragShader: PLASMA, fragShader: STARS,
}); });
}, },
}); });

5
server/src/account.rs
View File

@ -189,8 +189,9 @@ pub fn account_cryps(tx: &mut Transaction, account: &Account) -> Result<Vec<Cryp
return Err(err_msg("could not deserialize a cryp")); return Err(err_msg("could not deserialize a cryp"));
} }
// now unwrap is safe let mut cryps = cryps.unwrap();
return Ok(cryps.unwrap()); cryps.sort_by_key(|c| c.id);
return Ok(cryps);
} }
pub fn account_game_history(tx: &mut Transaction, account: &Account) -> Result<Vec<Game>, Error> { pub fn account_game_history(tx: &mut Transaction, account: &Account) -> Result<Vec<Game>, Error> {

1
server/src/game.rs
View File

@ -160,6 +160,7 @@ impl Game {
let index = team.cryps.iter().position(|t| t.id == cryp.id).unwrap(); let index = team.cryps.iter().position(|t| t.id == cryp.id).unwrap();
team.cryps.remove(index); team.cryps.remove(index);
team.cryps.push(cryp.clone()); team.cryps.push(cryp.clone());
team.cryps.sort_unstable_by_key(|c| c.id);
}, },
None => panic!("cryp not in game"), None => panic!("cryp not in game"),
}; };