ACCESS: Fix more gcc compiler warnings

scummvm · Aug 14, 2014 · 79e743b · 79e743b
1 parent d6404a1
commit 79e743b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
@@ -140,7 +140,7 @@ void AmazonEngine::doTitle() {
 	_sound->playSound(1);
 
 	const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 };
-	for (int _pCount = 0; _pCount < 3; ++_pCount) {
+	for (_pCount = 0; _pCount < 3; ++_pCount) {
 		_buffer2.copyFrom(_buffer1);
 		int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4);
 		int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2);

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
@@ -977,7 +977,7 @@ const byte LETTER[] = {
 	0x0, 0x0, 0x0, 0x30, 0x0, 0x5, 0x0, 0xFF, 0xFF
 };
 
-extern const byte *CHARTBL[] = {
+const byte *CHARTBL[] = {
 	ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD, PILOT2, TIKAGENT,
 	BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN,
 	ALLEN, ARCH, GUARD1, MCANOE, CAMPFIRE, COLONEL, SOLDIERS,

diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
@@ -57,9 +57,9 @@ SpriteResource::~SpriteResource() {
 }
 
 SpriteFrame::SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize) {
-	int w = stream.readUint16LE();
-	int h = stream.readUint16LE();
-	create(w, h, Graphics::PixelFormat::createFormatCLUT8());
+	int xSize = stream.readUint16LE();
+	int ySize = stream.readUint16LE();
+	create(xSize, ySize, Graphics::PixelFormat::createFormatCLUT8());
 
 	// Empty surface
 	byte *data = (byte *)getPixels();

diff --git a/engines/access/decompress.h b/engines/access/decompress.h
@@ -1,8 +1,3 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
 /* ScummVM - Graphic Adventure Engine
  *
  * ScummVM is the legal property of its developers, whose names

diff --git a/engines/access/module.mk b/engines/access/module.mk
@@ -17,10 +17,10 @@ MODULE_OBJS := \
 	screen.o \
 	scripts.o \
 	sound.o \
-	amazon\amazon_game.o \
-	amazon\amazon_resources.o \
-	amazon\amazon_room.o \
-	amazon\amazon_scripts.o
+	amazon/amazon_game.o \
+	amazon/amazon_resources.o \
+	amazon/amazon_room.o \
+	amazon/amazon_scripts.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ACCESS), DYNAMIC_PLUGIN)

diff --git a/engines/access/room.cpp b/engines/access/room.cpp
@@ -445,6 +445,6 @@ RoomInfo::RoomInfo(const byte *data) {
 
 		_sounds.push_back(fi);
 	}
-};
+}
 
 } // End of namespace Access