#91 machine erweitern #132
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # game/src/backend/area.rs # game/src/backend/gamestate.rs # game/src/machines/machine.rs
# Conflicts: # game/src/backend/area.rs # game/src/backend/gamestate.rs # game/src/backend/movement.rs # game/src/machines/machine.rs # game/src/machines/machine_sprite.rs
Nereuxofficial
approved these changes
Nov 25, 2022
| pub fn create_machine(&mut self) { | ||
| dbg!(format!("create_machine",)); | ||
| let new_ms = Mashine::default(self); | ||
| self.areas.push(Box::new(new_ms)); |
There was a problem hiding this comment.
Bitte nicht die Funktion default nennen wenn man ein Argument übergeben muss
| let machine = area.get_graphic(); | ||
| let pos = Vec2 { | ||
| x: area.get_collision_area().x, | ||
| y: area.get_collision_area().y, |
There was a problem hiding this comment.
Vec2::new ist kürzer
game/src/backend/movement.rs
Outdated
| info!("In interaction area: {:?}", self.get_interactable()); | ||
| let player_ref = &self.player.clone(); | ||
| self.get_interactable().unwrap().interact(player_ref); //TODO: change the unwrap |
There was a problem hiding this comment.
Statt unwrap können wir hier
if let Ok(interactable) = self.getinteractable(){ interactable.interact() }. Das panicken verhindern
Flippchen
reviewed
Nov 25, 2022
|
|
||
| impl GameState { | ||
| pub fn create_machine(&mut self) { | ||
| dbg!(format!("create_machine",)); |
There was a problem hiding this comment.
aus dem dbg bitte ein Info!() fürs logging
Flippchen
reviewed
Nov 25, 2022
game/src/machines/machine.rs
Outdated
| pub struct Maschine { | ||
| //gamestate:GameState, | ||
| #[derive(Debug, Clone, Serialize, Deserialize)] | ||
| pub struct Mashine { |
There was a problem hiding this comment.
Immer noch falsch geschrieben xD
Flippchen
approved these changes
Nov 25, 2022
Nereuxofficial
approved these changes
Nov 25, 2022
leoschnuell
approved these changes
Nov 25, 2022
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@Nereuxofficial ich will den merge buton clicken weills toll ist