aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorMax Horn2003-10-07 09:34:19 +0000
committerMax Horn2003-10-07 09:34:19 +0000
commit2485f15e343e67b2c385a1249c7cebf8d2a360b4 (patch)
tree6596eb4a4553c56346ba10224791461ea2df2c7b /queen
parente7abb0363d57cacd17cb709424f17139d790ddaf (diff)
downloadscummvm-rg350-2485f15e343e67b2c385a1249c7cebf8d2a360b4.tar.gz
scummvm-rg350-2485f15e343e67b2c385a1249c7cebf8d2a360b4.tar.bz2
scummvm-rg350-2485f15e343e67b2c385a1249c7cebf8d2a360b4.zip
fixed warnings
svn-id: r10663
Diffstat (limited to 'queen')
-rw-r--r--queen/talk.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp
index 25be358d6c..a3b4d87635 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -97,7 +97,7 @@ void Talk::talk(const char *filename, char *cutawayFilename) {
// Lines 906-? in talk.c
// XXX drawmouseflag=1;
- int16 level=1, retval=0, type=1;
+ int16 level=1, retval=0;
int16 head = _dialogueTree[level][0].head;
// TODO: split this loop in several functions
@@ -309,20 +309,20 @@ void Talk::load(const char *filename) {
_uniqueKey = (int16)READ_BE_UINT16(ptr); ptr += 2;
_talkKey = (int16)READ_BE_UINT16(ptr); ptr += 2;
- int16 jMax = (int16)READ_BE_UINT16(ptr); ptr += 2;
+ /*int16 jMax =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
_pMax = (int16)READ_BE_UINT16(ptr); ptr += 2;
- int16 gameState1 = (int16)READ_BE_UINT16(ptr); ptr += 2;
- int16 testValue1 = (int16)READ_BE_UINT16(ptr); ptr += 2;
- int16 itemToInsert1 = (int16)READ_BE_UINT16(ptr); ptr += 2;
- int16 gameState2 = (int16)READ_BE_UINT16(ptr); ptr += 2;
- int16 testValue2 = (int16)READ_BE_UINT16(ptr); ptr += 2;
- int16 itemToInsert2 = (int16)READ_BE_UINT16(ptr); ptr += 2;
+ /*int16 gameState1 =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+ /*int16 testValue1 =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+ /*int16 itemToInsert1 =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+ /*int16 gameState2 =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+ /*int16 testValue2 =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
+ /*int16 itemToInsert2 =*/ (int16)READ_BE_UINT16(ptr); ptr += 2;
//debug(0, "uniqueKey = %i", _uniqueKey);
//debug(0, "talkKey = %i", _talkKey);
_person1Ptr = _fileData + READ_BE_UINT16(ptr); ptr += 2;
- byte *cutawayPtr = _fileData + READ_BE_UINT16(ptr); ptr += 2;
+ /*byte *cutawayPtr =*/ _fileData + READ_BE_UINT16(ptr); ptr += 2;
_person2Ptr = _fileData + READ_BE_UINT16(ptr); ptr += 2;
if (ptr != (_fileData + 28))