aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2009-10-09 22:21:45 +0000
committerMax Horn2009-10-09 22:21:45 +0000
commitd0876b06ed71979ee8f1370e738b5d4d7ba89d75 (patch)
tree16c59343bf39790540bfcdc76b99e4aff043335e
parent99111f0ffd9038e23b16114daed582d8b64a30a7 (diff)
downloadscummvm-rg350-d0876b06ed71979ee8f1370e738b5d4d7ba89d75.tar.gz
scummvm-rg350-d0876b06ed71979ee8f1370e738b5d4d7ba89d75.tar.bz2
scummvm-rg350-d0876b06ed71979ee8f1370e738b5d4d7ba89d75.zip
Remove some unused variables
svn-id: r44853
-rw-r--r--engines/kyra/kyra_lok.cpp2
-rw-r--r--engines/kyra/text_lok.cpp1
-rw-r--r--engines/lure/res_struct.cpp1
-rw-r--r--engines/parallaction/balloons.cpp2
-rw-r--r--engines/saga/font.cpp1
-rw-r--r--engines/saga/interface.cpp1
-rw-r--r--engines/scumm/boxes.cpp1
-rw-r--r--gui/ThemeEngine.cpp2
-rw-r--r--sound/mods/tfmx.h2
9 files changed, 2 insertions, 11 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 26c5876844..330ef4ac2a 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -491,8 +491,6 @@ void KyraEngine_LoK::delayUntil(uint32 timestamp, bool updateTimers, bool update
}
void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) {
- Common::Event event;
-
uint32 start = _system->getMillis();
do {
if (update) {
diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp
index 93a16d9a1e..266553cdea 100644
--- a/engines/kyra/text_lok.cpp
+++ b/engines/kyra/text_lok.cpp
@@ -37,7 +37,6 @@ void KyraEngine_LoK::waitForChatToFinish(int vocFile, int16 chatDuration, const
bool runLoop = true;
bool drawText = textEnabled();
uint8 currPage;
- Common::Event event;
uint32 timeToEnd = strlen(chatStr) * 8 * _tickLength + _system->getMillis();
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index 2515d8dc60..e86a95198a 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -549,7 +549,6 @@ void HotspotDataList::saveToStream(WriteStream *stream) {
void HotspotDataList::loadFromStream(ReadStream *stream) {
Resources &res = Resources::getReference();
- iterator i;
uint16 hotspotId = stream->readUint16LE();
while (hotspotId != 0) {
HotspotData *hotspot = res.getHotspot(hotspotId);
diff --git a/engines/parallaction/balloons.cpp b/engines/parallaction/balloons.cpp
index 558d02341e..bb6e10572b 100644
--- a/engines/parallaction/balloons.cpp
+++ b/engines/parallaction/balloons.cpp
@@ -700,8 +700,6 @@ int BalloonManager_br::setLocationBalloon(const char *text, bool endGame) {
int BalloonManager_br::hitTestDialogueBalloon(int x, int y) {
- Common::Point p;
-
for (uint i = 0; i < _numBalloons; i++) {
if (_intBalloons[i].box.contains(x, y)) {
return i;
diff --git a/engines/saga/font.cpp b/engines/saga/font.cpp
index 8b9b45d3ff..d9634fc8cd 100644
--- a/engines/saga/font.cpp
+++ b/engines/saga/font.cpp
@@ -470,7 +470,6 @@ int Font::getHeight(FontId fontId, const char *text, int width, FontEffectFlags
int w_total;
int len_total;
Common::Point textPoint;
- Common::Point textPoint2;
textLength = strlen(text);
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index e6755c6dc0..cae159049b 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -950,7 +950,6 @@ void Interface::drawOption() {
Rect rect2;
PanelButton *panelButton;
Point textPoint;
- Point point;
Point sliderPoint;
int spritenum = 0;
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index d480209501..8ad87f3746 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -1138,7 +1138,6 @@ bool ScummEngine::areBoxesNeighbours(int box1nr, int box2nr) {
}
void Actor_v3::findPathTowardsOld(byte box1, byte box2, byte finalBox, Common::Point &p2, Common::Point &p3) {
- Common::Point pt;
Common::Point gateA[2];
Common::Point gateB[2];
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 9d0cceb222..cb0ba6416d 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1204,7 +1204,7 @@ void ThemeEngine::renderDirtyScreen() {
if (_dirtyScreen.empty())
return;
- Common::List<Common::Rect>::iterator i, j;
+ Common::List<Common::Rect>::iterator i;
for (i = _dirtyScreen.begin(); i != _dirtyScreen.end(); ++i) {
_vectorRenderer->copyFrame(_system, *i);
}
diff --git a/sound/mods/tfmx.h b/sound/mods/tfmx.h
index 8b66ea83fe..bd310b65c9 100644
--- a/sound/mods/tfmx.h
+++ b/sound/mods/tfmx.h
@@ -265,7 +265,7 @@ private:
static inline void unlockMacroChannel(ChannelContext &channel);
static inline void initPattern(PatternContext &pattern, uint8 cmd, int8 expose, uint32 offset);
void stopSongImpl(bool stopAudio = true);
- static void inline setNoteMacro(ChannelContext &channel, uint note, int fineTune);
+ static inline void setNoteMacro(ChannelContext &channel, uint note, int fineTune);
void initFadeCommand(const uint8 fadeTempo, const int8 endVol);
void setModuleData(const MdatResource *resource, const int8 *sampleData, uint32 sampleLen, bool autoDelete = true);
static const MdatResource *loadMdatFile(Common::SeekableReadStream &musicData);