Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #838 from bluegr/chewy
Chewy: Esc from F5. New WIP engine.
- Loading branch information
Showing
25 changed files
with
2,903 additions
and
79 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
/* 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 "common/config-manager.h" | ||
#include "common/error.h" | ||
#include "common/events.h" | ||
#include "common/system.h" | ||
#include "graphics/palette.h" | ||
|
||
#include "engines/engine.h" | ||
#include "engines/util.h" | ||
|
||
#include "chewy/chewy.h" | ||
#include "chewy/console.h" | ||
#include "chewy/cursor.h" | ||
#include "chewy/events.h" | ||
#include "chewy/graphics.h" | ||
#include "chewy/resource.h" | ||
#include "chewy/scene.h" | ||
#include "chewy/sound.h" | ||
#include "chewy/text.h" | ||
|
||
namespace Chewy { | ||
|
||
ChewyEngine::ChewyEngine(OSystem *syst, const ChewyGameDescription *gameDesc) | ||
: Engine(syst), | ||
_gameDescription(gameDesc), | ||
_rnd("chewy") { | ||
|
||
const Common::FSNode gameDataDir(ConfMan.get("path")); | ||
|
||
SearchMan.addSubDirectoryMatching(gameDataDir, "back"); | ||
SearchMan.addSubDirectoryMatching(gameDataDir, "cut"); | ||
SearchMan.addSubDirectoryMatching(gameDataDir, "err"); | ||
SearchMan.addSubDirectoryMatching(gameDataDir, "misc"); | ||
SearchMan.addSubDirectoryMatching(gameDataDir, "room"); | ||
SearchMan.addSubDirectoryMatching(gameDataDir, "sound"); | ||
SearchMan.addSubDirectoryMatching(gameDataDir, "txt"); | ||
} | ||
|
||
ChewyEngine::~ChewyEngine() { | ||
delete _events; | ||
delete _text; | ||
delete _sound; | ||
delete _cursor; | ||
delete _scene; | ||
delete _graphics; | ||
delete _console; | ||
} | ||
|
||
void ChewyEngine::initialize() { | ||
_console = new Console(this); | ||
_cursor = new Cursor(this); | ||
_graphics = new Graphics(this); | ||
_scene = new Scene(this); | ||
_sound = new Sound(_mixer); | ||
_text = new Text(); | ||
_events = new Events(this, _graphics, _console); | ||
|
||
_curCursor = 0; | ||
_elapsedFrames = 0; | ||
_videoNum = -1; | ||
} | ||
|
||
Common::Error ChewyEngine::run() { | ||
// Initialize backend | ||
//initGraphics(640, 480, true); | ||
initGraphics(320, 200, false); | ||
|
||
initialize(); | ||
|
||
/*for (uint i = 0; i < 161; i++) { | ||
debug("Video %d", i); | ||
_graphics->playVideo(i); | ||
}*/ | ||
|
||
//_graphics->playVideo(0); | ||
|
||
_scene->change(0); | ||
//_sound->playSpeech(1); | ||
//_sound->playSound(1); | ||
//_sound->playMusic(2); | ||
|
||
// Run a dummy loop | ||
while (!shouldQuit()) { | ||
_events->processEvents(); | ||
|
||
_console->onFrame(); | ||
|
||
// Cursor animation | ||
if (_elapsedFrames % 30 == 0) | ||
_cursor->animateCursor(); | ||
|
||
if (_videoNum >= 0) { | ||
_graphics->playVideo(_videoNum); | ||
_scene->draw(); | ||
_videoNum = -1; | ||
} | ||
|
||
g_system->updateScreen(); | ||
g_system->delayMillis(10); | ||
|
||
_elapsedFrames++; | ||
} | ||
|
||
return Common::kNoError; | ||
} | ||
|
||
} // End of namespace Chewy |
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,87 @@ | ||
/* 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 CHEWY_CHEWY_H | ||
#define CHEWY_CHEWY_H | ||
|
||
|
||
#include "common/scummsys.h" | ||
#include "common/file.h" | ||
#include "common/util.h" | ||
#include "common/str.h" | ||
#include "common/hashmap.h" | ||
#include "common/hash-str.h" | ||
#include "common/random.h" | ||
|
||
#include "engines/engine.h" | ||
|
||
namespace Chewy { | ||
|
||
struct ChewyGameDescription; | ||
class Console; | ||
class Cursor; | ||
class Events; | ||
class Graphics; | ||
class Scene; | ||
class Sound; | ||
class Text; | ||
|
||
class ChewyEngine : public Engine { | ||
public: | ||
ChewyEngine(OSystem *syst, const ChewyGameDescription *gameDesc); | ||
virtual ~ChewyEngine(); | ||
|
||
int getGameType() const; | ||
uint32 getFeatures() const; | ||
Common::Language getLanguage() const; | ||
Common::Platform getPlatform() const; | ||
|
||
const ChewyGameDescription *_gameDescription; | ||
Common::RandomSource _rnd; | ||
|
||
void setPlayVideo(uint num) { _videoNum = num; } | ||
|
||
Graphics *_graphics; | ||
Cursor *_cursor; | ||
Scene *_scene; | ||
Sound *_sound; | ||
Text *_text; | ||
|
||
protected: | ||
// Engine APIs | ||
virtual Common::Error run(); | ||
virtual bool hasFeature(EngineFeature f) const; | ||
|
||
void initialize(); | ||
void shutdown(); | ||
|
||
Console *_console; | ||
Events *_events; | ||
|
||
uint _curCursor; | ||
uint _elapsedFrames; | ||
int _videoNum; | ||
}; | ||
|
||
} // End of namespace Chewy | ||
|
||
#endif |
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,3 @@ | ||
# This file is included from the main "configure" script | ||
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] | ||
add_engine chewy "Chewy: Esc from F5" no |
Oops, something went wrong.