aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authordhewg2011-03-29 21:55:21 +0200
committerdhewg2011-03-29 21:57:56 +0200
commitd83a83ef5021c1e329127d3c6402088aeb1c1dd1 (patch)
tree5ade1c22a76ed8a10fac3d4c488a9866d649508e /engines/sci
parent8c70f2a58492335e9045c5abfd291887b2d7a339 (diff)
downloadscummvm-rg350-d83a83ef5021c1e329127d3c6402088aeb1c1dd1.tar.gz
scummvm-rg350-d83a83ef5021c1e329127d3c6402088aeb1c1dd1.tar.bz2
scummvm-rg350-d83a83ef5021c1e329127d3c6402088aeb1c1dd1.zip
JANITORIAL: Remove/comment unused vars
Found by GCC 4.6's -Wunused-but-set-variable
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/transitions.cpp4
-rw-r--r--engines/sci/parser/grammar.cpp3
2 files changed, 2 insertions, 5 deletions
diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index fac9a97efe..fb124055d6 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -463,7 +463,6 @@ void GfxTransitions::scrollCopyOldToScreen(Common::Rect screenRect, int16 x, int
// Scroll old screen (up/down/left/right) and insert new screen that way - works
// on _picRect area only.
void GfxTransitions::scroll(int16 number) {
- int16 screenWidth, screenHeight;
int16 stepNr = 0;
Common::Rect oldMoveRect = _picRect;
Common::Rect oldScreenRect = _picRect;
@@ -472,7 +471,6 @@ void GfxTransitions::scroll(int16 number) {
uint32 msecCount = 0;
_screen->copyFromScreen(_oldScreen);
- screenWidth = _screen->getDisplayWidth(); screenHeight = _screen->getDisplayHeight();
switch (number) {
case SCI_TRANSITIONS_SCROLL_LEFT:
@@ -516,7 +514,7 @@ void GfxTransitions::scroll(int16 number) {
newScreenRect.bottom = newScreenRect.top;
newMoveRect.top = newMoveRect.bottom;
while (oldMoveRect.top < oldMoveRect.bottom) {
- oldMoveRect.top++; oldScreenRect.top++;
+ oldMoveRect.top++; oldScreenRect.top++;
newScreenRect.bottom++; newMoveRect.top--;
msecCount += 5;
diff --git a/engines/sci/parser/grammar.cpp b/engines/sci/parser/grammar.cpp
index 8a6cd2dd4d..77db56adba 100644
--- a/engines/sci/parser/grammar.cpp
+++ b/engines/sci/parser/grammar.cpp
@@ -380,7 +380,7 @@ static ParseRuleList *_vocab_clone_rule_list_by_id(ParseRuleList *list, int id)
ParseRuleList *Vocabulary::buildGNF(bool verbose) {
int iterations = 0;
- int last_termrules, termrules = 0;
+ int termrules = 0;
int ntrules_nr;
ParseRuleList *ntlist = NULL;
ParseRuleList *tlist, *new_tlist;
@@ -405,7 +405,6 @@ ParseRuleList *Vocabulary::buildGNF(bool verbose) {
do {
ParseRuleList *new_new_tlist = NULL;
ParseRuleList *ntseeker, *tseeker;
- last_termrules = termrules;
ntseeker = ntlist;
while (ntseeker) {