Skip to content

Commit

Permalink
PEGASUS: Implement basic neighborhood resource parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Hoops committed Sep 1, 2011
1 parent 4a69dc1 commit 8263f5a
Show file tree
Hide file tree
Showing 21 changed files with 1,289 additions and 160 deletions.
11 changes: 10 additions & 1 deletion engines/pegasus/module.mk
Expand Up @@ -20,7 +20,16 @@ MODULE_OBJS = \
MMShell/Sounds/MMSound.o \
MMShell/Utilities/MMResourceFile.o \
MMShell/Utilities/MMTimeValue.o \
MMShell/Utilities/MMUtilities.o
MMShell/Utilities/MMUtilities.o \
neighborhood/door.o \
neighborhood/exit.o \
neighborhood/extra.o \
neighborhood/hotspot.o \
neighborhood/neighborhood.o \
neighborhood/spot.o \
neighborhood/turn.o \
neighborhood/view.o \
neighborhood/zoom.o


# This module can be built as a plugin
Expand Down
64 changes: 64 additions & 0 deletions engines/pegasus/neighborhood/door.cpp
@@ -0,0 +1,64 @@
/* 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.
*
* Additional copyright for this file:
* Copyright (C) 1995-1997 Presto Studios, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/

#include "common/debug.h"
#include "common/stream.h"
#include "common/textconsole.h"

#include "pegasus/neighborhood/door.h"

namespace Pegasus {

void DoorTable::loadFromStream(Common::SeekableReadStream *stream) {
uint32 count = stream->readUint32BE();
_entries.resize(count);

for (uint32 i = 0; i < count; i++) {
_entries[i].room = stream->readUint16BE();
_entries[i].direction = stream->readByte();
_entries[i].altCode = stream->readByte();
_entries[i].movieStart = stream->readUint32BE();
_entries[i].movieEnd = stream->readUint32BE();
_entries[i].flags = stream->readByte();
stream->readByte(); // alignment
debug(0, "Door[%d]: %d %d %d %d %d %d", i, _entries[i].room, _entries[i].direction,
_entries[i].altCode, _entries[i].movieStart, _entries[i].movieEnd,
_entries[i].flags);
}
}

void DoorTable::clear() {
_entries.clear();
}

DoorTable::Entry DoorTable::findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode) {
for (uint32 i = 0; i < _entries.size(); i++)
if (_entries[i].room == room && _entries[i].direction == direction && _entries[i].altCode == altCode)
return _entries[i];

return Entry();
}

} // End of namespace Pegasus
82 changes: 82 additions & 0 deletions engines/pegasus/neighborhood/door.h
@@ -0,0 +1,82 @@
/* 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.
*
* Additional copyright for this file:
* Copyright (C) 1995-1997 Presto Studios, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/

#ifndef PEGASUS_NEIGHBORHOOD_DOOR_H
#define PEGASUS_NEIGHBORHOOD_DOOR_H

#include "common/array.h"
#include "common/endian.h"

#include "pegasus/Game_Shell/Headers/Game_Shell_Constants.h"

namespace Common {
class SeekableReadStream;
}

namespace Pegasus {

typedef tMM8BitFlags tDoorFlags;

enum {
kDoorPresentBit, // Bit set if there is a door here.
kDoorLockedBit // Bit set if door is locked, clear if unlocked.
};

const tDoorFlags kNoDoorFlags = 0;
const tDoorFlags kDoorPresentMask = 1 << kDoorPresentBit;
const tDoorFlags kDoorLockedMask = 1 << kDoorLockedBit;

class DoorTable {
public:
DoorTable() {}
~DoorTable() {}

static const uint32 getResTag() { return MKTAG('D', 'o', 'o', 'r'); }

void loadFromStream(Common::SeekableReadStream *stream);
void clear();

struct Entry {
Entry() { movieStart = 0xffffffff; }
bool isEmpty() { return movieStart == 0xffffffff; }

tRoomID room;
tDirectionConstant direction;
tAlternateID altCode;
TimeValue movieStart;
TimeValue movieEnd;
tDoorFlags flags;
};

Entry findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode);

private:
Common::Array<Entry> _entries;
};

} // End of namespace Pegasus

#endif

70 changes: 70 additions & 0 deletions engines/pegasus/neighborhood/exit.cpp
@@ -0,0 +1,70 @@
/* 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.
*
* Additional copyright for this file:
* Copyright (C) 1995-1997 Presto Studios, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/

#include "common/debug.h"
#include "common/stream.h"
#include "common/textconsole.h"

#include "pegasus/neighborhood/exit.h"

namespace Pegasus {

void ExitTable::loadFromStream(Common::SeekableReadStream *stream) {
uint32 count = stream->readUint32BE();
_entries.resize(count);

for (uint32 i = 0; i < count; i++) {
_entries[i].room = stream->readUint16BE();
_entries[i].direction = stream->readByte();
_entries[i].altCode = stream->readByte();
_entries[i].movieStart = stream->readUint32BE();
_entries[i].movieEnd = stream->readUint32BE();
_entries[i].exitEnd = stream->readUint32BE();
_entries[i].exitLoop = stream->readUint32BE();
_entries[i].exitRoom = stream->readUint32BE();
_entries[i].exitDirection = stream->readByte();
stream->readByte(); // alignment

_entries[i].originalEnd = _entries[i].exitEnd;

debug(0, "Exit[%d]: %d %d %d %d %d %d %d %d %d", i, _entries[i].room, _entries[i].direction,
_entries[i].altCode, _entries[i].movieStart, _entries[i].movieEnd, _entries[i].exitEnd,
_entries[i].exitLoop, _entries[i].exitRoom, _entries[i].exitDirection);
}
}

void ExitTable::clear() {
_entries.clear();
}

ExitTable::Entry ExitTable::findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode) {
for (uint32 i = 0; i < _entries.size(); i++)
if (_entries[i].room == room && _entries[i].direction == direction && _entries[i].altCode == altCode)
return _entries[i];

return Entry();
}

} // End of namespace Pegasus
77 changes: 77 additions & 0 deletions engines/pegasus/neighborhood/exit.h
@@ -0,0 +1,77 @@
/* 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.
*
* Additional copyright for this file:
* Copyright (C) 1995-1997 Presto Studios, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/

#ifndef PEGASUS_NEIGHBORHOOD_EXIT_H
#define PEGASUS_NEIGHBORHOOD_EXIT_H

#include "common/array.h"
#include "common/endian.h"

#include "pegasus/Game_Shell/Headers/Game_Shell_Constants.h"

namespace Common {
class SeekableReadStream;
}

namespace Pegasus {

class ExitTable {
public:
ExitTable() {}
~ExitTable() {}

static const uint32 getResTag() { return MKTAG('E', 'x', 'i', 't'); }

void loadFromStream(Common::SeekableReadStream *stream);
void clear();

struct Entry {
Entry() { movieStart = 0xffffffff; }
bool isEmpty() { return movieStart == 0xffffffff; }

tRoomID room;
tDirectionConstant direction;
tAlternateID altCode;
TimeValue movieStart;
TimeValue movieEnd;
// fExitEnd is the end of the optimized run of walks.
TimeValue exitEnd;
TimeValue originalEnd;
// fExitLoop is the loop start time of the optimized run of walks if the run
// loops back on itself (so far, only in TSA).
TimeValue exitLoop;
tRoomID exitRoom;
tDirectionConstant exitDirection;
};

Entry findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode);

private:
Common::Array<Entry> _entries;
};

} // End of namespace Pegasus

#endif
58 changes: 58 additions & 0 deletions engines/pegasus/neighborhood/extra.cpp
@@ -0,0 +1,58 @@
/* 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.
*
* Additional copyright for this file:
* Copyright (C) 1995-1997 Presto Studios, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/

#include "common/debug.h"
#include "common/stream.h"
#include "common/textconsole.h"

#include "pegasus/neighborhood/extra.h"

namespace Pegasus {

void ExtraTable::loadFromStream(Common::SeekableReadStream *stream) {
uint32 count = stream->readUint32BE();
_entries.resize(count);

for (uint32 i = 0; i < count; i++) {
_entries[i].extra = stream->readUint32BE();
_entries[i].movieStart = stream->readUint32BE();
_entries[i].movieEnd = stream->readUint32BE();
debug(0, "Extra[%d]: %d %d %d", i, _entries[i].extra, _entries[i].movieStart, _entries[i].movieEnd);
}
}

void ExtraTable::clear() {
_entries.clear();
}

ExtraTable::Entry ExtraTable::findEntry(tExtraID extra) {
for (uint32 i = 0; i < _entries.size(); i++)
if (_entries[i].extra == extra)
return _entries[i];

return Entry();
}

} // End of namespace Pegasus

0 comments on commit 8263f5a

Please sign in to comment.