aboutsummaryrefslogtreecommitdiff
path: root/verbs.cpp
diff options
context:
space:
mode:
authorJames Brown2002-02-24 17:25:03 +0000
committerJames Brown2002-02-24 17:25:03 +0000
commitabbc4bf289892ce20a7de1560c171a5822c897e1 (patch)
treec0962bbbbc2279ec71528b8a94afe412e1f1e8bd /verbs.cpp
parentc8522359f5bd376433bf58ead734de43534a109c (diff)
downloadscummvm-rg350-abbc4bf289892ce20a7de1560c171a5822c897e1.tar.gz
scummvm-rg350-abbc4bf289892ce20a7de1560c171a5822c897e1.tar.bz2
scummvm-rg350-abbc4bf289892ce20a7de1560c171a5822c897e1.zip
Code cleanup - get rid of a bunch of typecast and unused variable warnings.
svn-id: r3627
Diffstat (limited to 'verbs.cpp')
-rw-r--r--verbs.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/verbs.cpp b/verbs.cpp
index f25c2b5777..42dc115cf5 100644
--- a/verbs.cpp
+++ b/verbs.cpp
@@ -160,7 +160,6 @@ void Scumm::restoreVerbBG(int verb) {
}
void Scumm::drawVerbBitmap(int vrb, int x, int y) {
- int nozbufs;
VirtScreen *vs;
VerbSlot *vst;
byte twobufs, *imptr;
@@ -186,15 +185,13 @@ void Scumm::drawVerbBitmap(int vrb, int x, int y) {
obim = getResourceAddress(rtVerb, vrb);
if (_features & GF_SMALL_HEADER) {
- ObjectData *od;
- int index, obj;
+ int obj;
obj = READ_LE_UINT16(obim+6);
- size = READ_LE_UINT32(obim);
-
- imgw = (*(obim+size+11)) ;
- imgh = (*(obim+size+17))>>3 ;
- imptr = (obim+8);
+ size = READ_LE_UINT32(obim);
+ imgw = (*(obim+size+11)) ;
+ imgh = (*(obim+size+17))>>3 ;
+ imptr = (obim+8);
} else {
imhd = (ImageHeader*)findResourceData(MKID('IMHD'), obim);
imgw = READ_LE_UINT16(&imhd->width) >> 3;