libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 18:27:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AVALANCHE: some more work on variables

Browse Source
This commit is contained in:
Strangerke 2013-10-01 23:31:31 +02:00
parent c9432b8467
commit 5a4bd0d837
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/avalanche/avalanche.h
View File

@ -162,9 +162,6 @@ private:
#endif
public:
static const MouseHotspotType kMouseHotSpots[9];
static const int16 kMaxSprites = 2; // Current max no. of sprites.
// For Thinkabout:
static const bool kThing = true;
static const bool kPerson = false;
@ -306,6 +303,7 @@ public:
void setRoom(People persId, Room roomId);
Room getRoom(People persId);
private:
static const int16 kMaxSprites = 2; // Current max no. of sprites.
static Room _whereIs[29];
// Will be used in dusk() and dawn().

12
engines/avalanche/avalot.cpp
View File

@ -37,18 +37,6 @@
namespace Avalanche {
const MouseHotspotType AvalancheEngine::kMouseHotSpots[9] = {
{8,0}, // 0 - up-arrow
{0,0}, // 1 - screwdriver
{15,6}, // 2 - right-arrow
{0,0}, // 3 - fletch
{8,7}, // 4 - hourglass
{4,0}, // 5 - TTHand
{8,5}, // 6 - Mark's crosshairs
{8,7}, // 7 - I-beam
{0,0} // 8 - question mark
};
// Art gallery at 2,1; notice about this at 2,2.
const int32 AvalancheEngine::kCatacombMap[8][8] = {
// Geida's room

4
engines/avalanche/avalot.h
View File

@ -69,10 +69,6 @@ static const int16 kCarryLimit = 12; // carry limit
static const int16 kNumlockCode = 32; // Code for Num Lock
static const int16 kMouseSize = 134;
struct MouseHotspotType { // mouse-void
int16 _horizontal, _vertical;
};
struct PedType {
int16 _x, _y;
Direction _direction;

14
engines/avalanche/graphics.cpp
View File

@ -38,6 +38,18 @@ namespace Avalanche {
const byte GraphicManager::kEgaPaletteIndex[16] = {0, 1, 2, 3, 4, 5, 20, 7, 56, 57, 58, 59, 60, 61, 62, 63};
const MouseHotspotType GraphicManager::kMouseHotSpots[9] = {
{8,0}, // 0 - up-arrow
{0,0}, // 1 - screwdriver
{15,6}, // 2 - right-arrow
{0,0}, // 3 - fletch
{8,7}, // 4 - hourglass
{4,0}, // 5 - TTHand
{8,5}, // 6 - Mark's crosshairs
{8,7}, // 7 - I-beam
{0,0} // 8 - question mark
};
GraphicManager::GraphicManager(AvalancheEngine *vm) {
_vm = vm;
}
@ -144,7 +156,7 @@ void GraphicManager::loadMouse(byte which) {
mask.free();
f.close();
CursorMan.replaceCursor(cursor.getPixels(), 16, 32, AvalancheEngine::kMouseHotSpots[which]._horizontal, AvalancheEngine::kMouseHotSpots[which]._vertical * 2, 255, false);
CursorMan.replaceCursor(cursor.getPixels(), 16, 32, kMouseHotSpots[which]._horizontal, kMouseHotSpots[which]._vertical * 2, 255, false);
cursor.free();
}

6
engines/avalanche/graphics.h
View File

@ -55,8 +55,14 @@ public:
uint16 _size; // The size of one picture.
};
struct MouseHotspotType { // mouse-void
int16 _horizontal, _vertical;
};
class GraphicManager {
public:
static const MouseHotspotType kMouseHotSpots[9];
Graphics::Surface _surface;
Color _talkBackgroundColor, _talkFontColor;