Skip to content

Y
ygopro
Commit 07178ed5 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 7ed9f58e 64c69933
Pipeline #5551 passed with stages
        in 2 minutes and 24 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 2 additions and 2 deletions
        gframe/duelclient.cpp
        View file @ 07178ed5
        ......@@ -1643,7 +1643,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
        int c, l, s, ss;
        unsigned int code;
        bool panelmode = false;
        int hand_count[2] = { mainGame->dField.hand[0].size(), mainGame->dField.hand[1].size() };
        size_t hand_count[2] = { mainGame->dField.hand[0].size(), mainGame->dField.hand[1].size() };
        int select_count_in_hand[2] = { 0, 0 };
        bool select_ready = mainGame->dField.select_min == 0;
        mainGame->dField.select_ready = select_ready;
        ......@@ -1712,7 +1712,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
        int c, l, s, ss;
        unsigned int code;
        bool panelmode = false;
        int hand_count[2] = { mainGame->dField.hand[0].size(), mainGame->dField.hand[1].size() };
        size_t hand_count[2] = { mainGame->dField.hand[0].size(), mainGame->dField.hand[1].size() };
        int select_count_in_hand[2] = { 0, 0 };
        mainGame->dField.select_ready = false;
        ClientCard* pcard;
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment