Skip to content

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

show side count by removed

parent 0ea328b9
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 4 deletions
gframe/client_field.cpp
View file @ ae417f57
...@@ -123,7 +123,7 @@ void ClientField::Clear() { ...@@ -123,7 +123,7 @@ void ClientField::Clear() {
tag_teammate_surrender = false; tag_teammate_surrender = false;
RefreshCardCountDisplay(); RefreshCardCountDisplay();
} }
void ClientField::Initial(int player, int deckc, int extrac) { void ClientField::Initial(int player, int deckc, int extrac, int sidec) {
ClientCard* pcard; ClientCard* pcard;
for(int i = 0; i < deckc; ++i) { for(int i = 0; i < deckc; ++i) {
pcard = new ClientCard; pcard = new ClientCard;
...@@ -145,6 +145,16 @@ void ClientField::Initial(int player, int deckc, int extrac) { ...@@ -145,6 +145,16 @@ void ClientField::Initial(int player, int deckc, int extrac) {
pcard->position = POS_FACEDOWN_DEFENSE; pcard->position = POS_FACEDOWN_DEFENSE;
GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true); GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
} }
for(int i = 0; i < sidec; ++i) {
pcard = new ClientCard;
remove[player].push_back(pcard);
pcard->owner = player;
pcard->controler = player;
pcard->location = LOCATION_REMOVED;
pcard->sequence = i;
pcard->position = POS_FACEDOWN_DEFENSE;
GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
}
RefreshCardCountDisplay(); RefreshCardCountDisplay();
} }
void ClientField::ResetSequence(std::vector<ClientCard*>& list, bool reset_height) { void ClientField::ResetSequence(std::vector<ClientCard*>& list, bool reset_height) {
......
gframe/client_field.h
View file @ ae417f57
...@@ -97,7 +97,7 @@ public: ...@@ -97,7 +97,7 @@ public:
ClientField(); ClientField();
~ClientField(); ~ClientField();
void Clear(); void Clear();
void Initial(int player, int deckc, int extrac); void Initial(int player, int deckc, int extrac, int sidec = 0);
void ResetSequence(std::vector<ClientCard*>& list, bool reset_height); void ResetSequence(std::vector<ClientCard*>& list, bool reset_height);
ClientCard* GetCard(int controler, int location, int sequence, int sub_seq = 0); ClientCard* GetCard(int controler, int location, int sequence, int sub_seq = 0);
void AddCard(ClientCard* pcard, int controler, int location, int sequence); void AddCard(ClientCard* pcard, int controler, int location, int sequence);
......
gframe/duelclient.cpp
View file @ ae417f57
...@@ -531,11 +531,11 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) { ...@@ -531,11 +531,11 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) {
int deckc = BufferIO::ReadInt16(pdata); int deckc = BufferIO::ReadInt16(pdata);
int extrac = BufferIO::ReadInt16(pdata); int extrac = BufferIO::ReadInt16(pdata);
int sidec = BufferIO::ReadInt16(pdata); int sidec = BufferIO::ReadInt16(pdata);
mainGame->dField.Initial(0, deckc, extrac); mainGame->dField.Initial(0, deckc, extrac, sidec);
deckc = BufferIO::ReadInt16(pdata); deckc = BufferIO::ReadInt16(pdata);
extrac = BufferIO::ReadInt16(pdata); extrac = BufferIO::ReadInt16(pdata);
sidec = BufferIO::ReadInt16(pdata); sidec = BufferIO::ReadInt16(pdata);
mainGame->dField.Initial(1, deckc, extrac); mainGame->dField.Initial(1, deckc, extrac, sidec);
mainGame->gMutex.unlock(); mainGame->gMutex.unlock();
break; break;
} }
......
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