thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASYLUM: Added a back buffer again. The icons in the top row should be highlighted properly now

Browse source 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@64 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Filippos Karapetis 2009-06-12 20:38:38 +00:00 • committed by Eugene Sandulenko
parent f6ab0ab24f
commit ce37ad7248
No known key found for this signature in database
GPG key ID: 014D387312D34F08
3 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
engines/asylum/asylum.cpp
View file

@ -45,6 +45,7 @@ AsylumEngine::AsylumEngine(OSystem *system, Common::Language language)
AsylumEngine::~AsylumEngine() {
//Common::clearAllDebugChannels();
delete _resMgr;
_backBuffer.free();
}
Common::Error AsylumEngine::run() {
@ -60,6 +61,8 @@ Common::Error AsylumEngine::init() {
// initialize engine objects
initGraphics(640, 480, true);
_backBuffer.create(640, 480, 1);
_resMgr = new ResourceManager(this);
// initializing game
@ -76,6 +79,7 @@ Common::Error AsylumEngine::init() {
Common::Error AsylumEngine::go() {
// Play intro movie
int mouseX = 0, mouseY = 0;
_resMgr->loadVideo(0);
@ -90,6 +94,8 @@ Common::Error AsylumEngine::go() {
while (!shouldQuit()) {
Common::Event ev;
// Copy background image
_system->copyRectToScreen((byte *)_backBuffer.pixels, _backBuffer.w, 0, 0, _backBuffer.w, _backBuffer.h);
if (em->pollEvent(ev)) {
if (ev.type == Common::EVENT_KEYDOWN) {
@ -101,18 +107,21 @@ Common::Error AsylumEngine::go() {
}
//if (ev.kbd.keycode == Common::KEYCODE_RETURN)
} else if (ev.type == Common::EVENT_MOUSEMOVE) {
mouseX = ev.mouse.x;
mouseY = ev.mouse.y;
}
}
// TODO: Just some proof-of concept to change icons here for now
if (ev.mouse.y >= 20 && ev.mouse.y <= 20 + 48) {
if (mouseY >= 20 && mouseY <= 20 + 48) {
for (int i = 0; i <= 5; i++) {
int curX = 40 + i * 100;
if (ev.mouse.x >= curX && ev.mouse.x <= curX + 55) {
if (mouseX >= curX && mouseX <= curX + 55) {
GraphicResource *res = _resMgr->getGraphic(1, i + 4, 0);
_system->copyRectToScreen(res->data, res->width, curX, 20, res->width, res->height);
}
}
}
}
}
_system->updateScreen();
_system->delayMillis(10);
@ -129,4 +138,14 @@ void AsylumEngine::showMainMenu() {
_resMgr->loadMusic();
}
void AsylumEngine::copyToBackBuffer(int x, int y, int width, int height, byte *buffer) {
int h = height;
byte *dest = (byte *)_backBuffer.pixels;
while (h--) {
memcpy(dest, buffer, width);
dest += 640;
buffer += width;
}
}
} // namespace Asylum

4
engines/asylum/asylum.h
View file

@ -28,6 +28,7 @@
#include "engines/engine.h"
#include "asylum/resman.h"
#include "graphics/surface.h"
namespace Asylum {
@ -47,11 +48,14 @@ public:
virtual Common::Error run();
virtual bool hasFeature(EngineFeature f) const;
void copyToBackBuffer(int x, int y, int width, int height, byte *buffer);
private:
Common::Language _language;
Common::RandomSource _rnd;
ResourceManager *_resMgr;
Graphics::Surface _backBuffer;
void showMainMenu();

2
engines/asylum/resman.cpp
View file

@ -47,7 +47,7 @@ bool ResourceManager::loadVideo(uint8 fileNum) {
bool ResourceManager::loadGraphic(uint8 fileNum, uint32 offset, uint32 index) {
GraphicResource *res = getGraphic(fileNum, offset, index);
_vm->_system->copyRectToScreen(res->data, res->width, 0, 0, res->width, res->height);
_vm->copyToBackBuffer(0, 0, res->width, res->height, res->data);
// TODO proper error check
return true;