libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA: Avoid global constructor for pieceOrigins array

Browse Source 
svn-id: r48842
This commit is contained in:
Max Horn 2010-04-28 22:23:34 +00:00
parent a5aedb73be
commit c75ff0515e
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
engines/saga/itedata.cpp
View File

@ -428,22 +428,22 @@ const char *ITEinterfaceTextStrings[][53] = {
}
};
Point pieceOrigins[PUZZLE_PIECES] = {
Point(268, 18),
Point(270, 51),
Point( 19, 51),
Point( 73, 0),
Point( 0, 34),
Point(215, 0),
Point(159, 0),
Point( 9, 69),
Point(288, 18),
Point(112, 0),
Point( 27, 88),
Point( 43, 0),
Point( 0, 0),
Point(262, 0),
Point(271, 103)
const RawPoint pieceOrigins[PUZZLE_PIECES] = {
{ 268, 18 },
{ 270, 51 },
{ 19, 51 },
{ 73, 0 },
{ 0, 34 },
{ 215, 0 },
{ 159, 0 },
{ 9, 69 },
{ 288, 18 },
{ 112, 0 },
{ 27, 88 },
{ 43, 0 },
{ 0, 0 },
{ 262, 0 },
{ 271, 103 }
};
const char *pieceNames[][PUZZLE_PIECES] = {

3
engines/saga/itedata.h
View File

@ -92,7 +92,8 @@ extern const char *ITEinterfaceTextStrings[][53];
#define PUZZLE_PIECES 15
extern Point pieceOrigins[PUZZLE_PIECES];
struct RawPoint { int x, y; };
extern const RawPoint pieceOrigins[PUZZLE_PIECES];
extern const char *pieceNames[][PUZZLE_PIECES];
#define NUM_SOLICIT_REPLIES 5

3
engines/saga/puzzle.cpp
View File

@ -556,8 +556,7 @@ void Puzzle::giveHint() {
sprintf(hintBuf, optionsStr[_lang][kROHint], pieceNames[_lang][piece]);
_vm->_actor->nonActorSpeech(_hintBox, &hintPtr, 1, PUZZLE_TOOL_SOUNDS + _hintSpeaker + piece * 3, 0);
}
else {
} else {
// If no pieces are in the wrong place
_vm->_actor->nonActorSpeech(_hintBox, &hintStr[_lang][3], 1, PUZZLE_HINT_SOUNDS + 3 * 3 + _hintSpeaker, 0);
}