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: * renaming of a couple classes

Browse Source 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@135 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Alex Bevilacqua 2009-06-15 14:24:55 +00:00 committed by Eugene Sandulenko
parent 223a30e939
commit 9f08842406
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/asylum/graphics.h
View File

@ -28,7 +28,7 @@
#include "common/array.h"
#include "graphics/surface.h"
#include "asylum/resourcepack.h"
#include "asylum/respack.h"
namespace Asylum {
@ -47,7 +47,7 @@ public:
GraphicResource(byte *data, uint32 size);
GraphicResource(ResourcePack *resPack, int entry) {
ResourceEntry *resEntry = resPack->getResource(entry);
init(resEntry->data, resEntry->size);
init(resEntry->data, resEntry->size);
}
~GraphicResource();

2
engines/asylum/menu.h
View File

@ -29,7 +29,7 @@
#include "common/events.h"
#include "asylum/asylum.h"
#include "asylum/resourcepack.h"
#include "asylum/respack.h"
#include "asylum/scene.h"
#include "asylum/graphics.h"
#include "asylum/text.h"

4
engines/asylum/module.mk
View File

@ -5,9 +5,9 @@ MODULE_OBJS := \
detection.o \
graphics.o \
menu.o \
resourcepack.o \
respack.o \
scene.o \
scene_resource.o \
sceneres.o \
screen.o \
sound.o \
text.o \

2
engines/asylum/resourcepack.cpp → engines/asylum/respack.cpp
View File

@ -23,7 +23,7 @@
*
*/
#include "asylum/resourcepack.h"
#include "asylum/respack.h"
namespace Asylum {

0
engines/asylum/resourcepack.h → engines/asylum/respack.h
View File

4
engines/asylum/scene.h
View File

@ -29,10 +29,10 @@
#include "common/events.h"
#include "asylum/asylum.h"
#include "asylum/resourcepack.h"
#include "asylum/respack.h"
#include "asylum/graphics.h"
#include "asylum/text.h"
#include "asylum/scene_resource.h"
#include "asylum/sceneres.h"
namespace Asylum {

24
engines/asylum/scene_resource.cpp → engines/asylum/sceneres.cpp
View File

@ -23,7 +23,7 @@
*
*/
#include "asylum/scene_resource.h"
#include "asylum/sceneres.h"
namespace Asylum {
@ -73,15 +73,15 @@ void SceneResource::loadWorldStats(Common::SeekableReadStream *stream) {
_worldStats->_size = stream->readUint32LE();
_worldStats->_numEntries = stream->readUint32LE();
_worldStats->_numChapter = stream->readUint32LE();
stream->skip(24); // unused data
// read common graphic resources
stream->read(&_worldStats->_commonRes,sizeof(CommonResources));
_worldStats->_width = stream->readUint32LE();
_worldStats->_height = stream->readUint32LE();
stream->skip(8); // unused data
_worldStats->_numActions = stream->readUint32LE();
@ -112,15 +112,15 @@ void SceneResource::loadWorldStats(Common::SeekableReadStream *stream) {
actorDef.graphicResId = stream->readUint32LE();
actorDef.x = stream->readUint32LE();
actorDef.y = stream->readUint32LE();
stream->skip(0x30);
stream->read(actorDef.name, 52);
stream->skip(0x30);
stream->read(actorDef.name, 52);
stream->skip(0x158);
actorDef.soundResId = stream->readUint32LE();
stream->skip(0x4D8);
_worldStats->_actorsDef.push_back(actorDef);
}
// TODO grab Max actor definitions
stream->seek(0xD6B5A); // where actors action definitions start
@ -132,17 +132,17 @@ void SceneResource::loadWorldStats(Common::SeekableReadStream *stream) {
stream->read(actorActionDef.name,52);
actorActionDef.id = stream->readUint32LE();
stream->skip(0x14);
stream->skip(0x14);
actorActionDef.actionListIdx1 = stream->readUint32LE();
actorActionDef.actionListIdx2 = stream->readUint32LE();
actorActionDef.actionType = stream->readUint32LE();
stream->skip(0x2C);
stream->skip(0x2C);
actorActionDef.polyIdx = stream->readUint32LE();
stream->skip(0x08);
stream->skip(0x08);
actorActionDef.soundResId = stream->readUint32LE();
stream->skip(0x04);
stream->skip(0x04);
actorActionDef.palCorrection = stream->readUint32LE();
stream->skip(0x14);
stream->skip(0x14);
actorActionDef.soundVolume = stream->readUint32LE();
_worldStats->_actorsActionDef.push_back(actorActionDef);

0
engines/asylum/scene_resource.h → engines/asylum/sceneres.h
View File

2
engines/asylum/screen.h
View File

@ -28,7 +28,7 @@
#include "asylum/asylum.h"
#include "asylum/graphics.h"
#include "asylum/resourcepack.h"
#include "asylum/respack.h"
#include "common/system.h" // for OSystem
#include "graphics/surface.h"

6
engines/asylum/sound.h
View File

@ -27,7 +27,7 @@
#define ASYLUM_SOUND_H_
#include "sound/mixer.h"
#include "asylum/resourcepack.h"
#include "asylum/respack.h"
namespace Asylum {
@ -41,12 +41,12 @@ public:
void playSfx(ResourcePack *resPack, int entry) {
ResourceEntry *resEntry = resPack->getResource(entry);
playSfx(resEntry->data, resEntry->size);
playSfx(resEntry->data, resEntry->size);
}
void playMusic(ResourcePack *resPack, int entry) {
ResourceEntry *resEntry = resPack->getResource(entry);
playMusic(resEntry->data, resEntry->size);
playMusic(resEntry->data, resEntry->size);
}
bool isSfxActive() { return _mixer->isSoundHandleActive(_sfxHandle); }

6
engines/asylum/text.h
View File

@ -27,7 +27,7 @@
#define ASYLUM_TEXT_H_
#include "asylum/screen.h"
#include "asylum/resourcepack.h"
#include "asylum/respack.h"
namespace Asylum {
@ -39,7 +39,7 @@ public:
~Text();
void loadFont(ResourcePack *resPack, uint32 resId);
void setTextPos(uint32 x, uint32 y);
uint32 getTextWidth(char *text);
uint32 getResTextWidth(uint32 resId);
@ -50,7 +50,7 @@ public:
void drawResText(uint32 resId);
void drawResText(uint32 x, uint32 y, uint32 resId);
void drawTextCentered(uint32 x, uint32 y, uint32 width, char *text);
void drawTextCentered(uint32 x, uint32 y, uint32 width, char *text);
void drawResTextCentered(uint32 x, uint32 y, uint32 width, uint32 resId);
void drawTextAlignRight(uint32 x, uint32 y, char *text);