diff options
| author | Reiner Herrmann <reiner@reiner-h.de> | 2011-01-24 23:52:30 +0100 |
|---|---|---|
| committer | Reiner Herrmann <reiner@reiner-h.de> | 2011-01-24 23:52:30 +0100 |
| commit | ab9017f39f7a90bef9733a5274260deb14c73268 (patch) | |
| tree | eed23ecddaad48d9ca42a75aedd0c95a51204eff | |
| parent | afe777a3cfa06fbdf391a338ba8506cf9cbcbb47 (diff) | |
use player count instead of MAX_PLAYERS.
this is allowed because only the first $count elements will
be sorted by qsort/pnoc_sort, so only pnocs of valid players
will be sorted.
| -rw-r--r-- | src/game.c | 4 | ||||
| -rw-r--r-- | src/net/server.c | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -102,9 +102,9 @@ static void main_loop_client(int sock) case STATE_CLIENT_WAIT_FOR_OPEN_CARDS: net_recv(sock, msg_type_selected_card_all); - pnoc_sort(data->players.players, MAX_PLAYERS); // sort in ascending order + pnoc_sort(data->players.players, data->players.count); // sort in ascending order - ui_display_wnd_current_state(data->players.players, MAX_PLAYERS, 0, 0); // TODO fix parameters + ui_display_wnd_current_state(data->players.players, data->players.count, 0, 0); // TODO fix parameters state = STATE_CLIENT_PLAY_CARDS; sleep(2); diff --git a/src/net/server.c b/src/net/server.c index c5a0cc1..d05d7a9 100644 --- a/src/net/server.c +++ b/src/net/server.c @@ -213,7 +213,7 @@ void server_prep_selected_card_all(msg_t *m) m->hdr.type = msg_type_selected_card_all; - for(int i=0; i<MAX_PLAYERS; i++) + for(int i=0; i<ds->players.count; i++) { pnoc_t* pnoc = &ds->players.players[i]; if(pnoc->player_id == 0) // invalid player |