libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACCESS: Fix more gcc compiler warnings

Browse Source
This commit is contained in:
Paul Gilbert 2014-08-13 22:54:04 -04:00
parent d6404a10ad
commit 79e743ba82
6 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/access/amazon/amazon_game.cpp
View File

@ -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);

2
engines/access/amazon/amazon_resources.cpp
View File

@ -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,

6
engines/access/asurface.cpp
View File

@ -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();

5
engines/access/decompress.h
View File

@ -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

8
engines/access/module.mk
View File

@ -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)

2
engines/access/room.cpp
View File

@ -445,6 +445,6 @@ RoomInfo::RoomInfo(const byte *data) {
_sounds.push_back(fi);
}
};
}
} // End of namespace Access