[Scummvm-cvs-logs] SF.net SVN: scummvm:[55378] scummvm/trunk/engines/mohawk

[fuzzie at users.sourceforge.net]

Revision: 55378
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55378&view=rev
Author:   fuzzie
Date:     2011-01-21 14:17:49 +0000 (Fri, 21 Jan 2011)

Log Message:
-----------
MOHAWK: Implement CSTime big note display.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/cstime_ui.cpp
    scummvm/trunk/engines/mohawk/cstime_ui.h

Modified: scummvm/trunk/engines/mohawk/cstime_ui.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cstime_ui.cpp	2011-01-21 14:15:00 UTC (rev 55377)
+++ scummvm/trunk/engines/mohawk/cstime_ui.cpp	2011-01-21 14:17:49 UTC (rev 55378)
@@ -426,7 +426,7 @@
 	}
 
 	if (_note->getState() == 2) {
-		// TODO: _note->closeNote();
+		_note->closeNote();
 		mouseMove(pos);
 		return;
 	}
@@ -1158,9 +1158,6 @@
 	if (!havePiece(0xffff))
 		return;
 
-	if (_feature)
-		_vm->getView()->removeFeature(_feature, true);
-
 	uint16 id = 100;
 	if (_pieces[2] != 0xffff)
 		id += 5;
@@ -1169,13 +1166,39 @@
 	else
 		id += 2;
 
+	if (_feature)
+		_vm->getView()->removeFeature(_feature, true);
 	_feature = _vm->getView()->installViewFeature(id, kFeatureSortStatic | kFeatureNewNoLoop, NULL);
 }
 
 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) {
 	_state = 0;
 }

Modified: scummvm/trunk/engines/mohawk/cstime_ui.h
===================================================================
--- scummvm/trunk/engines/mohawk/cstime_ui.h	2011-01-21 14:15:00 UTC (rev 55377)
+++ scummvm/trunk/engines/mohawk/cstime_ui.h	2011-01-21 14:17:49 UTC (rev 55378)
@@ -133,6 +133,7 @@
 	void addPiece(uint16 piece, uint16 speech);
 	void drawSmallNote();
 	void drawBigNote();
+	void closeNote();
 
 protected:
 	MohawkEngine_CSTime *_vm;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.