libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added some extra safety checks. Also contains some started work on redesigning the display of the current action

Browse Source 
svn-id: r22577
This commit is contained in:
Paul Gilbert 2006-05-23 12:36:57 +00:00
parent 5f64d7009e
commit 3e4566e196
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/lure/room.cpp
View File

@ -83,6 +83,8 @@ Room::Room(): _screen(Screen::getReference()) {
_showInfo = false;
_isExit = false;
_destRoomNumber = 0;
_cursorState = CS_NONE;
//****DEBUG****
memset(tempLayer, 0, DECODED_PATHS_WIDTH * DECODED_PATHS_HEIGHT * 2);
}
@ -356,6 +358,7 @@ void Room::update() {
// Handle first layer (layer 3)
for (i = hotspots.begin(); i != hotspots.end(); ++i) {
Hotspot &h = *i.operator*();
if ((h.roomNumber() == _roomNumber) && h.isActiveAnimation() && (h.layer() == 3)) {
flagCoveredCells(h);
addAnimation(h);
@ -382,6 +385,7 @@ void Room::update() {
}
for (iTemp = tempList.begin(); iTemp != tempList.end(); ++iTemp) {
Hotspot &h = *iTemp.operator*();
flagCoveredCells(h);
addAnimation(h);
addLayers(h);
@ -390,6 +394,7 @@ void Room::update() {
// Handle third layer (layer 2)
for (i = hotspots.begin(); i != hotspots.end(); ++i) {
Hotspot &h = *i.operator*();
if ((h.roomNumber() == _roomNumber) && h.isActiveAnimation() && (h.layer() == 2)) {
flagCoveredCells(h);
addAnimation(h);
@ -424,14 +429,20 @@ void Room::update() {
s.writeString(0, 0, _hotspotName, false, DIALOG_TEXT_COLOUR);
} else {
char buffer[MAX_DESC_SIZE];
strcpy(buffer, res.getCurrentActionStr());
const char *actionStr = res.getCurrentActionStr();
strcpy(buffer, actionStr);
if (action != STATUS) {
strcat(buffer, " ");
if (usedId != 0xffff) {
uint16 nameId = res.getHotspot(usedId)->nameId;
strings.getString(nameId, buffer + strlen(buffer), NULL, NULL);
if ((usedId != 0xffff) && (usedId != 0)) {
HotspotData *usedHotspot = res.getHotspot(usedId);
if (usedHotspot != NULL)
strings.getString(usedHotspot->nameId, buffer + strlen(buffer), NULL, NULL);
else
strcat(buffer, "???");
if (action == GIVE) strcat(buffer, " to ");
else strcat(buffer, " on ");
}