fix some bugs :

- right-clicking on inventory item doesn't execute default action
- unapplied room light level when Joe enters a room
- updated comment in roomDisplay on palette fading problem
- during dialogue, invalid mouse-overs (added enum for joeWalk flag too)

preparing Journal stuff :
- add a (almost useless) useJournal method to Logic
- removed useless code in Graphics, as it should (and could) be easily re-written in a more OO way

svn-id: r11299

1 files changed, 5 insertions, 4 deletions

diff --git a/queen/talk.cpp b/queen/talk.cpp
index 692b5f1c17..f56ae1fe64 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -355,7 +355,7 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) {
 	}
 
 	_talkHead = false;
-	_logic->joeWalk(0);
+	_logic->joeWalk(JWM_NORMAL);
 }
 		
 void Talk::disableSentence(int oldLevel, int selectedSentence) {
@@ -603,6 +603,8 @@ bool Talk::speak(const char *sentence, Person *person, const char *voiceFilePref
 	Person joe_person;
 	ActorData joe_actor;
 
+	_logic->joeWalk(JWM_SPEAK);
+
 	if (!person) {
 		// Fill in values for use by speakSegment() etc.
 		memset(&joe_person, 0, sizeof(Person));
@@ -865,7 +867,7 @@ void Talk::defaultAnimation(
 			else
 				_logic->update();
 
-			if (_logic->joeWalk() == 3) {
+			if (_logic->joeWalk() == JWM_SPEAK) {
 				if (_input->talkQuit())
 					break;
 
@@ -876,8 +878,7 @@ void Talk::defaultAnimation(
 					break;
 
 				_logic->checkPlayer();
-
-				if (_logic->joeWalk() == 2)
+				if (_logic->joeWalk() == JWM_EXECUTE)
 					// Selected a command, so exit
 					break;
 			}