aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/draw_bargon.cpp2
-rw-r--r--engines/gob/expression.h2
-rw-r--r--engines/gob/goblin.cpp18
-rw-r--r--engines/gob/goblin.h30
-rw-r--r--engines/gob/goblin_v1.cpp2
-rw-r--r--engines/gob/goblin_v2.cpp4
-rw-r--r--engines/gob/hotspots.cpp2
-rw-r--r--engines/gob/map.cpp2
-rw-r--r--engines/gob/map.h4
-rw-r--r--engines/gob/map_v1.cpp2
-rw-r--r--engines/gob/mult.cpp8
-rw-r--r--engines/gob/util.cpp16
-rw-r--r--engines/gob/util.h16
13 files changed, 54 insertions, 54 deletions
diff --git a/engines/gob/draw_bargon.cpp b/engines/gob/draw_bargon.cpp
index 80ba7874b8..d335310dcf 100644
--- a/engines/gob/draw_bargon.cpp
+++ b/engines/gob/draw_bargon.cpp
@@ -33,7 +33,7 @@ namespace Gob {
Draw_Bargon::Draw_Bargon(GobEngine *vm) : Draw_v2(vm) {
}
-void Draw_Bargon::initScreen(void) {
+void Draw_Bargon::initScreen() {
_vm->_global->_videoMode = 0x14;
_vm->_video->_surfWidth = 640;
_vm->_video->initPrimary(_vm->_global->_videoMode);
diff --git a/engines/gob/expression.h b/engines/gob/expression.h
index 894704e2a9..2c27ddc8e7 100644
--- a/engines/gob/expression.h
+++ b/engines/gob/expression.h
@@ -116,7 +116,7 @@ public:
void skipExpr(char stopToken);
void printExpr(char stopToken);
- void printVarIndex(void);
+ void printVarIndex();
int16 parseVarIndex(uint16 *size = 0, uint16 *type = 0);
int16 parseValExpr(byte stopToken = 99);
diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp
index 45fb643166..34d03d9e8c 100644
--- a/engines/gob/goblin.cpp
+++ b/engines/gob/goblin.cpp
@@ -168,7 +168,7 @@ int16 Goblin::peekGoblin(Gob_Object *_curGob) {
return index;
}
-void Goblin::initList(void) {
+void Goblin::initList() {
_objList = new Util::List;
_objList->pHead = 0;
_objList->pTail = 0;
@@ -210,7 +210,7 @@ void Goblin::playSound(SoundDesc &snd, int16 repCount, int16 freq) {
}
}
-void Goblin::drawObjects(void) {
+void Goblin::drawObjects() {
Util::ListNode *ptr;
Util::ListNode *ptr2;
@@ -410,7 +410,7 @@ void Goblin::drawObjects(void) {
}
}
-void Goblin::animateObjects(void) {
+void Goblin::animateObjects() {
Util::ListNode *node;
Gob_Object *objDesc;
Scenery::AnimLayer *pLayer;
@@ -730,7 +730,7 @@ void Goblin::adjustDest(int16 posX, int16 posY) {
_pressedMapY = CLIP((int) _pressedMapY, 0, _vm->_map->_mapHeight - 1);
}
-void Goblin::adjustTarget(void) {
+void Goblin::adjustTarget() {
if ((_gobAction == 4) &&
(_vm->_map->getItem(_pressedMapX, _pressedMapY) == 0)) {
@@ -766,7 +766,7 @@ void Goblin::targetDummyItem(Gob_Object *gobDesc) {
}
}
-void Goblin::targetItem(void) {
+void Goblin::targetItem() {
int16 tmpX;
int16 tmpY;
int16 items;
@@ -1162,7 +1162,7 @@ int16 Goblin::doMove(Gob_Object *gobDesc, int16 cont, int16 action) {
return gobIndex;
}
-void Goblin::zeroObjects(void) {
+void Goblin::zeroObjects() {
for (int i = 0; i < 4; i++)
_goblins[i] = 0;
@@ -1173,7 +1173,7 @@ void Goblin::zeroObjects(void) {
_vm->_sound->sampleFree(&_soundData[i]);
}
-void Goblin::freeAllObjects(void) {
+void Goblin::freeAllObjects() {
_vm->_util->deleteList(_objList);
_objList = 0;
freeObjects();
@@ -1262,7 +1262,7 @@ void Goblin::saveGobDataToVars(int16 xPos, int16 yPos, int16 someVal) {
_destItemType = obj->type;
}
-void Goblin::initVarPointers(void) {
+void Goblin::initVarPointers() {
_gobRetVarPtr.set(*_vm->_inter->_variables, 236);
_curGobStateVarPtr.set(*_vm->_inter->_variables, 240);
_curGobFrameVarPtr.set(*_vm->_inter->_variables, 244);
@@ -1316,7 +1316,7 @@ void Goblin::initVarPointers(void) {
_itemInPocketVarPtr = (uint32) -2;
}
-void Goblin::loadGobDataFromVars(void) {
+void Goblin::loadGobDataFromVars() {
Gob_Object *obj;
_itemIndInPocket = (int32) _itemInPocketVarPtr;
diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h
index 565afa1ad8..c2bcaa5752 100644
--- a/engines/gob/goblin.h
+++ b/engines/gob/goblin.h
@@ -198,20 +198,20 @@ public:
// Functions
char rotateState(int16 from, int16 to);
void playSound(SoundDesc &snd, int16 repCount, int16 freq);
- void drawObjects(void);
- void animateObjects(void);
+ void drawObjects();
+ void animateObjects();
int16 getObjMaxFrame(Gob_Object * obj);
bool objIntersected(Gob_Object * obj1, Gob_Object * obj2);
void setMultStates(Gob_Object * gobDesc);
int16 nextLayer(Gob_Object * gobDesc);
void showBoredom(int16 gobIndex);
void switchGoblin(int16 index);
- void zeroObjects(void);
- void freeAllObjects(void);
+ void zeroObjects();
+ void freeAllObjects();
void loadObjects(const char *source);
- void initVarPointers(void);
+ void initVarPointers();
void saveGobDataToVars(int16 xPos, int16 yPos, int16 someVal);
- void loadGobDataFromVars(void);
+ void loadGobDataFromVars();
void pickItem(int16 indexToPocket, int16 idToPocket);
void placeItem(int16 indexInPocket, int16 idInPocket);
void swapItems(int16 indexToPick, int16 idToPick);
@@ -225,10 +225,10 @@ public:
void move(int16 destX, int16 destY, int16 objIndex);
void animate(Mult::Mult_Object *obj);
- virtual void handleGoblins(void) = 0;
+ virtual void handleGoblins() = 0;
virtual void placeObject(Gob_Object * objDesc, char animated,
int16 index, int16 x, int16 y, int16 state) = 0;
- virtual void freeObjects(void) = 0;
+ virtual void freeObjects() = 0;
virtual void initiateMove(Mult::Mult_Object *obj) = 0;
virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
int16 nextAct, int16 framesCount) = 0;
@@ -243,12 +243,12 @@ protected:
GobEngine *_vm;
int16 peekGoblin(Gob_Object *curGob);
- void initList(void);
+ void initList();
void sortByOrder(Util::List *list);
void adjustDest(int16 posX, int16 posY);
- void adjustTarget(void);
+ void adjustTarget();
void targetDummyItem(Gob_Object *gobDesc);
- void targetItem(void);
+ void targetItem();
void moveFindItem(int16 posX, int16 posY);
void moveCheckSelect(int16 framesCount, Gob_Object * gobDesc,
int16 *pGobIndex, int16 *nextAct);
@@ -265,10 +265,10 @@ protected:
class Goblin_v1 : public Goblin {
public:
- virtual void handleGoblins(void) {}
+ virtual void handleGoblins() {}
virtual void placeObject(Gob_Object * objDesc, char animated,
int16 index, int16 x, int16 y, int16 state);
- virtual void freeObjects(void);
+ virtual void freeObjects();
virtual void initiateMove(Mult::Mult_Object *obj);
virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
int16 nextAct, int16 framesCount);
@@ -285,10 +285,10 @@ protected:
class Goblin_v2 : public Goblin_v1 {
public:
- virtual void handleGoblins(void);
+ virtual void handleGoblins();
virtual void placeObject(Gob_Object * objDesc, char animated,
int16 index, int16 x, int16 y, int16 state);
- virtual void freeObjects(void);
+ virtual void freeObjects();
virtual void initiateMove(Mult::Mult_Object *obj);
virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
int16 nextAct, int16 framesCount);
diff --git a/engines/gob/goblin_v1.cpp b/engines/gob/goblin_v1.cpp
index 266e224086..bc0878c426 100644
--- a/engines/gob/goblin_v1.cpp
+++ b/engines/gob/goblin_v1.cpp
@@ -42,7 +42,7 @@ Goblin_v1::Goblin_v1(GobEngine *vm) : Goblin(vm) {
_rotStates[3][0] = 27; _rotStates[3][1] = 25; _rotStates[3][2] = 26; _rotStates[3][3] = 6;
}
-void Goblin_v1::freeObjects(void) {
+void Goblin_v1::freeObjects() {
int16 state;
int16 col;
diff --git a/engines/gob/goblin_v2.cpp b/engines/gob/goblin_v2.cpp
index d763aeb01c..2747750abb 100644
--- a/engines/gob/goblin_v2.cpp
+++ b/engines/gob/goblin_v2.cpp
@@ -45,7 +45,7 @@ Goblin_v2::Goblin_v2(GobEngine *vm) : Goblin_v1(vm) {
_rotStates[3][0] = 23; _rotStates[3][1] = 21; _rotStates[3][2] = 22; _rotStates[3][3] = 6;
}
-void Goblin_v2::freeObjects(void) {
+void Goblin_v2::freeObjects() {
if (_gobsCount < 0)
return;
@@ -463,7 +463,7 @@ void Goblin_v2::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc,
}
}
-void Goblin_v2::handleGoblins(void) {
+void Goblin_v2::handleGoblins() {
Mult::Mult_Object *obj0, *obj1;
Mult::Mult_AnimData *anim0, *anim1;
int16 pass;
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index e0df00fedc..484962b0b3 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -1609,7 +1609,7 @@ int16 Hotspots::findCursor(uint16 x, uint16 y) const {
return cursor;
}
-void Hotspots::oPlaytoons_F_1B(void) {
+void Hotspots::oPlaytoons_F_1B() {
int16 shortId;
int16 longId;
int16 var2;
diff --git a/engines/gob/map.cpp b/engines/gob/map.cpp
index cd90ed87db..9f1f5bdc59 100644
--- a/engines/gob/map.cpp
+++ b/engines/gob/map.cpp
@@ -461,7 +461,7 @@ int16 Map::checkLongPath(int16 x0, int16 y0,
}
}
-void Map::loadMapsInitGobs(void) {
+void Map::loadMapsInitGobs() {
int16 layer;
if (!_loadFromAvo)
diff --git a/engines/gob/map.h b/engines/gob/map.h
index 0c5f97b97a..4a63e84a63 100644
--- a/engines/gob/map.h
+++ b/engines/gob/map.h
@@ -100,7 +100,7 @@ public:
int16 checkLongPath(int16 x0, int16 y0,
int16 x1, int16 y1, int16 i0, int16 i1);
- void loadMapsInitGobs(void);
+ void loadMapsInitGobs();
virtual int16 getItem(int x, int y) = 0;
virtual void setItem(int x, int y, int16 item) = 0;
@@ -166,7 +166,7 @@ public:
virtual ~Map_v1();
protected:
- void init(void);
+ void init();
void loadSounds(Common::SeekableReadStream &data);
void loadGoblins(Common::SeekableReadStream &data, uint32 gobsPos);
void loadObjects(Common::SeekableReadStream &data, uint32 objsPos);
diff --git a/engines/gob/map_v1.cpp b/engines/gob/map_v1.cpp
index dacc72d6c7..d8898c83d3 100644
--- a/engines/gob/map_v1.cpp
+++ b/engines/gob/map_v1.cpp
@@ -40,7 +40,7 @@ Map_v1::Map_v1(GobEngine *vm) : Map(vm) {
Map_v1::~Map_v1() {
}
-void Map_v1::init(void) {
+void Map_v1::init() {
if (_passMap || _itemsMap)
return;
diff --git a/engines/gob/mult.cpp b/engines/gob/mult.cpp
index d383d955c7..883f102ef9 100644
--- a/engines/gob/mult.cpp
+++ b/engines/gob/mult.cpp
@@ -109,7 +109,7 @@ Mult::~Mult() {
delete _multData;
}
-void Mult::initAll(void) {
+void Mult::initAll() {
_objects = 0;
_animSurf.reset();
_renderData = 0;
@@ -117,7 +117,7 @@ void Mult::initAll(void) {
_vm->_scenery->init();
}
-void Mult::freeAll(void) {
+void Mult::freeAll() {
freeMult();
for (int i = 0; i < 10; i++) {
@@ -149,12 +149,12 @@ void Mult::freeMult() {
_vm->_draw->freeSprite(22);
}
-void Mult::checkFreeMult(void) {
+void Mult::checkFreeMult() {
if (_multData)
freeMultKeys();
}
-void Mult::zeroMultData(void) {
+void Mult::zeroMultData() {
_multData = 0;
}
diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp
index aaba222654..6077b1ebb5 100644
--- a/engines/gob/util.cpp
+++ b/engines/gob/util.cpp
@@ -47,7 +47,7 @@ Util::Util(GobEngine *vm) : _vm(vm) {
_startFrameTime = 0;
}
-uint32 Util::getTimeKey(void) {
+uint32 Util::getTimeKey() {
return g_system->getMillis() * _vm->_global->_speedFactor;
}
@@ -83,7 +83,7 @@ void Util::longDelay(uint16 msecs) {
((g_system->getMillis() * _vm->_global->_speedFactor) < time));
}
-void Util::initInput(void) {
+void Util::initInput() {
_mouseButtons = kMouseButtonsNone;
_keyBufferHead = _keyBufferTail = 0;
}
@@ -151,7 +151,7 @@ void Util::processInput(bool scroll) {
}
}
-void Util::clearKeyBuf(void) {
+void Util::clearKeyBuf() {
processInput();
_keyBufferHead = _keyBufferTail = 0;
}
@@ -220,7 +220,7 @@ int16 Util::translateKey(const Common::KeyState &key) {
return 0;
}
-int16 Util::getKey(void) {
+int16 Util::getKey() {
Common::KeyState key;
while (!getKeyFromBuffer(key)) {
@@ -232,7 +232,7 @@ int16 Util::getKey(void) {
return translateKey(key);
}
-int16 Util::checkKey(void) {
+int16 Util::checkKey() {
Common::KeyState key;
getKeyFromBuffer(key);
@@ -266,7 +266,7 @@ void Util::setMousePos(int16 x, int16 y) {
g_system->warpMouse(x, y);
}
-void Util::waitMouseUp(void) {
+void Util::waitMouseUp() {
do {
processInput();
if (_mouseButtons != kMouseButtonsNone)
@@ -274,7 +274,7 @@ void Util::waitMouseUp(void) {
} while (_mouseButtons != kMouseButtonsNone);
}
-void Util::waitMouseDown(void) {
+void Util::waitMouseDown() {
int16 x;
int16 y;
MouseButtons buttons;
@@ -309,7 +309,7 @@ void Util::forceMouseUp(bool onlyWhenSynced) {
_mouseButtons = kMouseButtonsNone;
}
-void Util::clearPalette(void) {
+void Util::clearPalette() {
int16 i;
byte colors[1024];
diff --git a/engines/gob/util.h b/engines/gob/util.h
index ef972eb68c..6968db1a27 100644
--- a/engines/gob/util.h
+++ b/engines/gob/util.h
@@ -91,7 +91,7 @@ public:
List() : pHead(0), pTail(0) {}
};
- uint32 getTimeKey(void);
+ uint32 getTimeKey();
int16 getRandom(int16 max);
void beep(int16 freq);
@@ -100,21 +100,21 @@ public:
void delay(uint16 msecs);
void longDelay(uint16 msecs);
- void initInput(void);
+ void initInput();
void processInput(bool scroll = false);
- void clearKeyBuf(void);
- int16 getKey(void);
- int16 checkKey(void);
+ void clearKeyBuf();
+ int16 getKey();
+ int16 checkKey();
bool checkKey(int16 &key);
void getMouseState(int16 *pX, int16 *pY, MouseButtons *pButtons);
void setMousePos(int16 x, int16 y);
- void waitMouseUp(void);
- void waitMouseDown(void);
+ void waitMouseUp();
+ void waitMouseDown();
void waitMouseRelease(char drawMouse);
void forceMouseUp(bool onlyWhenSynced = false);
- void clearPalette(void);
+ void clearPalette();
int16 getFrameRate();
void setFrameRate(int16 rate);
void notifyNewAnim();
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 07:45:00 +0000