Skip to content

Commit 657fd3b

Browse files
author
Fraser J. Gordon
committed
Minor cleanups of MCAd
1 parent aaaada3 commit 657fd3b

2 files changed

Lines changed: 6 additions & 15 deletions

File tree

engine/src/exec-ad.cpp

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -417,26 +417,17 @@ void MCAdGetAds(MCExecContext& ctxt, MCStringRef& r_ads)
417417
bool t_success;
418418
t_success = false;
419419

420-
MCAutoStringRef t_ads;
420+
MCAutoListRef t_ads;
421+
/* UNCHECKED */ MCListCreateMutable('\n', &t_ads);
421422
for(MCAd *t_ad = MCAdGetStaticAdsPtr(); t_ad != nil && t_success; t_ad = t_ad->GetNext())
422423
{
423424
if (!MCStringIsEmpty(t_ad->GetName()))
424-
{
425-
if (*t_ads == nil)
426-
{
427-
t_success = MCStringMutableCopy(t_ad->GetName(), &t_ads);
428-
}
429-
else
430-
{
431-
t_success = MCStringAppendFormat(*t_ads, "\n");
432-
t_success = t_success && MCStringAppend(*t_ads, t_ad->GetName());
433-
}
434-
}
425+
t_success = MCListAppend(*t_ads, t_ad->GetName());
435426
}
436427

437428
if (t_success)
438429
{
439-
r_ads = MCValueRetain(*t_ads);
430+
/* UNCHECKED */ MCListCopyAsString(*t_ads, r_ads);
440431
return;
441432
}
442433

engine/src/mblad.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ class MCAdEvent: public MCCustomEvent
177177
switch(m_event)
178178
{
179179
case kMCAdEventTypeReceive:
180-
t_object->Get()->message_with_valueref_args(MCM_ad_loaded, m_target->GetName(), kMCFalseString);
180+
t_object->Get()->message_with_valueref_args(MCM_ad_loaded, m_target->GetName(), kMCFalse);
181181
break;
182182
case kMCAdEventTypeReceiveDefault:
183-
t_object->Get()->message_with_valueref_args(MCM_ad_loaded, m_target->GetName(), kMCTrueString);
183+
t_object->Get()->message_with_valueref_args(MCM_ad_loaded, m_target->GetName(), kMCTrue);
184184
break;
185185
case kMCAdEventTypeReceiveFailed:
186186
t_object->Get()->message_with_valueref_args(MCM_ad_load_failed, m_target->GetName());

0 commit comments

Comments
 (0)