Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 1c58a26

Browse files
author
Monte Goulding
committed
[[ LegacyExec ]] Remove LEGACY_EXEC and OLD_EXEC blocks
1 parent 8ae51a9 commit 1c58a26

169 files changed

Lines changed: 394 additions & 58547 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎engine/src/MCBlock.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ class MCBlock : public MCDLlist
148148
// MW-2012-03-04: [[ StackFile5500 ]] Measure the size of the serialized attributes.
149149
uint32_t measureattrs(uint32_t p_version);
150150

151-
#ifdef LEGACY_EXEC
152-
void setatts(Properties which, void *value);
153-
#endif
154151
Boolean getshift(int2 &out);
155152
void setshift(int2 in);
156153
Boolean getcolor(const MCColor *&color);

‎engine/src/aclip.cpp‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -203,69 +203,6 @@ void MCAudioClip::timer(MCNameRef mptr, MCParameter *params)
203203
}
204204
}
205205

206-
#ifdef LEGACY_EXEC
207-
Exec_stat MCAudioClip::getprop_legacy(uint4 parid, Properties which, MCExecPoint &ep, Boolean effective, bool recursive)
208-
{
209-
switch (which)
210-
{
211-
#ifdef /* MCAudioClip::getprop */ LEGACY_EXEC
212-
case P_SIZE:
213-
ep.setint(size);
214-
break;
215-
// AL-2014-08-12: [[ Bug 13161 ]] Get audioclip instance variable rather than global value
216-
case P_PLAY_DESTINATION:
217-
if (flags & F_EXTERNAL)
218-
ep.setstaticcstring("external");
219-
else
220-
ep.setstaticcstring("internal");
221-
break;
222-
case P_PLAY_LOUDNESS:
223-
ep.setint(loudness);
224-
break;
225-
#endif /* MCAudioClip::getprop */
226-
default:
227-
return MCObject::getprop_legacy(parid, which, ep, effective, recursive);
228-
}
229-
return ES_NORMAL;
230-
}
231-
#endif
232-
233-
#ifdef LEGACY_EXEC
234-
Exec_stat MCAudioClip::setprop_legacy(uint4 parid, Properties p, MCExecPoint &ep, Boolean effective)
235-
{
236-
int2 i1;
237-
MCString data = ep.getsvalue();
238-
239-
switch (p)
240-
{
241-
#ifdef /* MCAudioClip::setprop */ LEGACY_EXEC
242-
// AL-2014-08-12: [[ Bug 13161 ]] Setting templateAudioClip properties shouldn't set global ones
243-
case P_PLAY_DESTINATION:
244-
if (data == "external")
245-
flags |= F_EXTERNAL;
246-
else
247-
flags &= ~F_EXTERNAL;
248-
return ES_NORMAL;
249-
case P_PLAY_LOUDNESS:
250-
if (!MCU_stoi2(data, i1))
251-
{
252-
MCeerror->add(EE_ACLIP_LOUDNESSNAN, 0, 0, data);
253-
return ES_ERROR;
254-
}
255-
loudness = MCU_max(MCU_min(i1, 100), 0);
256-
if (loudness == 100)
257-
flags &= ~F_LOUDNESS;
258-
else
259-
flags |= F_LOUDNESS;
260-
return ES_NORMAL;
261-
#endif /* MCAudioClip::setprop */
262-
default:
263-
break;
264-
}
265-
return MCObject::setprop_legacy(parid, p, ep, effective);
266-
}
267-
#endif
268-
269206
Boolean MCAudioClip::del()
270207
{
271208
getstack()->removeaclip(this);

‎engine/src/aclip.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ class MCAudioClip : public MCObject
7979

8080
virtual void timer(MCNameRef mptr, MCParameter *params);
8181

82-
#ifdef LEGACY_EXEC
83-
virtual Exec_stat getprop_legacy(uint4 parid, Properties which, MCExecPoint &, Boolean effective, bool recursive = false);
84-
virtual Exec_stat setprop_legacy(uint4 parid, Properties which, MCExecPoint &, Boolean effective);
85-
#endif
86-
8782
virtual Boolean del();
8883
virtual void paste(void);
8984

0 commit comments

Comments
 (0)