From 2a6f0477809e6574693a302fb64f94b18133729a Mon Sep 17 00:00:00 2001 From: Monte Goulding Date: Sat, 20 Apr 2013 11:45:58 +1000 Subject: [PATCH] =?UTF-8?q?Added=20cardIDs=20of=20group=E2=80=A6=20always?= =?UTF-8?q?=20annoyed=20me=20you=20could=20only=20get=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/src/group.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/engine/src/group.cpp b/engine/src/group.cpp index 60bb5fb9350..ddf06098fae 100644 --- a/engine/src/group.cpp +++ b/engine/src/group.cpp @@ -881,17 +881,23 @@ Exec_stat MCGroup::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boole ep.setpoint(rect.width, rect.height); break; case P_CARD_NAMES: + case P_CARD_IDS: { ep.clear(); MCExecPoint ep2(ep); MCCard *startcard = getstack()->getcards(); MCCard *cptr = startcard; uint2 j = 0; - do + Properties t_prop; + if (which == P_CARD_NAMES) + t_prop = P_SHORT_NAME; + else + t_prop = P_SHORT_ID; + do { if (cptr->countme(obj_id, False)) { - cptr->getprop(0, P_SHORT_NAME, ep2, False); + cptr->getprop(0, t_prop, ep2, False); ep.concatmcstring(ep2.getsvalue(), EC_RETURN, j++ == 0); } cptr = cptr->next();