Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GOB: Add a controlable Oko to Geisha's Diving minigame
Still missing: - Air, constantly decreasing, fill up with breathing - Health, decreases by collision with evil fish - Death, when health == 0 - Picking up pearls
- Loading branch information
Showing
5 changed files
with
226 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /* ScummVM - Graphic Adventure Engine | ||
| * | ||
| * ScummVM is the legal property of its developers, whose names | ||
| * are too numerous to list here. Please refer to the COPYRIGHT | ||
| * file distributed with this source distribution. | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| * | ||
| */ | ||
|
|
||
| #include "gob/minigames/geisha/oko.h" | ||
|
|
||
| namespace Gob { | ||
|
|
||
| namespace Geisha { | ||
|
|
||
| enum kOkoAnimation { | ||
| kOkoAnimationEnter = 0, | ||
| kOkoAnimationSwim = 1, | ||
| kOkoAnimationSink = 8, | ||
| kOkoAnimationRaise = 7, | ||
| kOkoAnimationBreathe = 2 | ||
| }; | ||
|
|
||
| static const int16 kOkoPositionX = 110; | ||
|
|
||
| static const uint kLevelCount = 3; | ||
| static const int16 kLevelPositionX[kLevelCount] = { 44, 84, 124 }; | ||
|
|
||
|
|
||
| Oko::Oko(const ANIFile &ani) : ANIObject(ani), _state(kStateEnter), _level(0) { | ||
| setAnimation(kOkoAnimationEnter); | ||
| setVisible(true); | ||
| } | ||
|
|
||
| Oko::~Oko() { | ||
| } | ||
|
|
||
| void Oko::advance() { | ||
| bool wasLastFrame = lastFrame(); | ||
|
|
||
| ANIObject::advance(); | ||
|
|
||
| switch (_state) { | ||
| case kStateEnter: | ||
| if (wasLastFrame) { | ||
| setAnimation(kOkoAnimationSwim); | ||
| setPosition(kOkoPositionX, kLevelPositionX[_level]); | ||
| _state = kStateSwim; | ||
| } | ||
| break; | ||
|
|
||
| case kStateSink: | ||
| case kStateRaise: | ||
| case kStateBreathe: | ||
| if (wasLastFrame) { | ||
| setAnimation(kOkoAnimationSwim); | ||
| setPosition(kOkoPositionX, kLevelPositionX[_level]); | ||
| _state = kStateSwim; | ||
| } | ||
| break; | ||
|
|
||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| void Oko::sink() { | ||
| if (_state != kStateSwim) | ||
| return; | ||
|
|
||
| if (_level >= (kLevelCount - 1)) | ||
| return; | ||
|
|
||
| setAnimation(kOkoAnimationSink); | ||
| setPosition(kOkoPositionX, kLevelPositionX[_level]); | ||
| _state = kStateSink; | ||
|
|
||
| _level++; | ||
| } | ||
|
|
||
| void Oko::raise() { | ||
| if (_state != kStateSwim) | ||
| return; | ||
|
|
||
| if (_level == 0) { | ||
| setAnimation(kOkoAnimationBreathe); | ||
| _state = kStateBreathe; | ||
| return; | ||
| } | ||
|
|
||
| setAnimation(kOkoAnimationRaise); | ||
| setPosition(kOkoPositionX, kLevelPositionX[_level]); | ||
| _state = kStateSink; | ||
|
|
||
| _level--; | ||
| } | ||
|
|
||
| Oko::State Oko::getState() const { | ||
| return _state; | ||
| } | ||
|
|
||
| } // End of namespace Geisha | ||
|
|
||
| } // End of namespace Gob |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* ScummVM - Graphic Adventure Engine | ||
| * | ||
| * ScummVM is the legal property of its developers, whose names | ||
| * are too numerous to list here. Please refer to the COPYRIGHT | ||
| * file distributed with this source distribution. | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| * | ||
| */ | ||
|
|
||
| #ifndef GOB_MINIGAMES_GEISHA_OKO_H | ||
| #define GOB_MINIGAMES_GEISHA_OKO_H | ||
|
|
||
| #include "gob/aniobject.h" | ||
|
|
||
| namespace Gob { | ||
|
|
||
| namespace Geisha { | ||
|
|
||
| /** Oko, the person you control, in Geisha's "Diving" minigame. */ | ||
| class Oko : public ANIObject { | ||
| public: | ||
| enum State { | ||
| kStateEnter, | ||
| kStateSwim, | ||
| kStateSink, | ||
| kStateRaise, | ||
| kStateBreathe | ||
| }; | ||
|
|
||
| Oko(const ANIFile &ani); | ||
| ~Oko(); | ||
|
|
||
| /** Advance the animation to the next frame. */ | ||
| void advance(); | ||
|
|
||
| /** Oko should sink a level. */ | ||
| void sink(); | ||
| /** Oko should raise a level. */ | ||
| void raise(); | ||
|
|
||
| State getState() const; | ||
|
|
||
| private: | ||
| State _state; | ||
|
|
||
| uint8 _level; | ||
| }; | ||
|
|
||
| } // End of namespace Geisha | ||
|
|
||
| } // End of namespace Gob | ||
|
|
||
| #endif // GOB_MINIGAMES_GEISHA_OKO_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters