mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of http://github.com/zinnschlag/openmw

Browse Source
actorid
Nicolay Korslund 15 years ago
parent 6966c66091 c37b007be0
commit 064e3e2e23
31 changed files with 553 additions and 24 deletions
Show Stats Download Patch File Download Diff File

5
apps/mwcompiler/context.cpp
Unescape Escape View File

@ -12,5 +12,10 @@ namespace SACompiler
{
return ' ';
}
bool Context::isId (const std::string& name) const
{
return false;
}
}

5
apps/mwcompiler/context.hpp
Unescape Escape View File

@ -13,7 +13,10 @@ namespace SACompiler
///< Is the compiler allowed to declare local variables?
virtual char getGlobalType (const std::string& name) const;
///< 'l: long, 's': short, 'f': float, ' ': does not exist.
///< 'l: long, 's': short, 'f': float, ' ': does not exist.
virtual bool isId (const std::string& name) const;
///< Does \a name match an ID, that can be referenced?
};
}

9
apps/mwinterpreter/context.cpp
Unescape Escape View File

@ -120,6 +120,15 @@ namespace SAInterpreter
return 0;
}
bool Context::isDisabled (const std::string& id) const
{
return false;
}
void Context::enable (const std::string& id) {}
void Context::disable (const std::string& id) {}
void Context::report()
{
std::size_t i = 0;

6
apps/mwinterpreter/context.hpp
Unescape Escape View File

@ -62,6 +62,12 @@ namespace SAInterpreter
virtual float getSecondsPassed() const;
virtual bool isDisabled (const std::string& id = "") const;
virtual void enable (const std::string& id = "");
virtual void disable (const std::string& id = "");
void report();
///< Write state to std::cout
};

8
apps/openmw/mwrender/cell.hpp
Unescape Escape View File

@ -1,6 +1,8 @@
#ifndef GAME_RENDER_CELL_H
#define GAME_RENDER_CELL_H
#include <string>
namespace MWRender
{
class CellRender
@ -15,6 +17,12 @@ namespace MWRender
/// Remove the cell from rendering, but don't remove it from
/// memory.
virtual void hide() = 0;
/// Make the reference with the given handle visible.
virtual void enable (const std::string& handle) = 0;
/// Make the reference with the given handle invisible.
virtual void disable (const std::string& handle) = 0;
};
}

4
apps/openmw/mwrender/cellimp.cpp
Unescape Escape View File

@ -13,7 +13,7 @@ void insertObj(CellRenderImp& cellRender, T& liveRef)
{
cellRender.insertBegin (liveRef.ref);
cellRender.insertMesh ("meshes\\" + model);
liveRef.mData.setHandle (cellRender.insertEnd());
liveRef.mData.setHandle (cellRender.insertEnd (liveRef.mData.isEnabled()));
}
}
@ -36,7 +36,7 @@ void insertObj(CellRenderImp& cellRender, ESMS::LiveCellRef<ESM::Light, MWWorld:
const float radius = float(liveRef.base->data.radius);
cellRender.insertLight(r, g, b, radius);
liveRef.mData.setHandle (cellRender.insertEnd());
liveRef.mData.setHandle (cellRender.insertEnd (liveRef.mData.isEnabled()));
}
}

2
apps/openmw/mwrender/cellimp.hpp
Unescape Escape View File

@ -33,7 +33,7 @@ namespace MWRender
virtual void insertLight(float r, float g, float b, float radius) = 0;
/// finish inserting a new reference and return a handle to it.
virtual std::string insertEnd() = 0;
virtual std::string insertEnd (bool Enable) = 0;
void insertCell(ESMS::CellStore<MWWorld::RefData> &cell);

17
apps/openmw/mwrender/interior.cpp
Unescape Escape View File

@ -103,12 +103,15 @@ void InteriorCellRender::insertLight(float r, float g, float b, float radius)
// finish inserting a new reference and return a handle to it.
std::string InteriorCellRender::insertEnd()
std::string InteriorCellRender::insertEnd (bool enable)
{
assert (insert);
std::string handle = insert->getName();
if (!enable)
insert->setVisible (false);
insert = 0;
return handle;
@ -219,6 +222,18 @@ void InteriorCellRender::toggleLight()
setAmbientMode();
}
void InteriorCellRender::enable (const std::string& handle)
{
if (!handle.empty())
scene.getMgr()->getSceneNode (handle)->setVisible (true);
}
void InteriorCellRender::disable (const std::string& handle)
{
if (!handle.empty())
scene.getMgr()->getSceneNode (handle)->setVisible (false);
}
// Magic function from the internets. Might need this later.
/*
void Scene::DestroyAllAttachedMovableObjects( SceneNode* i_pSceneNode )

10
apps/openmw/mwrender/interior.hpp
Unescape Escape View File

@ -66,7 +66,7 @@ namespace MWRender
virtual void insertLight(float r, float g, float b, float radius);
/// finish inserting a new reference and return a handle to it.
virtual std::string insertEnd();
virtual std::string insertEnd (bool Enable);
/// configure lighting according to cell
void configureAmbient();
@ -88,13 +88,19 @@ namespace MWRender
/// Remove the cell from rendering, but don't remove it from
/// memory.
void hide();
virtual void hide();
/// Destroy all rendering objects connected with this cell.
void destroy(); // comment by Zini: shouldn't this go into the destructor?
/// Switch through lighting modes.
void toggleLight();
/// Make the reference with the given handle visible.
virtual void enable (const std::string& handle);
/// Make the reference with the given handle invisible.
virtual void disable (const std::string& handle);
};
}

25
apps/openmw/mwscript/compilercontext.cpp
Unescape Escape View File

@ -31,5 +31,30 @@ namespace MWScript
return ' ';
}
bool CompilerContext::isId (const std::string& name) const
{
return
mEnvironment.mWorld->getStore().activators.find (name) ||
mEnvironment.mWorld->getStore().potions.find (name) ||
mEnvironment.mWorld->getStore().appas.find (name) ||
mEnvironment.mWorld->getStore().armors.find (name) ||
mEnvironment.mWorld->getStore().books.find (name) ||
mEnvironment.mWorld->getStore().clothes.find (name) ||
mEnvironment.mWorld->getStore().containers.find (name) ||
mEnvironment.mWorld->getStore().creatures.find (name) ||
mEnvironment.mWorld->getStore().doors.find (name) ||
mEnvironment.mWorld->getStore().ingreds.find (name) ||
mEnvironment.mWorld->getStore().creatureLists.find (name) ||
mEnvironment.mWorld->getStore().itemLists.find (name) ||
mEnvironment.mWorld->getStore().lights.find (name) ||
mEnvironment.mWorld->getStore().lockpicks.find (name) ||
mEnvironment.mWorld->getStore().miscItems.find (name) ||
mEnvironment.mWorld->getStore().npcs.find (name) ||
mEnvironment.mWorld->getStore().probes.find (name) ||
mEnvironment.mWorld->getStore().repairs.find (name) ||
mEnvironment.mWorld->getStore().statics.find (name) ||
mEnvironment.mWorld->getStore().weapons.find (name);
}
}

3
apps/openmw/mwscript/compilercontext.hpp
Unescape Escape View File

@ -35,6 +35,9 @@ namespace MWScript
/// 'l: long, 's': short, 'f': float, ' ': does not exist.
virtual char getGlobalType (const std::string& name) const;
virtual bool isId (const std::string& name) const;
///< Does \a name match an ID, that can be referenced?
};
}

54
apps/openmw/mwscript/interpretercontext.cpp
Unescape Escape View File

@ -16,6 +16,42 @@
namespace MWScript
{
InterpreterContext::PtrWithCell InterpreterContext::getReference (
const std::string& id, bool activeOnly)
{
PtrWithCell ref;
if (!id.empty())
{
return mEnvironment.mWorld->getPtr (id, activeOnly);
}
else
{
if (mReference.isEmpty())
throw std::runtime_error ("no implicit reference");
return PtrWithCell (mReference, mEnvironment.mWorld->find (mReference));
}
}
InterpreterContext::CPtrWithCell InterpreterContext::getReference (
const std::string& id, bool activeOnly) const
{
CPtrWithCell ref;
if (!id.empty())
{
return mEnvironment.mWorld->getPtr (id, activeOnly);
}
else
{
if (mReference.isEmpty())
throw std::runtime_error ("no implicit reference");
return CPtrWithCell (mReference, mEnvironment.mWorld->find (mReference));
}
}
InterpreterContext::InterpreterContext (MWWorld::Environment& environment,
MWScript::Locals *locals, MWWorld::Ptr reference)
: mEnvironment (environment), mLocals (locals), mReference (reference)
@ -166,6 +202,24 @@ namespace MWScript
return mEnvironment.mFrameDuration;
}
bool InterpreterContext::isDisabled (const std::string& id) const
{
CPtrWithCell ref = getReference (id, false);
return !ref.first.getRefData().isEnabled();
}
void InterpreterContext::enable (const std::string& id)
{
PtrWithCell ref = getReference (id, false);
mEnvironment.mWorld->enable (ref);
}
void InterpreterContext::disable (const std::string& id)
{
PtrWithCell ref = getReference (id, false);
mEnvironment.mWorld->disable (ref);
}
MWGui::GuiManager& InterpreterContext::getGuiManager()
{
return *mEnvironment.mGuiManager;

19
apps/openmw/mwscript/interpretercontext.hpp
Unescape Escape View File

@ -5,11 +5,7 @@
#include "../mwworld/ptr.hpp"
#include "../mwworld/environment.hpp"
namespace MWWorld
{
class World;
}
#include "../mwworld/world.hpp"
namespace MWSound
{
@ -26,6 +22,13 @@ namespace MWScript
Locals *mLocals;
MWWorld::Ptr mReference;
typedef std::pair<MWWorld::Ptr, MWWorld::World::CellStore *> PtrWithCell;
typedef std::pair<const MWWorld::Ptr, const MWWorld::World::CellStore *> CPtrWithCell;
PtrWithCell getReference (const std::string& id, bool activeOnly);
CPtrWithCell getReference (const std::string& id, bool activeOnly) const;
public:
InterpreterContext (MWWorld::Environment& environment,
@ -73,6 +76,12 @@ namespace MWScript
virtual float getSecondsPassed() const;
virtual bool isDisabled (const std::string& id = "") const;
virtual void enable (const std::string& id = "");
virtual void disable (const std::string& id = "");
MWWorld::World& getWorld();
MWSound::SoundManager& getSoundManager();

18
apps/openmw/mwworld/refdata.hpp
Unescape Escape View File

@ -20,10 +20,11 @@ namespace MWWorld
// object in the refdata of refs without a script,
// we can make this a pointer later.
bool mHasLocals;
bool mEnabled;
public:
RefData() : mHasLocals (false) {}
RefData() : mHasLocals (false), mEnabled (true) {}
std::string getHandle()
{
@ -48,6 +49,21 @@ namespace MWWorld
{
return mLocals;
}
bool isEnabled() const
{
return mEnabled;
}
void enable()
{
mEnabled = true;
}
void disable()
{
mEnabled = true;
}
};
}

89
apps/openmw/mwworld/world.cpp
Unescape Escape View File

@ -9,6 +9,8 @@
#include "apps/openmw/mwrender/sky.hpp"
#include "apps/openmw/mwrender/interior.hpp"
#include "ptr.hpp"
namespace
{
template<typename T>
@ -31,6 +33,20 @@ namespace
}
}
}
template<typename T>
bool hasReference (ESMS::CellRefList<T, MWWorld::RefData>& cellRefList, const MWWorld::Ptr& ptr)
{
for (typename ESMS::CellRefList<T, MWWorld::RefData>::List::iterator iter (
cellRefList.list.begin());
iter!=cellRefList.list.end(); ++iter)
{
if (&iter->mData==&ptr.getRefData())
return true;
}
return false;
}
}
namespace MWWorld
@ -121,6 +137,24 @@ namespace MWWorld
return Ptr();
}
MWRender::CellRender *World::searchRender (CellStore *store)
{
CellRenderCollection::iterator iter = mActiveCells.find (store);
if (iter!=mActiveCells.end())
{
return iter->second;
}
else
{
iter = mBufferedCells.find (store);
if (iter!=mBufferedCells.end())
return iter->second;
}
return 0;
}
World::World (Render::OgreRenderer& renderer, const boost::filesystem::path& dataDir,
const std::string& master, const std::string& startCell, bool newGame)
: mSkyManager (0), mScene (renderer), mPlayerPos (0)
@ -245,4 +279,59 @@ namespace MWWorld
throw std::runtime_error ("unknown ID: " + name);
}
void World::enable (std::pair<Ptr, CellStore *>& reference)
{
if (!reference.first.getRefData().isEnabled())
{
reference.first.getRefData().enable();
if (MWRender::CellRender *render = searchRender (reference.second))
{
render->enable (reference.first.getRefData().getHandle());
}
}
}
void World::disable (std::pair<Ptr, CellStore *>& reference)
{
if (!reference.first.getRefData().isEnabled())
{
reference.first.getRefData().enable();
if (MWRender::CellRender *render = searchRender (reference.second))
{
render->disable (reference.first.getRefData().getHandle());
}
}
}
World::CellStore *World::find (const Ptr& ptr)
{
for (CellRenderCollection::iterator iter (mActiveCells.begin()); iter!=mActiveCells.end();
++iter)
{
if (
hasReference (iter->first->activators, ptr) ||
hasReference (iter->first->potions, ptr) ||
hasReference (iter->first->appas, ptr) ||
hasReference (iter->first->armors, ptr) ||
hasReference (iter->first->books, ptr) ||
hasReference (iter->first->clothes, ptr) ||
hasReference (iter->first->containers, ptr) ||
hasReference (iter->first->creatures, ptr) ||
hasReference (iter->first->doors, ptr) ||
hasReference (iter->first->ingreds, ptr) ||
hasReference (iter->first->lights, ptr) ||
hasReference (iter->first->lockpicks, ptr) ||
hasReference (iter->first->miscItems, ptr) ||
hasReference (iter->first->npcs, ptr) ||
hasReference (iter->first->probes, ptr) ||
hasReference (iter->first->repairs, ptr) ||
hasReference (iter->first->weapons, ptr))
return iter->first;
}
throw std::runtime_error ("failed to locate reference in active cell");
}
}

9
apps/openmw/mwworld/world.hpp
Unescape Escape View File

@ -61,6 +61,8 @@ namespace MWWorld
Ptr getPtr (const std::string& name, CellStore& cellStore);
MWRender::CellRender *searchRender (CellStore *store);
public:
World (Render::OgreRenderer& renderer, const boost::filesystem::path& master,
@ -83,6 +85,13 @@ namespace MWWorld
std::pair<Ptr, CellStore *> getPtr (const std::string& name, bool activeOnly);
///< Return a pointer to a liveCellRef with the given name.
/// \param activeOnly do non search inactive cells.
void enable (std::pair<Ptr, CellStore *>& reference);
void disable (std::pair<Ptr, CellStore *>& reference);
CellStore *find (const Ptr& ptr);
///< Only active cells are searched.
};
}

5
components/compiler/context.hpp
Unescape Escape View File

@ -31,7 +31,10 @@ namespace Compiler
}
virtual char getGlobalType (const std::string& name) const = 0;
///< 'l: long, 's': short, 'f': float, ' ': does not exist.
///< 'l: long, 's': short, 'f': float, ' ': does not exist.
virtual bool isId (const std::string& name) const = 0;
///< Does \a name match an ID, that can be referenced?
};
}

62
components/compiler/exprparser.cpp
Unescape Escape View File

@ -203,6 +203,9 @@ namespace Compiler
bool ExprParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
{
if (!mExplicit.empty())
return Parser::parseInt (value, loc, scanner);
mFirst = false;
if (mNextOperand)
@ -221,6 +224,9 @@ namespace Compiler
bool ExprParser::parseFloat (float value, const TokenLoc& loc, Scanner& scanner)
{
if (!mExplicit.empty())
return Parser::parseFloat (value, loc, scanner);
mFirst = false;
if (mNextOperand)
@ -240,6 +246,9 @@ namespace Compiler
bool ExprParser::parseName (const std::string& name, const TokenLoc& loc,
Scanner& scanner)
{
if (!mExplicit.empty())
return Parser::parseName (name, loc, scanner);
mFirst = false;
if (mNextOperand)
@ -255,7 +264,6 @@ namespace Compiler
mOperands.push_back (type=='f' ? 'f' : 'l');
return true;
}
type = getContext().getGlobalType (name2);
@ -266,6 +274,12 @@ namespace Compiler
mOperands.push_back (type=='f' ? 'f' : 'l');
return true;
}
if (mExplicit.empty() && getContext().isId (name))
{
mExplicit = name;
return true;
}
}
else
{
@ -280,7 +294,28 @@ namespace Compiler
bool ExprParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
{
mFirst = false;
if (!mExplicit.empty())
{
if (mRefOp && mNextOperand)
{
if (keyword==Scanner::K_getdisabled)
{
mTokenLoc = loc;
Generator::getDisabled (mCode, mLiterals, mExplicit);
mOperands.push_back ('l');
mExplicit.clear();
mRefOp = false;
mNextOperand = false;
return true;
}
}
return Parser::parseKeyword (keyword, loc, scanner);
}
if (mNextOperand)
{
if (keyword==Scanner::K_getsquareroot)
@ -346,7 +381,17 @@ namespace Compiler
mNextOperand = false;
return true;
}
}
else if (keyword==Scanner::K_getdisabled)
{
mTokenLoc = loc;
Generator::getDisabled (mCode, mLiterals, "");
mOperands.push_back ('l');
mNextOperand = false;
return true;
}
else
{
// check for custom extensions
@ -381,6 +426,17 @@ namespace Compiler
bool ExprParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
{
if (!mExplicit.empty())
{
if (!mRefOp && code==Scanner::S_ref)
{
mRefOp = true;
return true;
}
return Parser::parseSpecial (code, loc, scanner);
}
if (code==Scanner::S_comma)
{
mTokenLoc = loc;
@ -488,6 +544,8 @@ namespace Compiler
mNextOperand = true;
mCode.clear();
mFirst = true;
mExplicit.clear();
mRefOp = false;
}
char ExprParser::append (std::vector<Interpreter::Type_Code>& code)

2
components/compiler/exprparser.hpp
Unescape Escape View File

@ -24,6 +24,8 @@ namespace Compiler
std::vector<Interpreter::Type_Code> mCode;
bool mFirst;
bool mArgument;
std::string mExplicit;
bool mRefOp;
int getPriority (char op) const;

6
components/compiler/fileparser.cpp
Unescape Escape View File

@ -75,6 +75,12 @@ namespace Compiler
{
if (code==Scanner::S_newline)
{
if (mState==BeginState)
{
// ignore empty lines
return true;
}
if (mState==BeginCompleteState)
{
// parse the script body

72
components/compiler/generator.cpp
Unescape Escape View File

@ -284,6 +284,36 @@ namespace
{
code.push_back (Compiler::Generator::segment5 (50));
}
void opEnable (Compiler::Generator::CodeContainer& code)
{
code.push_back (Compiler::Generator::segment5 (51));
}
void opDisable (Compiler::Generator::CodeContainer& code)
{
code.push_back (Compiler::Generator::segment5 (52));
}
void opGetDisabled (Compiler::Generator::CodeContainer& code)
{
code.push_back (Compiler::Generator::segment5 (53));
}
void opEnableExplicit (Compiler::Generator::CodeContainer& code)
{
code.push_back (Compiler::Generator::segment5 (54));
}
void opDisableExplicit (Compiler::Generator::CodeContainer& code)
{
code.push_back (Compiler::Generator::segment5 (55));
}
void opGetDisabledExplicit (Compiler::Generator::CodeContainer& code)
{
code.push_back (Compiler::Generator::segment5 (56));
}
}
namespace Compiler
@ -685,6 +715,48 @@ namespace Compiler
{
opGetSecondsPassed (code);
}
void getDisabled (CodeContainer& code, Literals& literals, const std::string id)
{
if (id.empty())
{
opGetDisabled (code);
}
else
{
int index = literals.addString (id);
opPushInt (code, index);
opGetDisabledExplicit (code);
}
}
void enable (CodeContainer& code, Literals& literals, const std::string id)
{
if (id.empty())
{
opEnable (code);
}
else
{
int index = literals.addString (id);
opPushInt (code, index);
opEnableExplicit (code);
}
}
void disable (CodeContainer& code, Literals& literals, const std::string id)
{
if (id.empty())
{
opDisable (code);
}
else
{
int index = literals.addString (id);
opPushInt (code, index);
opDisableExplicit (code);
}
}
}
}

6
components/compiler/generator.hpp
Unescape Escape View File

@ -110,6 +110,12 @@ namespace Compiler
void getDistance (CodeContainer& code);
void getSecondsPassed (CodeContainer& code);
void getDisabled (CodeContainer& code, Literals& literals, const std::string id);
void enable (CodeContainer& code, Literals& literals, const std::string id);
void disable (CodeContainer& code, Literals& literals, const std::string id);
}
}

34
components/compiler/lineparser.cpp
Unescape Escape View File

@ -129,11 +129,36 @@ namespace Compiler
return false;
}
if (mState==BeginState && getContext().isId (name))
{
mState = PotentialExplicitState;
mExplicit = toLower (name);
return true;
}
return Parser::parseName (name, loc, scanner);
}
bool LineParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
{
if (mState==BeginState || mState==ExplicitState)
{
switch (keyword)
{
case Scanner::K_enable:
Generator::enable (mCode, mLiterals, mExplicit);
mState = EndState;
return true;
case Scanner::K_disable:
Generator::disable (mCode, mLiterals, mExplicit);
mState = EndState;
return true;
}
}
if (mState==BeginState)
{
switch (keyword)
@ -162,7 +187,7 @@ namespace Compiler
mExprParser.parseArguments ("c", scanner, mCode, true);
Generator::stopScript (mCode);
mState = EndState;
return true;
return true;
}
// check for custom extensions
@ -221,6 +246,12 @@ namespace Compiler
mState = MessageCommaState;
return true;
}
if (code==Scanner::S_ref && mState==PotentialExplicitState)
{
mState = ExplicitState;
return true;
}
return Parser::parseSpecial (code, loc, scanner);
}
@ -229,6 +260,7 @@ namespace Compiler
{
mState = BeginState;
mName.clear();
mExplicit.clear();
}
}

4
components/compiler/lineparser.hpp
Unescape Escape View File

@ -23,7 +23,8 @@ namespace Compiler
ShortState, LongState, FloatState,
SetState, SetLocalVarState, SetGlobalVarState,
MessageState, MessageCommaState,
EndState
EndState,
PotentialExplicitState, ExplicitState
};
Locals& mLocals;
@ -31,6 +32,7 @@ namespace Compiler
std::vector<Interpreter::Type_Code>& mCode;
State mState;
std::string mName;
std::string mExplicit;
char mType;
ExprParser mExprParser;

1
components/compiler/scanner.cpp
Unescape Escape View File

@ -247,6 +247,7 @@ namespace Compiler
"startscript", "stopscript", "scriptrunning",
"getdistance",
"getsecondspassed",
"enable", "disable", "getdisabled",
0
};

3
components/compiler/scanner.hpp
Unescape Escape View File

@ -53,7 +53,8 @@ namespace Compiler
K_random,
K_startscript, K_stopscript, K_scriptrunning,
K_getdistance,
K_getsecondspassed
K_getsecondspassed,
K_enable, K_disable, K_getdisabled
};
enum special

2
components/esm_store/cell_store.hpp
Unescape Escape View File

@ -175,8 +175,6 @@ namespace ESMS
std::cout << "WARNING: Ignoring reference '" << ref.refID << "' of unhandled type\n";
}
}
std::cout << "Statics in cell: " << statics.list.size() << std::endl;
}
};

8
components/interpreter/context.hpp
Unescape Escape View File

@ -55,7 +55,13 @@ namespace Interpreter
virtual float getDistance (const std::string& name) const = 0;
virtual float getSecondsPassed() const = 0;
virtual float getSecondsPassed() const = 0;
virtual bool isDisabled (const std::string& id = "") const = 0;
virtual void enable (const std::string& id = "") = 0;
virtual void disable (const std::string& id = "") = 0;
};
}

8
components/interpreter/docs/vmformat.txt
Unescape Escape View File

@ -109,6 +109,12 @@ op 47: start script stack[0] and pop
op 48: stop script stack[0] and pop
op 49: replace stack[0] with distance between implicit reference and a reference of ID stack[0]
op 50: push frame duration (float)
opcodes 51-33554431 unused
op 51: enable implicit reference
op 52: disable implicit reference
op 53: push 1, if implicit reference is disabled, 0 else
op 54: explicit reference = stack[0]; pop; enable explicit reference
op 55: explicit reference = stack[0]; pop; disable explicit reference
op 56: explicit reference = stack[0]; pop; push 1, if explicit reference is disabled, 0 else
opcodes 57-33554431 unused
opcodes 33554432-67108863 reserved for extensions

8
components/interpreter/installopcodes.cpp
Unescape Escape View File

@ -89,7 +89,13 @@ namespace Interpreter
interpreter.installSegment5 (38, new OpMenuMode);
interpreter.installSegment5 (45, new OpRandom);
interpreter.installSegment5 (50, new OpGetSecondsPassed);
interpreter.installSegment5 (51, new OpEnable);
interpreter.installSegment5 (52, new OpDisable);
interpreter.installSegment5 (53, new OpGetDisabled);
interpreter.installSegment5 (54, new OpEnableExplicit);
interpreter.installSegment5 (55, new OpDisableExplicit);
interpreter.installSegment5 (56, new OpGetDisabledExplicit);
// script control
interpreter.installSegment5 (46, new OpScriptRunning);
interpreter.installSegment5 (47, new OpStartScript);

73
components/interpreter/miscopcodes.hpp
Unescape Escape View File

@ -130,6 +130,79 @@ namespace Interpreter
runtime.push (*reinterpret_cast<Type_Data *> (&duration));
}
};
class OpEnable : public Opcode0
{
public:
virtual void execute (Runtime& runtime)
{
runtime.getContext().enable();
}
};
class OpDisable : public Opcode0
{
public:
virtual void execute (Runtime& runtime)
{
runtime.getContext().disable();
}
};
class OpGetDisabled : public Opcode0
{
public:
virtual void execute (Runtime& runtime)
{
runtime.push (runtime.getContext().isDisabled());
}
};
class OpEnableExplicit : public Opcode0
{
public:
virtual void execute (Runtime& runtime)
{
int index = runtime[0];
runtime.pop();
std::string id = runtime.getStringLiteral (index);
runtime.getContext().enable (id);
}
};
class OpDisableExplicit : public Opcode0
{
public:
virtual void execute (Runtime& runtime)
{
int index = runtime[0];
runtime.pop();
std::string id = runtime.getStringLiteral (index);
runtime.getContext().disable (id);
}
};
class OpGetDisabledExplicit : public Opcode0
{
public:
virtual void execute (Runtime& runtime)
{
int index = runtime[0];
runtime.pop();
std::string id = runtime.getStringLiteral (index);
runtime.push (runtime.getContext().isDisabled (id));
}
};
}
#endif

Write Preview
Loading…
Cancel
Save