- enabled speech sounds

- added end of demo check for demo 1.10
- simplified parts loop
- populated strings table in IGOR.TBL
- updated and packed charset data

svn-id: r29641

1 files changed, 8 insertions, 20 deletions

diff --git a/engines/igor/parts/part_21.cpp b/engines/igor/parts/part_21.cpp
index 81f21204af..3b41a73857 100644
--- a/engines/igor/parts/part_21.cpp
+++ b/engines/igor/parts/part_21.cpp
@@ -203,6 +203,9 @@ void IgorEngine::PART_21_ACTION_111() {
 	removeObjectFromInventory(56);
 	_objectsState[65] = 1;
 	PART_21_HELPER_1(255);
+	if (_gameVersion == kIdEngDemo110) {
+		++_demoActionsCounter;
+	}	
 	ADD_DIALOGUE_TEXT(210, 2);
 	SET_DIALOGUE_TEXT(1, 1);
 	startIgorDialogue();
@@ -465,28 +468,13 @@ void IgorEngine::PART_21() {
 		PART_21_HELPER_3();
 	} else if (_currentPart == 212) {
 		PART_21_HELPER_4();
+	}	
+	enterPartLoop();
+	while (_currentPart >= 210 && _currentPart <= 212) {
+		runPartLoop();
 	}
-	showCursor();
-	_gameState.igorMoving = false;
-	while (_currentPart == 210 || _currentPart == 211 || _currentPart == 212) {
-		handleRoomInput();
-		if (compareGameTick(1, 16)) {
-			handleRoomIgorWalk();
-		}
-		if (compareGameTick(19, 32)) {
-			handleRoomDialogue();
-		}
-		if (compareGameTick(4, 8)) {
-			handleRoomInventoryScroll();
-		}
-		if (compareGameTick(1)) {
-			handleRoomLight();
-		}
-		PART_21_UPDATE_ROOM_BACKGROUND();
-		waitForTimer();
-	}
+	leavePartLoop();
 	fadeOutPalette(624);
-	_updateRoomBackground = 0;
 }
 
 } // namespace Igor