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

ASYLUM: Implement Scene::playerReaction

Browse source 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@636 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Julien Templier 2010-12-02 19:30:25 +00:00 • committed by Eugene Sandulenko
parent 7877692768
commit 527a517e85
No known key found for this signature in database
GPG key ID: 014D387312D34F08
3 changed files with 69 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/asylum/asylum.cpp
View file

@ -422,6 +422,10 @@ void AsylumEngine::initSinCosTables() {
warning("[AsylumEngine::initSinCosTables] Not implemented!");
}
Common::Point AsylumEngine::getSinCosValues(int32 index1, int32 index2) {
error("[AsylumEngine::getSinCosValues] Not implemented!");
}
void AsylumEngine::setupLoadedGame() {
warning("[AsylumEngine::initSinCosTables] Not implemented!");
}

10
engines/asylum/asylum.h
View file

@ -189,6 +189,16 @@ public:
*/
void updateReverseStereo();
/**
* Gets a sine cosine pair.
*
* @param index1 The first index.
* @param index2 The second index.
*
* @return The sine cosine values.
*/
Common::Point getSinCosValues(int32 index1, int32 index2);
private:
const ADGameDescription *_gameDescription;

57
engines/asylum/views/scene.cpp
View file

@ -1319,7 +1319,7 @@ void Scene::handleHit(int32 index, HitType type) {
if (!getScript()->isInQueue(object->getScriptIndex()))
getScript()->queueScript(object->getScriptIndex(), _playerIndex);
// Original executes special script hit functions, but since there is none, we can skip this part
// Original executes special script hit functions, but since there is none defined, we can skip this part
}
break;
@ -1363,7 +1363,60 @@ void Scene::handleHit(int32 index, HitType type) {
}
void Scene::playerReaction() {
error("[Scene::playerReaction] Not implemented!");
const Common::Point mouse = getCursor()->position();
Common::Point point;
Actor *player = getActor();
player->adjustCoordinates(&point);
uint32 maxIndex = 0;
for (maxIndex = 0; maxIndex < 8; maxIndex++) {
if (!player->getReaction(maxIndex))
break;
}
maxIndex -= 1;
player->setField638(0);
if (maxIndex > 0) {
for (uint32 i = 0; i < maxIndex; i++) {
Common::Point ret = _vm->getSinCosValues(maxIndex, i);
int32 x = point.x + player->getPoint2()->x + ret.x;
int32 y = point.y + player->getPoint2()->y / 2 - ret.y;
if (mouse.x >= x && mouse.x <= (x + 40) && mouse.y >= y && mouse.y <= (y + 40)) {
// Handle reaction
getSound()->playSound(MAKE_RESOURCE(kResourcePackSound, 4));
if (_ws->chapter == kChapter9) {
switch (i) {
default:
player->setField638(player->getReaction(i));
break;
case 0:
getScript()->queueScript(_ws->actions[_ws->getActionAreaIndexById(2206)]->scriptIndex, _playerIndex);
break;
case 1:
getScript()->queueScript(_ws->actions[_ws->getActionAreaIndexById(2207)]->scriptIndex, _playerIndex);
break;
case 2:
getScript()->queueScript(_ws->actions[_ws->getActionAreaIndexById(2208)]->scriptIndex, _playerIndex);
break;
}
} else {
player->setField638(player->getReaction(i));
}
break;
}
}
}
player->updateStatus(kActorStatusEnabled);
getSound()->playSound(MAKE_RESOURCE(kResourcePackSound, 5));
}
void Scene::hitAreaChapter2(int32 id) {