thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some more warnings observed on buildbot

Browse source 
svn-id: r42010
This commit is contained in:
Max Horn 2009-07-01 20:51:34 +00:00
parent a6b57dc3a9
commit c4f6295330
10 changed files with 55 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/agos/agos.h
View file

@ -615,8 +615,8 @@ protected:
void paletteFadeOut(byte *palPtr, uint num, uint size); void paletteFadeOut(byte *palPtr, uint num, uint size);
byte *allocateItem(uint size); void *allocateItem(uint size);
byte *allocateTable(uint size); void *allocateTable(uint size);
void alignTableMem(); void alignTableMem();
Child *findChildOfType(Item *i, uint child); Child *findChildOfType(Item *i, uint child);

39
engines/agos/feeble.cpp
View file

@ -161,21 +161,16 @@ void AGOSEngine_FeebleDemo::exitMenu() {
playVideo("fbye1.smk", true); playVideo("fbye1.smk", true);
HitArea *ha; HitArea *ha;
while (!shouldQuit()) { do {
_lastHitArea = NULL; _lastHitArea = NULL;
_lastHitArea3 = NULL; _lastHitArea3 = NULL;
while (!shouldQuit()) { while (!shouldQuit() && _lastHitArea3 == 0) {
if (_lastHitArea3 != 0)
break;
delay(1); delay(1);
} }
ha = _lastHitArea; ha = _lastHitArea;
} while (!shouldQuit() && !(ha != NULL && ha->id == 21));
if (ha != NULL && ha->id == 21)
break;
}
playVideo("fbye2.smk"); playVideo("fbye2.smk");
quitGame(); quitGame();
@ -202,9 +197,7 @@ void AGOSEngine_FeebleDemo::filmMenu() {
_lastHitArea = NULL; _lastHitArea = NULL;
_lastHitArea3 = NULL; _lastHitArea3 = NULL;
while (!shouldQuit()) { while (!shouldQuit() && _lastHitArea3 == 0) {
if (_lastHitArea3 != 0)
break;
handleWobble(); handleWobble();
delay(1); delay(1);
} }
@ -287,25 +280,23 @@ void AGOSEngine_FeebleDemo::mainMenu() {
startInteractiveVideo("mainmenu.smk"); startInteractiveVideo("mainmenu.smk");
HitArea *ha; HitArea *ha = 0;
while (!shouldQuit()) { do {
_lastHitArea = NULL; _lastHitArea = NULL;
_lastHitArea3 = NULL; _lastHitArea3 = NULL;
while (!shouldQuit()) { while (_lastHitArea3 == 0) {
if (_lastHitArea3 != 0) if (shouldQuit())
break; return;
handleText(); handleText();
delay(1); delay(1);
} }
ha = _lastHitArea; ha = _lastHitArea;
} while (ha == NULL || !(ha->id >= 1 && ha->id <= 6));
if (ha == NULL) { if (shouldQuit())
} else if (ha->id >= 1 && ha->id <= 6) { return;
break;
}
}
stopInteractiveVideo(); stopInteractiveVideo();
@ -384,11 +375,9 @@ void AGOSEngine_FeebleDemo::waitForSpace() {
windowPutChar(_textWindow, *message); windowPutChar(_textWindow, *message);
mouseOff(); mouseOff();
while (!shouldQuit()) { do {
delay(1); delay(1);
if (_keyPressed.keycode == Common::KEYCODE_SPACE) } while (!shouldQuit() && (_keyPressed.keycode != Common::KEYCODE_SPACE));
break;
}
_keyPressed.reset(); _keyPressed.reset();
mouseOn(); mouseOn();
} }

2
engines/agos/items.cpp
View file

@ -41,7 +41,7 @@ Child *AGOSEngine::allocateChildBlock(Item *i, uint type, uint size) {
return child; return child;
} }
byte *AGOSEngine::allocateItem(uint size) { void *AGOSEngine::allocateItem(uint size) {
byte *item = new byte[size]; byte *item = new byte[size];
memset(item, 0, size); memset(item, 0, size);

2
engines/agos/subroutine.cpp
View file

@ -226,7 +226,7 @@ void AGOSEngine::alignTableMem() {
} }
} }
byte *AGOSEngine::allocateTable(uint size) { void *AGOSEngine::allocateTable(uint size) {
byte *org = _tablesHeapPtr; byte *org = _tablesHeapPtr;
size = (size + 1) & ~1; size = (size + 1) & ~1;

4
engines/queen/command.cpp
View file

@ -123,7 +123,7 @@ public:
virtual void displayTemp(InkColor color, const char *name, bool outlined) { virtual void displayTemp(InkColor color, const char *name, bool outlined) {
char temp[MAX_COMMAND_LEN]; char temp[MAX_COMMAND_LEN];
// don't show a space after the goto and give commands in the Greek version // don't show a space after the goto and give commands in the Greek version
if (_command[1] != -34 && !(_command[1] == -2 && strlen(_command) > 5)) if (_command[1] != (char)-34 && !(_command[1] == (char)-2 && strlen(_command) > 5))
sprintf(temp, "%s %s", _command, name); sprintf(temp, "%s %s", _command, name);
else else
sprintf(temp, "%s%s", _command, name); sprintf(temp, "%s%s", _command, name);
@ -132,7 +132,7 @@ public:
virtual void addObject(const char *objName) { virtual void addObject(const char *objName) {
// don't show a space after the goto and give commands in the Greek version // don't show a space after the goto and give commands in the Greek version
if (_command[1] != -34 && !(_command[1] == -2 && strlen(_command) > 5)) if (_command[1] != (char)-34 && !(_command[1] == (char)-2 && strlen(_command) > 5))
strcat(_command, " "); strcat(_command, " ");
strcat(_command, objName); strcat(_command, objName);
} }

2
engines/sci/resource.cpp
View file

@ -711,7 +711,7 @@ void ResourceManager::unlockResource(Resource *res) {
int ResourceManager::detectMapVersion() { int ResourceManager::detectMapVersion() {
Common::File file; Common::File file;
byte buff[6]; byte buff[6];
ResourceSource *rsrc; ResourceSource *rsrc= 0;
for (Common::List<ResourceSource *>::iterator it = _sources.begin(); it != _sources.end(); ++it) { for (Common::List<ResourceSource *>::iterator it = _sources.begin(); it != _sources.end(); ++it) {
rsrc = *it; rsrc = *it;

2
engines/sci/sfx/core.cpp
View file

@ -1130,7 +1130,7 @@ static byte* readSOLAudio(Common::SeekableReadStream *audioStream, uint32 &size,
Audio::AudioStream* SfxState::getAudioStream(uint32 number, uint32 volume, int *sampleLen) { Audio::AudioStream* SfxState::getAudioStream(uint32 number, uint32 volume, int *sampleLen) {
Audio::AudioStream *audioStream = 0; Audio::AudioStream *audioStream = 0;
uint32 size; uint32 size = 0;
byte *data = 0; byte *data = 0;
byte flags = 0; byte flags = 0;
Sci::Resource* audioRes; Sci::Resource* audioRes;

5
engines/scumm/object.cpp
View file

@ -1816,9 +1816,8 @@ void ScummEngine::loadFlObject(uint object, uint room) {
assert(flob); assert(flob);
// Copy object code + object image to floating object // Copy object code + object image to floating object
((uint32 *)flob)[0] = MKID_BE('FLOB'); WRITE_UINT32(flob, MKID_BE('FLOB'));
((uint32 *)flob)[1] = TO_BE_32(flob_size); WRITE_BE_UINT32(flob + 4, flob_size);
memcpy(flob + 8, foir.obcd, obcd_size); memcpy(flob + 8, foir.obcd, obcd_size);
memcpy(flob + 8 + obcd_size, foir.obim, obim_size); memcpy(flob + 8 + obcd_size, foir.obim, obim_size);

70
engines/scumm/palette.cpp
View file

@ -470,13 +470,9 @@ void ScummEngine::moveMemInPalRes(int start, int end, byte direction) {
} }
void ScummEngine::palManipulateInit(int resID, int start, int end, int time) { void ScummEngine::palManipulateInit(int resID, int start, int end, int time) {
byte *pal, *target, *between; byte *string1 = getStringAddress(resID);
byte *string1, *string2, *string3; byte *string2 = getStringAddress(resID + 1);
int i; byte *string3 = getStringAddress(resID + 2);
string1 = getStringAddress(resID);
string2 = getStringAddress(resID + 1);
string3 = getStringAddress(resID + 2);
if (!string1 || !string2 || !string3) { if (!string1 || !string2 || !string3) {
error("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d", error("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d",
resID, start, end, time, resID, resID + 1, resID + 2); resID, start, end, time, resID, resID + 1, resID + 2);
@ -496,29 +492,24 @@ void ScummEngine::palManipulateInit(int resID, int start, int end, int time) {
if (!_palManipIntermediatePal) if (!_palManipIntermediatePal)
_palManipIntermediatePal = (byte *)calloc(0x600, 1); _palManipIntermediatePal = (byte *)calloc(0x600, 1);
pal = _currentPalette + start * 3; byte *pal = _currentPalette + start * 3;
target = _palManipPalette + start * 3; byte *target = _palManipPalette + start * 3;
between = _palManipIntermediatePal + start * 6; uint16 *between = (uint16 *)(_palManipIntermediatePal + start * 6);
for (i = start; i < end; ++i) { for (int i = start; i < end; ++i) {
*target++ = *string1++; *target++ = *string1++;
*target++ = *string2++; *target++ = *string2++;
*target++ = *string3++; *target++ = *string3++;
*(uint16 *)between = ((uint16) *pal++) << 8; *between++ = ((uint16) *pal++) << 8;
between += 2; *between++ = ((uint16) *pal++) << 8;
*(uint16 *)between = ((uint16) *pal++) << 8; *between++ = ((uint16) *pal++) << 8;
between += 2;
*(uint16 *)between = ((uint16) *pal++) << 8;
between += 2;
} }
_palManipCounter = time; _palManipCounter = time;
} }
void ScummEngine_v6::palManipulateInit(int resID, int start, int end, int time) { void ScummEngine_v6::palManipulateInit(int resID, int start, int end, int time) {
byte *pal, *target, *between;
const byte *new_pal; const byte *new_pal;
int i;
new_pal = getPalettePtr(resID, _roomResource); new_pal = getPalettePtr(resID, _roomResource);
@ -533,20 +524,17 @@ void ScummEngine_v6::palManipulateInit(int resID, int start, int end, int time)
if (!_palManipIntermediatePal) if (!_palManipIntermediatePal)
_palManipIntermediatePal = (byte *)calloc(0x600, 1); _palManipIntermediatePal = (byte *)calloc(0x600, 1);
pal = _currentPalette + start * 3; byte *pal = _currentPalette + start * 3;
target = _palManipPalette + start * 3; byte *target = _palManipPalette + start * 3;
between = _palManipIntermediatePal + start * 6; uint16 *between = (uint16 *)(_palManipIntermediatePal + start * 6);
for (i = start; i < end; ++i) { for (int i = start; i < end; ++i) {
*target++ = *new_pal++; *target++ = *new_pal++;
*target++ = *new_pal++; *target++ = *new_pal++;
*target++ = *new_pal++; *target++ = *new_pal++;
*(uint16 *)between = ((uint16) *pal++) << 8; *between++ = ((uint16) *pal++) << 8;
between += 2; *between++ = ((uint16) *pal++) << 8;
*(uint16 *)between = ((uint16) *pal++) << 8; *between++ = ((uint16) *pal++) << 8;
between += 2;
*(uint16 *)between = ((uint16) *pal++) << 8;
between += 2;
} }
_palManipCounter = time; _palManipCounter = time;
@ -554,26 +542,24 @@ void ScummEngine_v6::palManipulateInit(int resID, int start, int end, int time)
void ScummEngine::palManipulate() { void ScummEngine::palManipulate() {
byte *target, *pal, *between;
int i, j;
if (!_palManipCounter || !_palManipPalette || !_palManipIntermediatePal) if (!_palManipCounter || !_palManipPalette || !_palManipIntermediatePal)
return; return;
target = _palManipPalette + _palManipStart * 3; byte *target = _palManipPalette + _palManipStart * 3;
pal = _currentPalette + _palManipStart * 3; byte *pal = _currentPalette + _palManipStart * 3;
between = _palManipIntermediatePal + _palManipStart * 6; uint16 *between = (uint16 *)(_palManipIntermediatePal + _palManipStart * 6);
for (i = _palManipStart; i < _palManipEnd; ++i) { for (int i = _palManipStart; i < _palManipEnd; ++i) {
j = (*((uint16 *)between) += ((*target++ << 8) - *((uint16 *)between)) / _palManipCounter); int j;
j = (*between += ((*target++ << 8) - *between) / _palManipCounter);
*pal++ = j >> 8; *pal++ = j >> 8;
between += 2; between++;
j = (*((uint16 *)between) += ((*target++ << 8) - *((uint16 *)between)) / _palManipCounter); j = (*between += ((*target++ << 8) - *between) / _palManipCounter);
*pal++ = j >> 8; *pal++ = j >> 8;
between += 2; between++;
j = (*((uint16 *)between) += ((*target++ << 8) - *((uint16 *)between)) / _palManipCounter); j = (*between += ((*target++ << 8) - *between) / _palManipCounter);
*pal++ = j >> 8; *pal++ = j >> 8;
between += 2; between++;
} }
setDirtyColors(_palManipStart, _palManipEnd); setDirtyColors(_palManipStart, _palManipEnd);
_palManipCounter--; _palManipCounter--;

8
engines/scumm/resource.cpp
View file

@ -787,8 +787,6 @@ void ResourceManager::setResourceCounter(int type, int idx, byte flag) {
#define SAFETY_AREA 2 #define SAFETY_AREA 2
byte *ResourceManager::createResource(int type, int idx, uint32 size) { byte *ResourceManager::createResource(int type, int idx, uint32 size) {
byte *ptr;
debugC(DEBUG_RESOURCE, "_res->createResource(%s,%d,%d)", resTypeFromId(type), idx, size); debugC(DEBUG_RESOURCE, "_res->createResource(%s,%d,%d)", resTypeFromId(type), idx, size);
if (!validateResource("allocating", type, idx)) if (!validateResource("allocating", type, idx))
@ -807,17 +805,17 @@ byte *ResourceManager::createResource(int type, int idx, uint32 size) {
expireResources(size); expireResources(size);
ptr = (byte *)calloc(size + sizeof(MemBlkHeader) + SAFETY_AREA, 1); void *ptr = calloc(size + sizeof(MemBlkHeader) + SAFETY_AREA, 1);
if (ptr == NULL) { if (ptr == NULL) {
error("createResource(%s,%d): Out of memory while allocating %d", resTypeFromId(type), idx, size); error("createResource(%s,%d): Out of memory while allocating %d", resTypeFromId(type), idx, size);
} }
_allocatedSize += size; _allocatedSize += size;
address[type][idx] = ptr; address[type][idx] = (byte *)ptr;
((MemBlkHeader *)ptr)->size = size; ((MemBlkHeader *)ptr)->size = size;
setResourceCounter(type, idx, 1); setResourceCounter(type, idx, 1);
return ptr + sizeof(MemBlkHeader); /* skip header */ return (byte *)ptr + sizeof(MemBlkHeader); /* skip header */
} }
ResourceManager::ResourceManager(ScummEngine *vm) { ResourceManager::ResourceManager(ScummEngine *vm) {