libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 11:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASYLUM: Fix GCC compilation and warnings

Browse Source 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@593 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Julien Templier 2010-11-28 19:20:36 +00:00 committed by Eugene Sandulenko
parent ce04e57184
commit 98a98a8486
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
8 changed files with 71 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/asylum/console.cpp
View File

@ -335,13 +335,13 @@ bool Console::cmdRunScript(int32 argc, const char **argv) {
uint32 actor = atoi(argv[2]);
// Check parameters
if (index < 0 || index >= getScene()->actions()->_scripts.size()) {
if (index >= getScene()->actions()->_scripts.size()) {
DebugPrintf("[Error] Invalid index (was: %d - valid: [0-%d])\n", index, _vm->encounter()->_items.size() - 1);
return true;
}
if (actor < 0 || actor > getWorld()->actors.size()) {
DebugPrintf("[Error] Invalid actor index (was: %d - valid: [0-%d])\n", getWorld()->actors.size() - 1);
if (actor > getWorld()->actors.size()) {
DebugPrintf("[Error] Invalid actor index (was: %d - valid: [0-%d])\n", actor, getWorld()->actors.size() - 1);
}
getScene()->actions()->queueScript(index, actor);
@ -379,7 +379,7 @@ bool Console::cmdRunEncounter(int32 argc, const char **argv) {
uint32 index = atoi(argv[1]);
// Check index is valid
if (index < 0 || index >= _vm->encounter()->_items.size()) {
if (index >= _vm->encounter()->_items.size()) {
DebugPrintf("[Error] Invalid index (was: %d - valid: [0-%d])\n", index, _vm->encounter()->_items.size() - 1);
return true;
}

94
engines/asylum/resources/actor.cpp
View File

@ -929,30 +929,30 @@ void Actor::process_401830(int32 field980, int32 actionAreaId, int32 field978, i
updateDirection();
}
bool Actor::process_408B20(Common::Point *point, ActorDirection direction, int count, bool hasDelta) {
bool Actor::process_408B20(Common::Point *point, ActorDirection dir, int count, bool hasDelta) {
if (_field_944 == 1 || _field_944 == 4)
return true;
int16 x = (hasDelta ? point->x : point->x + deltaPointsArray[direction].x);
int16 y = (hasDelta ? point->y : point->y + deltaPointsArray[direction].y);
int16 x = (hasDelta ? point->x : point->x + deltaPointsArray[dir].x);
int16 y = (hasDelta ? point->y : point->y + deltaPointsArray[dir].y);
// Check scene rect
if (!_field_944) {
Common::Rect rect = getWorld()->sceneRects[getWorld()->sceneRectIdx];
Common::Rect rct = getWorld()->sceneRects[getWorld()->sceneRectIdx];
if (x > rect.right)
if (x > rct.right)
return false;
if (x < rect.left)
if (x < rct.left)
return false;
if (y < rect.top)
if (y < rct.top)
return false;
if (y > rect.bottom)
if (y > rct.bottom)
return false;
if (!process_4103B0(point, direction))
if (!process_4103B0(point, dir))
return false;
}
@ -960,8 +960,8 @@ bool Actor::process_408B20(Common::Point *point, ActorDirection direction, int c
int32 index = 0;
while (getScene()->findActionArea(/* 1*/Common::Point(x, y)) != -1) {
x += deltaPointsArray[direction].x;
y += deltaPointsArray[direction].y;
x += deltaPointsArray[dir].x;
y += deltaPointsArray[dir].y;
++index;
@ -1043,7 +1043,7 @@ bool Actor::process_41BDB0(int32 reactionIndex, int32 testNumberValue01) {
return true;
}
bool Actor::process_4103B0(Common::Point *point, ActorDirection direction) {
bool Actor::process_4103B0(Common::Point *point, ActorDirection dir) {
error("[Actor::update_40DE20] not implemented!");
}
@ -1560,7 +1560,7 @@ void Actor::updateStatus16_Chapter11() {
getCursor()->show();
getSharedData()->setFlag(kFlag1, false);
if (_frameIndex != -5 || _vm->isGameFlagNotSet(kGameFlag570))
if (_frameIndex != 5 || _vm->isGameFlagNotSet(kGameFlag570))
++_frameIndex;
if (_frameIndex > _frameCount - 1) {
@ -1682,10 +1682,10 @@ void Actor::updateCoordinates(Common::Point vec1, Common::Point vec2) {
if (diffY == 0)
return;
ActorDirection direction = (diffY > 0) ? kDirectionS : kDirectionN;
ActorDirection dir = (diffY > 0) ? kDirectionS : kDirectionN;
if (process_408B20(&vec2, direction, diffY + 3, false))
updateCoordinatesForDirection(direction, diffY - 1, &_point);
if (process_408B20(&vec2, dir, diffY + 3, false))
updateCoordinatesForDirection(dir, diffY - 1, &_point);
}
void Actor::resetActors() {
@ -1763,19 +1763,19 @@ ActorDirection Actor::direction(Common::Point vec1, Common::Point vec2) const {
diffY = -diffY;
}
int32 angle = -1;
int32 dirAngle = -1;
if (diffX) {
uint32 index = (diffY * 256) / diffX;
if (index < 256)
angle = angleTable01[index];
dirAngle = angleTable01[index];
else if (index < 4096)
angle = angleTable02[index / 16];
dirAngle = angleTable02[index / 16];
else if (index < 65536)
angle = angleTable03[index / 256];
dirAngle = angleTable03[index / 256];
} else {
angle = 90;
dirAngle = 90;
}
switch (adjust) {
@ -1783,58 +1783,58 @@ ActorDirection Actor::direction(Common::Point vec1, Common::Point vec2) const {
break;
case 1:
angle = 360 - angle;
dirAngle = 360 - dirAngle;
break;
case 2:
angle = 180 - angle;
dirAngle = 180 - dirAngle;
break;
case 3:
angle += 180;
dirAngle += 180;
break;
}
if (angle >= 360)
angle -= 360;
if (dirAngle >= 360)
dirAngle -= 360;
ActorDirection direction;
ActorDirection dir;
if (angle < 157 || angle >= 202) {
if (angle < 112 || angle >= 157) {
if (angle < 67 || angle >= 112) {
if (angle < 22 || angle >= 67) {
if ((angle < 0 || angle >= 22) && (angle < 337 || angle > 359)) {
if (angle < 292 || angle >= 337) {
if (angle < 247 || angle >= 292) {
if (angle < 202 || angle >= 247) {
error("[Actor::angle] returned a bad angle: %d!", angle);
if (dirAngle < 157 || dirAngle >= 202) {
if (dirAngle < 112 || dirAngle >= 157) {
if (dirAngle < 67 || dirAngle >= 112) {
if (dirAngle < 22 || dirAngle >= 67) {
if ((dirAngle < 0 || dirAngle >= 22) && (dirAngle < 337 || dirAngle > 359)) {
if (dirAngle < 292 || dirAngle >= 337) {
if (dirAngle < 247 || dirAngle >= 292) {
if (dirAngle < 202 || dirAngle >= 247) {
error("[Actor::direction] got a bad direction angle: %d!", dirAngle);
} else {
direction = kDirectionSO;
dir = kDirectionSO;
}
} else {
direction = kDirectionS;
dir = kDirectionS;
}
} else {
direction = kDirectionSE;
dir = kDirectionSE;
}
} else {
direction = kDirectionE;
dir = kDirectionE;
}
} else {
direction = kDirectionNE;
dir = kDirectionNE;
}
} else {
direction = kDirectionN;
dir = kDirectionN;
}
} else {
direction = kDirectionNO;
dir = kDirectionNO;
}
} else {
direction = kDirectionO;
dir = kDirectionO;
}
return direction;
return dir;
}
void Actor::updateGraphicData(uint32 offset) {
@ -1888,8 +1888,8 @@ int32 Actor::getDistance() const {
}
}
uint32 Actor::getDistanceForFrame(ActorDirection direction, uint32 frameIndex) {
switch (_direction) {
uint32 Actor::getDistanceForFrame(ActorDirection dir, uint32 frameIndex) {
switch (dir) {
default:
case kDirectionN:
case kDirectionS:

2
engines/asylum/resources/actor.h
View File

@ -62,7 +62,7 @@ public:
void setActionIndex2(int32 index) { _actionIdx2 = index; }
void setObjectIndex(int32 index) { _objectIndex = index; }
void setDirection(ActorDirection direction) { _direction = direction; }
void setDirection(ActorDirection dir) { _direction = dir; }
void setFrameCount(int32 count) { _frameCount = count; }
void setFrameIndex(int32 number) { _frameIndex = number; }
void setLastScreenUpdate(int32 tick) { _lastScreenUpdate = tick; }

10
engines/asylum/resources/encounters.cpp
View File

@ -48,7 +48,7 @@ namespace Asylum {
#define KEYWORD_MASK 0xFFF
Encounter::Encounter(AsylumEngine *engine) : _vm(engine),
_index(NULL), _keywordIndex(0), _item(NULL), _objectId1(kObjectNone), _objectId2(kObjectNone), _actorIndex(kActorInvalid),
_index(0), _keywordIndex(0), _item(NULL), _objectId1(kObjectNone), _objectId2(kObjectNone), _actorIndex(kActorInvalid),
_flag1(false), _flag2(false) {
// TODO init rest of members
@ -141,10 +141,10 @@ void Encounter::initPortraits() {
else
_portrait1.resourceId = getWorld()->graphicResourceIds[encounterPortrait1Index[getWorld()->chapter == kChapter9 ? getWorld()->actorType + 9 : getWorld()->chapter]];
if (_portrait1.resourceId == -1 && getWorld()->chapter == kChapter1)
if (_portrait1.resourceId == kResourceInvalid && getWorld()->chapter == kChapter1)
_portrait1.resourceId = getWorld()->graphicResourceIds[36];
if (_portrait1.resourceId == -1)
if (_portrait1.resourceId == kResourceInvalid)
error("[Encounter::initPortraits] No portrait 1 for this encounter!");
_portrait1.frameIndex = 0;
@ -164,10 +164,10 @@ void Encounter::initPortraits() {
else if (_vm->isGameFlagSet(kGameFlag355))
_portrait2.resourceId = getWorld()->graphicResourceIds[24];
if (_portrait2.resourceId == -1 && getWorld()->chapter == kChapter1)
if (_portrait2.resourceId == kResourceInvalid && getWorld()->chapter == kChapter1)
_portrait2.resourceId = getWorld()->graphicResourceIds[36];
if (_portrait2.resourceId == -1)
if (_portrait2.resourceId == kResourceInvalid)
error("[Encounter::initPortraits] No portrait 2 for this encounter!");
_portrait2.frameIndex = 0;

16
engines/asylum/resources/encounters.h
View File

@ -56,18 +56,18 @@ private:
enum EncounterArray {
kEncounterArray2000 = 0x2000,
kEncounterArray4000 = 0x4000,
kEncounterArray8000 = 0x8000,
kEncounterArray8000 = 0x8000
};
typedef struct EncounterItem {
struct EncounterItem {
int16 keywordIndex;
int16 field2;
ResourceId scriptResourceId;
int16 keywords[50];
byte value;
} EncounterItem;
};
typedef struct EncounterGraphic {
struct EncounterGraphic {
int32 frameIndex;
int32 frameCount;
Common::Rect rect;
@ -92,7 +92,7 @@ private:
}
};
typedef struct EncounterDrawingStruct {
struct EncounterDrawingStruct {
Common::Point point1;
Common::Point point2;
int32 frameIndex;
@ -106,7 +106,7 @@ private:
status = 0;
resourceId = kResourceNone;
}
} EncounterDrawingStruct;
};
Common::Array<int16> _variables;
Common::Array<EncounterItem> _items;
@ -219,11 +219,11 @@ private:
reset(kResourceNone);
}
void reset(ResourceId resourceId) {
void reset(ResourceId id) {
memset(&vars, 0, sizeof(vars));
offset = 0;
counter = 0;
resourceId = resourceId;
resourceId = id;
}
};

4
engines/asylum/respack.h
View File

@ -47,8 +47,8 @@ struct ResourceEntry {
offset = 0;
}
uint32 getData(uint32 offset) {
return READ_UINT32((byte *)this + offset);
uint32 getData(uint32 off) {
return READ_UINT32((byte *)this + off);
}
};

3
engines/asylum/shared.h
View File

@ -193,7 +193,8 @@ enum ResourcePackId {
typedef unsigned int ResourceId;
enum ResourcesId {
kResourceNone = 0
kResourceNone = 0,
kResourceInvalid = 0xFFFFFFFF
};
enum MusicIndex {

4
engines/asylum/system/screen.cpp
View File

@ -271,7 +271,7 @@ void Screen::setupTransTables(uint32 count, ...) {
if (!_transTableData) {
_transTableData = (byte *)malloc((count + 1) * 65536);
_transTableBuffer = (byte *)((uint32)_transTableData & 0xFFFF000) + 65536;
_transTableBuffer = _transTableData + 65536;
_transTableIndex = _transTableBuffer;
}
@ -285,7 +285,7 @@ void Screen::setupTransTables(uint32 count, ...) {
}
void Screen::clearTransTables() {
delete _transTableData;
free(_transTableData);
_transTableData = NULL;
_transTableBuffer = NULL;
_transTableIndex = NULL;