aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/core.h
diff options
context:
space:
mode:
authorPaul Gilbert2011-04-26 09:48:39 +1000
committerPaul Gilbert2011-04-26 09:48:39 +1000
commit42a0ebc5ff2042db92bd4551ef6afaab306ba662 (patch)
tree0f0f781dce64b1da522988559fdb3cb8fbeb6868 /engines/tsage/core.h
parent8fddf47e8ca5991b105d748304b64bf32c81c6de (diff)
downloadscummvm-rg350-42a0ebc5ff2042db92bd4551ef6afaab306ba662.tar.gz
scummvm-rg350-42a0ebc5ff2042db92bd4551ef6afaab306ba662.tar.bz2
scummvm-rg350-42a0ebc5ff2042db92bd4551ef6afaab306ba662.zip
TSAGE: Gave proper names to several previously unnamed fields
Diffstat (limited to 'engines/tsage/core.h')
-rw-r--r--engines/tsage/core.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 4105c27ba4..d72938d489 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -123,7 +123,7 @@ public:
virtual void process(Event &event) {}
virtual void dispatch();
virtual void setAction(Action *action) { setAction(action, NULL); }
- virtual void setAction(Action *action, EventHandler *fmt, ...);
+ virtual void setAction(Action *action, EventHandler *endHandler, ...);
virtual void destroy() {};
};
@@ -133,8 +133,8 @@ public:
int _actionIndex;
int _delayFrames;
uint32 _startFrame;
- int _field16;
- EventHandler *_fmt;
+ bool _attached;
+ EventHandler *_endHandler;
Action();
@@ -143,12 +143,12 @@ public:
virtual void remove();
virtual void process(Event &event);
virtual void dispatch();
- virtual void attached(EventHandler *newOwner, EventHandler *fmt, va_list va);
+ virtual void attached(EventHandler *newOwner, EventHandler *endHandler, va_list va);
- void attach(EventHandler *newOwner, EventHandler *fmt, ...) {
+ void attach(EventHandler *newOwner, EventHandler *endHandler, ...) {
va_list va;
- va_start(va, fmt);
- attached(newOwner, fmt, va);
+ va_start(va, endHandler);
+ attached(newOwner, endHandler, va);
va_end(va);
}
int getActionIndex() const { return _actionIndex; }
@@ -168,7 +168,7 @@ public:
Common::Point _moveSign;
int _minorDiff;
int _majorDiff;
- int _field1A;
+ int _changeCtr;
Action *_action;
SceneObject *_sceneObject;
public:
@@ -253,7 +253,7 @@ public:
class PlayerMover2 : public PlayerMover {
public:
SceneObject *_destObject;
- int _field7E;
+ int _maxArea;
int _minArea;
PlayerMover2() : PlayerMover() { _destObject = NULL; }
@@ -512,7 +512,7 @@ public:
int _regionIndex;
EventHandler *_mover;
Common::Point _moveDiff;
- int _field7A;
+ int _moveRate;
Action *_endAction;
uint32 _regionBitList;
public: