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

Commit c214d9c

Browse files
committed
[[ Refactor ]] Initial changes to bring server to 7.0 (CGI disabled at the moment).
1 parent 1acc685 commit c214d9c

File tree

12 files changed

+1742
-76
lines changed

12 files changed

+1742
-76
lines changed

engine/engine.xcodeproj/project.pbxproj

Lines changed: 173 additions & 5 deletions
Large diffs are not rendered by default.

engine/src/debug.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void MCB_break(MCExecContext &ctxt, uint2 line, uint2 pos)
9292
MCServerDebugBreak(ctxt, line, pos);
9393
}
9494

95-
void MCB_error(MCExecContext &ctxt, uint2 line, uint2 pos, uint2 id)
95+
bool MCB_error(MCExecContext &ctxt, uint2 line, uint2 pos, uint2 id)
9696
{
9797
MCServerDebugError(ctxt, line, pos, id);
9898

@@ -116,15 +116,15 @@ void MCB_setvar(MCExecContext &ctxt, MCValueRef p_value, MCNameRef name)
116116

117117
void MCB_setvalue(MCExecContext &ctxt, MCExecValue p_value, MCNameRef name)
118118
{
119-
if (!MCExecTypeIsValueRef(p_value))
119+
if (!MCExecTypeIsValueRef(p_value . type))
120120
{
121121
MCAutoValueRef t_value;
122122
MCExecTypeConvertAndReleaseAlways(ctxt, p_value . type, &p_value, kMCExecValueTypeValueRef, &(&t_value));
123-
MCB_setvar(ctxt, *t_value);
123+
MCB_setvar(ctxt, *t_value, name);
124124
}
125125
else
126126
{
127-
MCB_setvar(p_value . valueref_value);
127+
MCB_setvar(ctxt, p_value . valueref_value, name);
128128
}
129129
}
130130

engine/src/mode_server.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ void MCStack::mode_destroy(void)
140140
{
141141
}
142142

143+
#ifdef LEGACY_EXEC
143144
Exec_stat MCStack::mode_getprop(uint4 parid, Properties which, MCExecPoint &ep, MCStringRef carray, Boolean effective)
144145
{
145146
return ES_NOT_HANDLED;
@@ -149,6 +150,7 @@ Exec_stat MCStack::mode_setprop(uint4 parid, Properties which, MCExecPoint &ep,
149150
{
150151
return ES_NOT_HANDLED;
151152
}
153+
#endif
152154

153155
void MCStack::mode_load(void)
154156
{
@@ -206,6 +208,7 @@ void MCStack::mode_constrain(MCRectangle& rect)
206208
{
207209
}
208210

211+
#ifdef LEGACY_EXEC
209212
////////////////////////////////////////////////////////////////////////////////
210213
//
211214
// Implementation of MCObject::mode_get/setprop for SERVER mode.
@@ -230,6 +233,7 @@ Exec_stat MCProperty::mode_eval(MCExecPoint& ep)
230233
{
231234
return ES_NOT_HANDLED;
232235
}
236+
#endif
233237

234238
////////////////////////////////////////////////////////////////////////////////
235239
//

0 commit comments

Comments
 (0)