[Scummvm-cvs-logs] SF.net SVN: scummvm:[39389] scummvm/trunk/engines/made
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat Mar 14 13:23:35 CET 2009
Revision: 39389
http://scummvm.svn.sourceforge.net/scummvm/?rev=39389&view=rev
Author: thebluegr
Date: 2009-03-14 12:23:35 +0000 (Sat, 14 Mar 2009)
Log Message:
-----------
Pushed up the simple script stack function in the header file (this helps isolate them too, so that script.cpp only contains script command functions now)
Modified Paths:
--------------
scummvm/trunk/engines/made/script.cpp
scummvm/trunk/engines/made/script.h
Modified: scummvm/trunk/engines/made/script.cpp
===================================================================
--- scummvm/trunk/engines/made/script.cpp 2009-03-14 11:26:46 UTC (rev 39388)
+++ scummvm/trunk/engines/made/script.cpp 2009-03-14 12:23:35 UTC (rev 39389)
@@ -34,61 +34,6 @@
namespace Made {
-/* ScriptStack */
-
-ScriptStack::ScriptStack() {
- for (int16 i = 0; i < kScriptStackSize; i++)
- _stack[i] = 0;
- _stackPos = kScriptStackSize;
-}
-
-ScriptStack::~ScriptStack() {
-}
-
-inline int16 ScriptStack::top() {
- return _stack[_stackPos];
-}
-
-inline int16 ScriptStack::pop() {
- if (_stackPos == kScriptStackSize)
- error("ScriptStack::pop() Stack underflow");
- return _stack[_stackPos++];
-}
-
-inline void ScriptStack::push(int16 value) {
- if (_stackPos == 0)
- error("ScriptStack::push() Stack overflow");
- _stack[--_stackPos] = value;
-}
-
-inline void ScriptStack::setTop(int16 value) {
- _stack[_stackPos] = value;
-}
-
-inline int16 ScriptStack::peek(int16 index) {
- return _stack[index];
-}
-
-inline void ScriptStack::poke(int16 index, int16 value) {
- _stack[index] = value;
-}
-
-inline void ScriptStack::alloc(int16 count) {
- _stackPos -= count;
-}
-
-inline void ScriptStack::free(int16 count) {
- _stackPos += count;
-}
-
-inline void ScriptStack::setStackPos(int16 stackPtr) {
- _stackPos = stackPtr;
-}
-
-inline int16 *ScriptStack::getStackPtr() {
- return &_stack[_stackPos];
-}
-
/* ScriptInterpreter */
ScriptInterpreter::ScriptInterpreter(MadeEngine *vm) : _vm(vm) {
Modified: scummvm/trunk/engines/made/script.h
===================================================================
--- scummvm/trunk/engines/made/script.h 2009-03-14 11:26:46 UTC (rev 39388)
+++ scummvm/trunk/engines/made/script.h 2009-03-14 12:23:35 UTC (rev 39389)
@@ -45,19 +45,31 @@
class ScriptStack {
public:
- ScriptStack();
- ~ScriptStack();
- int16 top();
- int16 pop();
- void push(int16 value = 0);
- void setTop(int16 value);
- int16 peek(int16 index);
- void poke(int16 index, int16 value);
- void alloc(int16 count);
- void free(int16 count);
- int16 getStackPos() const { return _stackPos; }
- void setStackPos(int16 stackPtr);
- int16 *getStackPtr();
+ ScriptStack() {
+ for (int16 i = 0; i < kScriptStackSize; i++)
+ _stack[i] = 0;
+ _stackPos = kScriptStackSize;
+ }
+ ~ScriptStack() {}
+ inline int16 top() { return _stack[_stackPos]; }
+ inline int16 pop() {
+ if (_stackPos == kScriptStackSize)
+ error("ScriptStack::pop() Stack underflow");
+ return _stack[_stackPos++];
+ }
+ inline void push(int16 value = 0) {
+ if (_stackPos == 0)
+ error("ScriptStack::push() Stack overflow");
+ _stack[--_stackPos] = value;
+ }
+ inline void setTop(int16 value) { _stack[_stackPos] = value; }
+ inline int16 peek(int16 index) { return _stack[index]; }
+ inline void poke(int16 index, int16 value) { _stack[index] = value; }
+ inline void alloc(int16 count) { _stackPos -= count; }
+ inline void free(int16 count) { _stackPos += count; }
+ inline int16 getStackPos() const { return _stackPos; }
+ inline void setStackPos(int16 stackPtr) { _stackPos = stackPtr; }
+ inline int16 *getStackPtr() { return &_stack[_stackPos]; }
protected:
int16 _stack[kScriptStackSize];
int16 _stackPos;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list