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

MOHAWK: Implement CSTime big note display.

Browse source 
svn-id: r55378
This commit is contained in:
Alyssa Milburn 2011-01-21 14:17:49 +00:00
parent 678b5f361a
commit 58c7e66800
2 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

33
engines/mohawk/cstime_ui.cpp
View file

@ -426,7 +426,7 @@ void CSTimeInterface::mouseUp(Common::Point pos) {
} }
if (_note->getState() == 2) { if (_note->getState() == 2) {
// TODO: _note->closeNote(); _note->closeNote();
mouseMove(pos); mouseMove(pos);
return; return;
} }
@ -1158,9 +1158,6 @@ void CSTimeCarmenNote::drawSmallNote() {
if (!havePiece(0xffff)) if (!havePiece(0xffff))
return; return;
if (_feature)
_vm->getView()->removeFeature(_feature, true);
uint16 id = 100; uint16 id = 100;
if (_pieces[2] != 0xffff) if (_pieces[2] != 0xffff)
id += 5; id += 5;
@ -1169,11 +1166,37 @@ void CSTimeCarmenNote::drawSmallNote() {
else else
id += 2; id += 2;
if (_feature)
_vm->getView()->removeFeature(_feature, true);
_feature = _vm->getView()->installViewFeature(id, kFeatureSortStatic | kFeatureNewNoLoop, NULL); _feature = _vm->getView()->installViewFeature(id, kFeatureSortStatic | kFeatureNewNoLoop, NULL);
} }
void CSTimeCarmenNote::drawBigNote() { void CSTimeCarmenNote::drawBigNote() {
// FIXME if (_vm->getCase()->getCurrConversation()->getState() != (uint)~0) {
_vm->getCase()->getCurrConversation()->end(false);
} else if (_vm->getInterface()->getHelp()->getState() != (uint)~0) {
_vm->getInterface()->getHelp()->end();
}
// TODO: kill symbols too
uint16 id = 100;
if (_pieces[2] != 0xffff)
id += 9;
else if (_pieces[1] != 0xffff)
id += 8;
else
id += 6;
if (_feature)
_vm->getView()->removeFeature(_feature, true);
_feature = _vm->getView()->installViewFeature(id, kFeatureSortStatic | kFeatureNewNoLoop, NULL);
// FIXME: attach note drawing proc
_state = 2;
}
void CSTimeCarmenNote::closeNote() {
_state = 0;
drawSmallNote();
} }
CSTimeOptions::CSTimeOptions(MohawkEngine_CSTime *vm) : _vm(vm) { CSTimeOptions::CSTimeOptions(MohawkEngine_CSTime *vm) : _vm(vm) {

1
engines/mohawk/cstime_ui.h
View file

@ -133,6 +133,7 @@ public:
void addPiece(uint16 piece, uint16 speech); void addPiece(uint16 piece, uint16 speech);
void drawSmallNote(); void drawSmallNote();
void drawBigNote(); void drawBigNote();
void closeNote();
protected: protected:
MohawkEngine_CSTime *_vm; MohawkEngine_CSTime *_vm;