[Scummvm-cvs-logs] SF.net SVN: scummvm:[44853] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 44853
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44853&view=rev
Author:   fingolfin
Date:     2009-10-09 22:21:45 +0000 (Fri, 09 Oct 2009)

Log Message:
-----------
Remove some unused variables

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_lok.cpp
    scummvm/trunk/engines/kyra/text_lok.cpp
    scummvm/trunk/engines/lure/res_struct.cpp
    scummvm/trunk/engines/parallaction/balloons.cpp
    scummvm/trunk/engines/saga/font.cpp
    scummvm/trunk/engines/saga/interface.cpp
    scummvm/trunk/engines/scumm/boxes.cpp
    scummvm/trunk/gui/ThemeEngine.cpp
    scummvm/trunk/sound/mods/tfmx.h

Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp	2009-10-09 22:10:57 UTC (rev 44852)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp	2009-10-09 22:21:45 UTC (rev 44853)
@@ -491,8 +491,6 @@
 }
 
 void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) {
-	Common::Event event;
-
 	uint32 start = _system->getMillis();
 	do {
 		if (update) {

Modified: scummvm/trunk/engines/kyra/text_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lok.cpp	2009-10-09 22:10:57 UTC (rev 44852)
+++ scummvm/trunk/engines/kyra/text_lok.cpp	2009-10-09 22:21:45 UTC (rev 44853)
@@ -37,7 +37,6 @@
 	bool runLoop = true;
 	bool drawText = textEnabled();
 	uint8 currPage;
-	Common::Event event;
 
 	uint32 timeToEnd = strlen(chatStr) * 8 * _tickLength + _system->getMillis();
 

Modified: scummvm/trunk/engines/lure/res_struct.cpp
===================================================================
--- scummvm/trunk/engines/lure/res_struct.cpp	2009-10-09 22:10:57 UTC (rev 44852)
+++ scummvm/trunk/engines/lure/res_struct.cpp	2009-10-09 22:21:45 UTC (rev 44853)
@@ -549,7 +549,6 @@
 
 void HotspotDataList::loadFromStream(ReadStream *stream) {
 	Resources &res = Resources::getReference();
-	iterator i;
 	uint16 hotspotId = stream->readUint16LE();
 	while (hotspotId != 0) {
 		HotspotData *hotspot = res.getHotspot(hotspotId);

Modified: scummvm/trunk/engines/parallaction/balloons.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/balloons.cpp	2009-10-09 22:10:57 UTC (rev 44852)
+++ scummvm/trunk/engines/parallaction/balloons.cpp	2009-10-09 22:21:45 UTC (rev 44853)
@@ -700,8 +700,6 @@
 
 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;

Modified: scummvm/trunk/engines/saga/font.cpp
===================================================================
--- scummvm/trunk/engines/saga/font.cpp	2009-10-09 22:10:57 UTC (rev 44852)
+++ scummvm/trunk/engines/saga/font.cpp	2009-10-09 22:21:45 UTC (rev 44853)
@@ -470,7 +470,6 @@
 	int w_total;
 	int len_total;
 	Common::Point textPoint;
-	Common::Point textPoint2;
 
 	textLength = strlen(text);
 

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2009-10-09 22:10:57 UTC (rev 44852)
+++ scummvm/trunk/engines/saga/interface.cpp	2009-10-09 22:21:45 UTC (rev 44853)
@@ -950,7 +950,6 @@
 	Rect rect2;
 	PanelButton *panelButton;
 	Point textPoint;
-	Point point;
 	Point sliderPoint;
 	int spritenum = 0;
 

Modified: scummvm/trunk/engines/scumm/boxes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/boxes.cpp	2009-10-09 22:10:57 UTC (rev 44852)
+++ scummvm/trunk/engines/scumm/boxes.cpp	2009-10-09 22:21:45 UTC (rev 44853)
@@ -1138,7 +1138,6 @@
 }
 
 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];
 

Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp	2009-10-09 22:10:57 UTC (rev 44852)
+++ scummvm/trunk/gui/ThemeEngine.cpp	2009-10-09 22:21:45 UTC (rev 44853)
@@ -1204,7 +1204,7 @@
 	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);
 	}

Modified: scummvm/trunk/sound/mods/tfmx.h
===================================================================
--- scummvm/trunk/sound/mods/tfmx.h	2009-10-09 22:10:57 UTC (rev 44852)
+++ scummvm/trunk/sound/mods/tfmx.h	2009-10-09 22:21:45 UTC (rev 44853)
@@ -265,7 +265,7 @@
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.