Commit441e59c

authored

Merge pull request#3 from plumsky/make-stable

Make project can build on stable

2 parents3da7b29 +8477ddf commit441e59cCopy full SHA for 441e59c

File tree

+12

-9

lines changed

+12

-9

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,13 @@ impl LoadResource for App {`
`59`	`59`	`mutevents:EventReader<AssetEvent<T>>,`
`60`	`60`	`assets:Res<Assets<T>>\|{`
`61`	`61`	`for eventin events.read(){`
`62`		`-ifletAssetEvent::Modified{ id} = event`
`63`		`- &&*id == handle.id()`
`64`		`- &&letSome(asset) = assets.get(&handle)`
`65`		`-{`
`66`		`- commands.insert_resource(asset.clone());`
	`62`	`+match event{`
	`63`	`+AssetEvent::Modified{ id}if*id == handle.id() =>{`
	`64`	`+ifletSome(asset) = assets.get(&handle){`
	`65`	`+ commands.insert_resource(asset.clone());`
	`66`	`+}`
	`67`	`+}`
	`68`	`+ _ =>{}`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`	`},`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,11 @@ fn handle_sprint_out(`
`104`	`104`	`mutplayer_query:Query<&mutPlayer,With<GameplayCtx>>,`
`105`	`105`	`){`
`106`	`106`	`let entity = on.target();`
`107`		`-ifletOk(mut player) = player_query.get_mut(entity)`
`108`		`- && player.speed > cfg.player.movement.speed`
`109`		`-{`
`110`		`- player.speed = cfg.player.movement.speed;`
	`107`	`+match player_query.get_mut(entity){`
	`108`	`+Ok(mut player)if player.speed > cfg.player.movement.speed =>{`
	`109`	`+ player.speed = cfg.player.movement.speed;`
	`110`	`+}`
	`111`	`+ _ =>{}`
`111`	`112`	`}`
`112`	`113`	`}`
`113`	`114`

Comments

(0)