extra_p_count

84597221 · salix5 · aa032c7f · 84597221 · ca04a9a0 · 4eab11dc
Commit 84597221 authored Nov 25, 2015 by salix5
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

gframe/client_field.cpp gframe/client_field.cpp +2 -2

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/client_field.cpp
+++ b/gframe/client_field.cpp
@@ -186,7 +186,7 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
 	case LOCATION_EXTRA: {
 		extra[controler].push_back(pcard);
 		pcard->sequence = extra[controler].size() - 1;
-		if (/*(pcard->type & TYPE_PENDULUM) &&*/ (pcard->position & POS_FACEUP))
+		if (pcard->position & POS_FACEUP)
 			extra_p_count[controler]++;
 		break;
 	}
@@ -256,7 +256,7 @@ ClientCard* ClientField::RemoveCard(int controler, int location, int sequence) {
 			extra[controler][i]->mTransform.setTranslation(extra[controler][i]->curPos);
 		}
 		extra[controler].erase(extra[controler].end() - 1);
-		if ((pcard->type & TYPE_PENDULUM) && (pcard->position & POS_FACEUP))
+		if (pcard->position & POS_FACEUP)
 			extra_p_count[controler]--;
 		break;
 	}

--- a/ocgcore @ ca04a9a0
+++ b/ocgcore @ ca04a9a0
-Subproject commit 70b98b61c58977e62065f378cb0d5dfedca26e44
+Subproject commit ca04a9a0bb85b5ccd39c9fe40631e6c13ffdb36b
--- a/script @ 4eab11dc
+++ b/script @ 4eab11dc
-Subproject commit fcfc0c01eeccdc59eea10099dd146cc2916c3f02
+Subproject commit 4eab11dc0417759238aee87b8b390c1a8ae838f1