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

cleanup

Browse Source 
svn-id: r24693
This commit is contained in:
Gregory Montoir 2006-11-12 17:47:16 +00:00
parent f527da0953
commit 701b803aff
21 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/queen/bankman.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENBANKMAN_H
#define QUEENBANKMAN_H
#ifndef QUEEN_BANKMAN_H
#define QUEEN_BANKMAN_H
#include "common/util.h"
#include "queen/structs.h"

11
engines/queen/command.cpp
View File

@ -36,8 +36,9 @@
namespace Queen {
CmdText::CmdText(bool reversed, uint8 y, QueenEngine *vm)
: _isReversed(reversed), _y(y), _vm(vm) {
CmdText::CmdText(uint8 y, QueenEngine *vm)
: _y(y), _vm(vm) {
_isReversed = (_vm->resource()->getLanguage() == Common::HB_ISR);
clear();
}
@ -124,7 +125,7 @@ void CmdState::init() {
Command::Command(QueenEngine *vm)
: _cmdList(NULL), _cmdArea(NULL), _cmdObject(NULL), _cmdInventory(NULL), _cmdGameState(NULL),
_cmdText((vm->resource()->getLanguage() == Common::HB_ISR), CmdText::COMMAND_Y_POS, vm), _vm(vm) {
_cmdText(CmdText::COMMAND_Y_POS, vm), _vm(vm) {
}
Command::~Command() {
@ -214,7 +215,7 @@ void Command::executeCurrentAction() {
// Joe is stuck behind the waterfall due to a walkbox issue. We could
// fix the walkbox issue, but then Joe would walk through the waterfall
// which wouldn't look that nice, graphically.
//
//
// Since this command isn't necessary to complete the game and doesn't
// really makes sense here, we just skip it for now. The same cutscene
// is already played in command 648, so the user don't miss anything
@ -225,7 +226,7 @@ void Command::executeCurrentAction() {
if (comId == 649) {
continue;
}
com = &_cmdList[comId];
// check the Gamestates and set them if necessary

6
engines/queen/command.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENCOMMAND_H
#define QUEENCOMMAND_H
#ifndef QUEEN_COMMAND_H
#define QUEEN_COMMAND_H
#include "common/util.h"
#include "queen/structs.h"
@ -32,7 +32,7 @@ class QueenEngine;
struct CmdText {
CmdText(bool reversed, uint8 y, QueenEngine *vm);
CmdText(uint8 y, QueenEngine *vm);
//! reset the command sentence
void clear();

4
engines/queen/credits.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef CREDITS_H
#define CREDITS_H
#ifndef QUEEN_CREDITS_H
#define QUEEN_CREDITS_H
#include "common/util.h"
#include "queen/defs.h"

4
engines/queen/cutaway.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENCUTAWAY_H
#define QUEENCUTAWAY_H
#ifndef QUEEN_CUTAWAY_H
#define QUEEN_CUTAWAY_H
#include "common/util.h"
#include "queen/structs.h"

4
engines/queen/debug.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENDEBUG_H
#define QUEENDEBUG_H
#ifndef QUEEN_DEBUG_H
#define QUEEN_DEBUG_H
#include "gui/debugger.h"

4
engines/queen/defs.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENDEFS_H
#define QUEENDEFS_H
#ifndef QUEEN_DEFS_H
#define QUEEN_DEFS_H
namespace Queen {

6
engines/queen/display.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENDISPLAY_H
#define QUEENDISPLAY_H
#ifndef QUEEN_DISPLAY_H
#define QUEEN_DISPLAY_H
#include "common/str.h"
#include "common/util.h"
@ -151,7 +151,7 @@ public:
//! change the text color for the specified texts list entry
void textColor(uint16 y, uint8 color) { _texts[y].color = color; }
//! Set the focus rectangle to the speaking character
void setFocusRect(const Common::Rect& rect);

4
engines/queen/graphics.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENGRAPHICS_H
#define QUEENGRAPHICS_H
#ifndef QUEEN_GRAPHICS_H
#define QUEEN_GRAPHICS_H
#include "common/util.h"
#include "queen/structs.h"

4
engines/queen/grid.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENGRID_H
#define QUEENGRID_H
#ifndef QUEEN_GRID_H
#define QUEEN_GRID_H
#include "common/util.h"
#include "queen/structs.h"

4
engines/queen/input.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef INPUT_H
#define INPUT_H
#ifndef QUEEN_INPUT_H
#define QUEEN_INPUT_H
#include "common/util.h"
#include "queen/defs.h"

4
engines/queen/journal.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENJOURNAL_H
#define QUEENJOURNAL_H
#ifndef QUEEN_JOURNAL_H
#define QUEEN_JOURNAL_H
#include "common/util.h"

6
engines/queen/logic.cpp
View File

@ -70,7 +70,7 @@ Logic::Logic(QueenEngine *vm)
_puzzleAttemptCount = 0;
_journal = new Journal(vm);
_scene = 0;
initialise();
readQueenJas();
}
Logic::~Logic() {
@ -88,7 +88,7 @@ Logic::~Logic() {
delete[] _graphicAnim;
}
void Logic::initialise() {
void Logic::readQueenJas() {
int16 i;
uint8 *jas = _vm->resource()->loadFile("QUEEN.JAS", 20);
@ -1232,7 +1232,7 @@ void Logic::handlePinnacleRoom() {
_entryObj = 0;
uint16 prevObj = 0;
CmdText cmdText((_vm->resource()->getLanguage() == Common::HB_ISR), 5, _vm);
CmdText cmdText(5, _vm);
cmdText.setVerb(VERB_WALK_TO);
while (_vm->input()->mouseButton() == 0 || _entryObj == 0) {

6
engines/queen/logic.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENLOGIC_H
#define QUEENLOGIC_H
#ifndef QUEEN_LOGIC_H
#define QUEEN_LOGIC_H
#include "common/str.h"
#include "common/util.h"
@ -224,7 +224,7 @@ public:
protected:
void initialise();
void readQueenJas();
void asmMakeJoeUseDress();
void asmMakeJoeUseNormalClothes();

4
engines/queen/music.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENMUSIC_H
#define QUEENMUSIC_H
#ifndef QUEEN_MUSIC_H
#define QUEEN_MUSIC_H
#include "common/util.h"
#include "sound/mididrv.h"

2
engines/queen/queen.cpp
View File

@ -80,7 +80,7 @@ DetectedGameList Engine_QUEEN_detectGames(const FSList &fslist) {
}
Queen::DetectedGameVersion version;
if (Queen::Resource::detectVersion(&version, &dataFile)) {
DetectedGame dg(queenGameDescriptor.gameid, queenGameDescriptor.description, version.language, Common::kPlatformPC);
DetectedGame dg(queenGameDescriptor, version.language, Common::kPlatformPC);
if (version.features & Queen::GF_DEMO) {
dg.updateDesc("Demo");
} else if (version.features & Queen::GF_INTERVIEW) {

12
engines/queen/resource.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENRESOURCE_H
#define QUEENRESOURCE_H
#ifndef QUEEN_RESOURCE_H
#define QUEEN_RESOURCE_H
#include "common/file.h"
#include "common/util.h"
@ -73,10 +73,10 @@ public:
//! returns a reference to a sound file
Common::File *giveCompressedSound(const char *filename, uint32 *size);
bool isDemo() const { return _version.features & GF_DEMO; }
bool isInterview() const { return _version.features & GF_INTERVIEW; }
bool isFloppy() const { return _version.features & GF_FLOPPY; }
bool isCD() const { return _version.features & GF_TALKIE; }
bool isDemo() const { return (_version.features & GF_DEMO) != 0; }
bool isInterview() const { return (_version.features & GF_INTERVIEW) != 0; }
bool isFloppy() const { return (_version.features & GF_FLOPPY) != 0; }
bool isCD() const { return (_version.features & GF_TALKIE) != 0; }
//! returns compression type for audio files
uint8 getCompression() const { return _version.compression; }

4
engines/queen/sound.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENSOUND_H
#define QUEENSOUND_H
#ifndef QUEEN_SOUND_H
#define QUEEN_SOUND_H
#include "common/util.h"
#include "sound/mixer.h"

4
engines/queen/state.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENSTATE_H
#define QUEENSTATE_H
#ifndef QUEEN_STATE_H
#define QUEEN_STATE_H
#include "common/util.h"
#include "queen/defs.h"

4
engines/queen/structs.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENSTRUCTS_H
#define QUEENSTRUCTS_H
#ifndef QUEEN_STRUCTS_H
#define QUEEN_STRUCTS_H
#include "queen/defs.h"
#include "common/endian.h"

4
engines/queen/walk.h
View File

@ -20,8 +20,8 @@
*
*/
#ifndef QUEENWALK_H
#define QUEENWALK_H
#ifndef QUEEN_WALK_H
#define QUEEN_WALK_H
#include "common/util.h"
#include "queen/structs.h"