Lobby! #1
Merged
Lobby! #1
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
added 5 commits
March 23, 2018 08:52
Manghi
reviewed
Apr 17, 2018
src/client.rs
Outdated
| name: Option<String>, | ||
| in_game: bool, | ||
| game_slot: Option<String>, // None iff. in_game is false |
There was a problem hiding this comment.
if in_game is false when this is None, couldn't we simply have a function which checks if game_slot.is_some() to determine if we are in game?
There was a problem hiding this comment.
Yes, you're right. I'll fix that. Thanks!
Manghi
reviewed
Apr 17, 2018
| } | ||
| } | ||
| } else { | ||
| println!("OK, but we didn't make a request :/"); |
There was a problem hiding this comment.
Since this does sound impossible, should we make it unreachable!()?
There was a problem hiding this comment.
It isn't impossible. You can't trust the network. In any case, we'll be removing this when we add support for dropped/reordered/duplicated packets.
Manghi
reviewed
Apr 17, 2018
| } else { println!("ERROR: expected no arguments to leave"); } | ||
| } | ||
| "quit" => { | ||
| println!("Peace out!"); |
Manghi
reviewed
Apr 17, 2018
| for ref mut gs in &mut self.game_slots { | ||
| if gs.game_slot_id == *game_slot_id { | ||
| // remove player_id from game slot's player_ids | ||
| gs.player_ids.retain(|&p_id| p_id != player.player_id); |
There was a problem hiding this comment.
retain 👍
used this myself today
Manghi
requested changes
Apr 17, 2018
AaronM04
force-pushed
the
aaronm04/lobby
branch
from
dba34c6
to
cf41f57
Compare
|
@Manghi fixed, please re-review! |
Manghi
approved these changes
Apr 19, 2018
|
@AaronM04 Approved for merge. Thanks for the great work! |
|
Hooray! Thanks for reviewing! |
Manghi
added a commit
that referenced
this pull request
Apr 19, 2018
commit c42d754 Merge: 62b5d00 8ab7fed Author: Manghi <Manghi@users.noreply.github.com> Date: Wed Apr 18 19:40:36 2018 -0700 Merge pull request #1 from AaronM04/aaronm04/lobby Lobby! commit 8ab7fed Author: Aaron Miller <aaron.miller04@gmail.com> Date: Wed Apr 18 09:16:12 2018 -0700 client: remove in_game commit cf41f57 Author: Aaron Miller <aaron.miller04@gmail.com> Date: Tue Apr 17 08:47:09 2018 -0700 client&server: no need to have udp_tx be part of the fold state commit 7a53fcf Author: Aaron Miller <aaron.miller04@gmail.com> Date: Tue Apr 17 08:09:34 2018 -0700 client: update help message commit c488aa0 Author: Aaron Miller <aaron.miller04@gmail.com> Date: Mon Apr 16 21:57:49 2018 -0700 client: add checks to join,leave & add quit command commit 693c521 Author: Aaron Miller <aaron.miller04@gmail.com> Date: Mon Apr 16 09:01:58 2018 -0700 done with server checks; still need to do client checks commit 3cce7a4 Author: Aaron Miller <aaron.miller04@gmail.com> Date: Sun Apr 15 17:24:20 2018 -0700 server: implement leave, fix bugs in list players and join game slot, cleanup commit 82f3fe1 Author: Aaron Miller <aaron.miller04@gmail.com> Date: Sun Apr 1 16:38:22 2018 -0700 join, leave(client only for now), list players commit b330ebc Author: Aaron Miller <aaron.miller04@gmail.com> Date: Fri Mar 23 08:52:59 2018 -0700 server: join game slot
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.
Support for:
Rudimentary (wrong lol) handling of server OK responses via
last_req_actionfield in client state.