Team 2 - merge to team branch #269
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
The-AhmadAA
requested review from
shiv-0831,
Mohamad11Dab and
AlasdairS4698737
The-AhmadAA
changed the title
The-AhmadAA
changed the title
Mohamad11Dab
approved these changes
Oct 16, 2023
There was a problem hiding this comment.
I think there might be a mistake on line 262 in the MainGameDisplay.
I've seen a pattern of towerToggle(null), with towerToggle(tower#) on a later line.
But for tower number 5, there were two instances of towerToggle(tower5). I wanted to check if this is intentional, or a typo.
Also, I'm a little unsure how your pause implementation will interact with mine, but you made your PR first, I guess.
| @@ -234,21 +258,22 @@ public void clicked(InputEvent event, float x, float y) { | |||
| TowerType selected = ServiceLocator.getCurrencyService().getTower(); | |||
| if (selected == towers.get(4)) { | |||
| ServiceLocator.getCurrencyService().setTowerType(null); | |||
| tower5.setChecked(false); | |||
|
|
|||
| towerToggle(tower5); | |||
There was a problem hiding this comment.
Was this meant to be towerToggle(null)? It breaks the previous pattern I've seen
There was a problem hiding this comment.
good spotting! This was indeed supposed to be towerToggle(null)
fixed errant towerToggle call for tower5
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.
Shortcut keys now update button visuals
ESC key now opens the pause menu (closing with ESC is still a bit buggy but doesn't break anthing)
Streamlined BuildInputComponent code
Added pause status in GameTime Service, along with getters and setters
Code smell clean up