Skip to content

Commit

Permalink
CGE2: Remove unnecessary void parameters in Hero.
Browse files Browse the repository at this point in the history
  • Loading branch information
uruk committed Jun 2, 2014
1 parent 219f4f6 commit 562644d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
20 changes: 10 additions & 10 deletions engines/cge2/hero.cpp
Expand Up @@ -36,7 +36,7 @@ Hero::Hero(CGE2Engine *vm)
_curDim(0), _tracePtr(-1), _ignoreMap(false) {
}

Sprite *Hero::expand(void) { // It's very similar to Sprite's expand, but doesn't bother with "labels" for example. TODO: Try to unify the two later!
Sprite *Hero::expand() { // It's very similar to Sprite's expand, but doesn't bother with "labels" for example. TODO: Try to unify the two later!
if (_ext)
return this;

Expand Down Expand Up @@ -208,7 +208,7 @@ Sprite *Hero::expand(void) { // It's very similar to Sprite's expand, but doesn'
return this;
}

void Hero::setCurrent(void) {
void Hero::setCurrent() {
double m = _vm->_eye->_z / (_pos3D._z - _vm->_eye->_z);
int h = -(V2D::trunc(m * _siz.y));

Expand All @@ -221,16 +221,16 @@ void Hero::setCurrent(void) {
_ext->_shpList = &_dim[_curDim = i];
}

void Hero::hStep(void) {
void Hero::hStep() {
warning("STUB: Hero::hStep()");
}

Sprite *Hero::setContact(void) {
Sprite *Hero::setContact() {
warning("STUB: Hero::setContact()");
return this;
}

void Hero::tick(void) {
void Hero::tick() {
warning("STUB: Hero::tick()");
}

Expand All @@ -248,7 +248,7 @@ void Hero::turn(Dir d) {
warning("STUB: Hero::turn()");
}

void Hero::park(void) {
void Hero::park() {
warning("STUB: Hero::park()");
}

Expand All @@ -261,15 +261,15 @@ void Hero::reach(int mode) {
warning("STUB: Hero::reach()");
}

void Hero::fun(void) {
void Hero::fun() {
warning("STUB: Hero::fun()");
}

void Hero::operator ++ (void) {
void Hero::operator ++ () {
warning("STUB: Hero::operator ++()");
}

void Hero::operator -- (void) {
void Hero::operator -- () {
warning("STUB: Hero::operator --()");
}

Expand All @@ -278,7 +278,7 @@ uint32 Hero::len(V2D v) {
return 0;
}

bool Hero::findWay(void){
bool Hero::findWay(){
warning("STUB: Hero::findWay()");
return false;
}
Expand Down
32 changes: 16 additions & 16 deletions engines/cge2/hero.h
Expand Up @@ -67,37 +67,37 @@ class Hero : public Sprite {
int _maxDist;
bool _ignoreMap;
Hero(CGE2Engine *vm);
void tick(void);
Sprite *expand(void);
Sprite *contract(void) { return this; }
Sprite *setContact(void);
int stepSize(void) { return _ext->_seq[7]._dx; }
void tick();
Sprite *expand();
Sprite *contract() { return this; }
Sprite *setContact();
int stepSize() { return _ext->_seq[7]._dx; }
int distance(V3D pos);
int distance(Sprite * spr);
void turn(Dir d);
void park(void);
void park();
static uint32 len(V2D v);
bool findWay(void);
bool findWay();
static int snap(int p, int q, int grid);
void walkTo(V3D pos);
void walkTo(V2D pos) { walkTo(screenToGround(pos)); }
V3D screenToGround(V2D pos);
void walkTo(Sprite *spr);
void say(void) { step(_sayStart); }
void fun(void);
void resetFun(void) { _funDel = _funDel0; }
void hStep(void);
void say() { step(_sayStart); }
void fun();
void resetFun() { _funDel = _funDel0; }
void hStep();
bool lower(Sprite * spr);
int cross(const V2D &a, const V2D &b);
int mapCross(const V2D &a, const V2D &b);
int mapCross(const V3D &a, const V3D &b);
Hero *other(void) { return _vm->_heroTab[!(_ref & 1)]->_ptr;}
Action action(void) { return (Action)(_ref % 10); }
Hero *other() { return _vm->_heroTab[!(_ref & 1)]->_ptr;}
Action action() { return (Action)(_ref % 10); }
void reach(int mode);
void setCurrent(void);
void setCurrent();
void setCave(int c);
void operator++(void);
void operator--(void);
void operator++();
void operator--();
};

} // End of namespace CGE2
Expand Down

0 comments on commit 562644d

Please sign in to comment.