From 80dfce00a599824a257d32de99c0b0633a6827bb Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Sun, 10 Dec 2006 00:41:45 +0000
Subject: cleanup (added a few more constants, renamed some opcodes) and
 reverted my previous change to op_sleep.

svn-id: r24830
---
 engines/touche/touche.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'engines/touche/touche.h')

diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index 7199cfaab5..e36b455a40 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -317,7 +317,12 @@ enum {
 	kScreenWidth = 640,
 	kScreenHeight = 400,
 	kRoomHeight = 352,
-	kStartupEpisode = 90
+	kStartupEpisode = 90,
+	kCycleDelay = 1000 / (1193180 / 32768),
+	kIconWidth = 58,
+	kIconHeight = 42,
+	kCursorWidth = 58,
+	kCursorHeight = 42
 };
 
 class MidiPlayer;
@@ -555,14 +560,14 @@ protected:
 	void op_setKeyCharTextColor();
 	void op_startMusic();
 	void op_sleep();
-	void op_delay();
+	void op_setKeyCharDelay();
 	void op_lockHitBox();
 	void op_removeItemFromInventory();
 	void op_unlockHitBox();
 	void op_addRoomArea();
 	void op_setKeyCharFlags();
 	void op_unsetKeyCharFlags();
-	void op_loadVoice();
+	void op_loadSpeechSegment();
 	void op_drawSpriteOnBackdrop();
 	void op_startPaletteFadeIn();
 	void op_startPaletteFadeOut();
@@ -614,8 +619,6 @@ protected:
 	int _disabledInputCounter;
 	bool _hideInventoryTexts;
 
-	int _sleepCycles;
-
 	bool _displayQuitDialog;
 	int _saveLoadCurrentPage;
 	int _saveLoadCurrentSlot;
-- 
cgit v1.2.3