gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r26833) -Fix [Squirrel]: remove a few bits of dead code

Browse Source
This commit is contained in:
rubidium 2014-09-16 20:06:28 +00:00
parent 5cec030d4d
commit 12bd7532ba
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/3rdparty/squirrel/squirrel/sqapi.cpp vendored
View File

@ -988,9 +988,6 @@ SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror,
v->Pop(params); v->Pop(params);
return SQ_ERROR; return SQ_ERROR;
} }
if(!v->_suspended)
v->Pop(params);
return sq_throwerror(v,"call failed");
} }
SQRESULT sq_suspendvm(HSQUIRRELVM v) SQRESULT sq_suspendvm(HSQUIRRELVM v)

5
src/3rdparty/squirrel/squirrel/sqcompiler.cpp vendored
View File

@ -429,7 +429,7 @@ public:
void LogicalOrExp() void LogicalOrExp()
{ {
LogicalAndExp(); LogicalAndExp();
for(;;) if(_token == TK_OR) { if(_token == TK_OR) {
SQInteger first_exp = _fs->PopTarget(); SQInteger first_exp = _fs->PopTarget();
SQInteger trg = _fs->PushTarget(); SQInteger trg = _fs->PushTarget();
_fs->AddInstruction(_OP_OR, trg, 0, first_exp, 0); _fs->AddInstruction(_OP_OR, trg, 0, first_exp, 0);
@ -441,8 +441,7 @@ public:
if(trg != second_exp) _fs->AddInstruction(_OP_MOVE, trg, second_exp); if(trg != second_exp) _fs->AddInstruction(_OP_MOVE, trg, second_exp);
_fs->SnoozeOpt(); _fs->SnoozeOpt();
_fs->SetIntructionParam(jpos, 1, (_fs->GetCurrentPos() - jpos)); _fs->SetIntructionParam(jpos, 1, (_fs->GetCurrentPos() - jpos));
break; }
}else return;
} }
void LogicalAndExp() void LogicalAndExp()
{ {