Skip to content

Commit

Permalink
TONY: Translate some Italian terms, rename enums
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Jun 16, 2012
1 parent 37f772c commit 638b066
Show file tree
Hide file tree
Showing 12 changed files with 267 additions and 271 deletions.
420 changes: 208 additions & 212 deletions engines/tony/custom.cpp
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions engines/tony/font.h
View file
Expand Up @@ -178,22 +178,22 @@ class RMText : public RMGfxWoodyBuffer {
int _maxLineLength;

public:
enum HORALIGN {
enum HorAlign {
HLEFT,
HLEFTPAR,
HCENTER,
HRIGHT
};

enum VERALIGN {
enum VerAlign {
VTOP,
VCENTER,
VBOTTOM
};

private:
HORALIGN _aHorType;
VERALIGN _aVerType;
HorAlign _aHorType;
VerAlign _aVerType;
byte _textR, _textG, _textB;

protected:
Expand All @@ -206,7 +206,7 @@ class RMText : public RMGfxWoodyBuffer {
static void unload();

// Set the alignment type
void setAlignType(HORALIGN aHor, VERALIGN aVer) {
void setAlignType(HorAlign aHor, VerAlign aVer) {
_aHorType = aHor;
_aVerType = aVer;
}
Expand Down
2 changes: 1 addition & 1 deletion engines/tony/game.cpp
View file
Expand Up @@ -1003,7 +1003,7 @@ int RMOptionScreen::priority() {
return 190;
}

void RMOptionScreen::changeState(CORO_PARAM, STATE newState) {
void RMOptionScreen::changeState(CORO_PARAM, OptionScreenState newState) {
CORO_BEGIN_CONTEXT;
CORO_END_CONTEXT(_ctx);

Expand Down
26 changes: 13 additions & 13 deletions engines/tony/game.h
View file
Expand Up @@ -70,7 +70,7 @@ class RMPointer {
void updateCursor();

public:
enum POINTER {
enum PointerType {
PTR_NONE = 0,
PTR_FRECCIASU,
PTR_FRECCIAGIU,
Expand Down Expand Up @@ -107,15 +107,15 @@ class RMPointer {
}

// Sets a new pointer
void setSpecialPointer(POINTER ptr) {
void setSpecialPointer(PointerType ptr) {
_nCurSpecialPointer = ptr;
if (_nCurSpecialPointer && _nCurSpecialPointer != PTR_CUSTOM)
_specialPointer[ptr - 1]->setPattern(1);

updateCursor();
}
POINTER getSpecialPointer(void) {
return (POINTER)_nCurSpecialPointer;
PointerType getSpecialPointer(void) {
return (PointerType)_nCurSpecialPointer;
}

// Set the new custom pointer
Expand Down Expand Up @@ -251,17 +251,17 @@ class RMOptionScreen : public RMGfxWoodyBuffer {
bool _bNoLoadSave;
bool _bAlterGfx;

enum STATE {
MENUGAME,
MENUGFX,
MENUSOUND,
MENULOAD,
MENUSAVE,
enum OptionScreenState {
MENUGAME,
MENUGFX,
MENUSOUND,
MENULOAD,
MENUSAVE,
MENUNONE
};

STATE _nState;
STATE _nLastState;
OptionScreenState _nState;
OptionScreenState _nLastState;

public:
RMOptionScreen();
Expand Down Expand Up @@ -291,7 +291,7 @@ class RMOptionScreen : public RMGfxWoodyBuffer {
// Initialisation and state change
void initState(CORO_PARAM);
void closeState(void);
void changeState(CORO_PARAM, STATE newState);
void changeState(CORO_PARAM, OptionScreenState newState);

// Repaint the options menu
void refreshAll(CORO_PARAM);
Expand Down
4 changes: 2 additions & 2 deletions engines/tony/globals.cpp
View file
Expand Up @@ -80,9 +80,9 @@ Globals::Globals() {
_nCfgSFXVolume = 0;
_bIdleExited = false;
_bSkipSfxNoLoop = false;
_bNoOcchioDiBue = false;
_bNoBullsEye = false;
_curDialog = 0;
_curSonoriz = 0;
_curSoundEffect = 0;
_bFadeOutStop = false;

// OSystem::MutexRef vdb;
Expand Down
20 changes: 10 additions & 10 deletions engines/tony/globals.h
View file
Expand Up @@ -35,13 +35,13 @@

namespace Tony {

#define T_GRILLI 1
#define T_GRILLIOV 2
#define T_GRILLIVENTO 3
#define T_GRILLIVENTO1 4
#define T_VENTO 5
#define T_MARE 6
#define T_MAREMETA 7
#define TAPPETI_GRILLI 1
#define TAPPETI_GRILLIOV 2
#define TAPPETI_GRILLIVENTO 3
#define TAPPETI_GRILLIVENTO1 4
#define TAPPETI_VENTO 5
#define TAPPETI_MARE 6
#define TAPPETI_MAREMETA 7


#define MAX_PATH 255
Expand Down Expand Up @@ -207,9 +207,9 @@ class Globals {
int _nCfgSFXVolume;
bool _bSkipSfxNoLoop;
bool _bIdleExited;
bool _bNoOcchioDiBue;
bool _bNoBullsEye;
int _curDialog;
int _curSonoriz;
int _curSoundEffect;
bool _bFadeOutStop;

RMTony *_tony;
Expand Down Expand Up @@ -237,7 +237,7 @@ class Globals {
uint32 _dwTonyNumTexts;
bool _bTonyInTexts;
bool _bStaticTalk;
RMTony::TALKTYPE _nTonyNextTalkType;
RMTony::CharacterTalkType _nTonyNextTalkType;

RMPoint _startLocPos[256];
uint32 _mut[10];
Expand Down
4 changes: 2 additions & 2 deletions engines/tony/inventory.h
View file
Expand Up @@ -46,7 +46,7 @@ struct RMInventoryItem {

class RMInventory : public RMGfxWoodyBuffer {
private:
enum STATE {
enum InventoryState {
CLOSED,
OPENING,
OPENED,
Expand All @@ -64,7 +64,7 @@ class RMInventory : public RMGfxWoodyBuffer {
uint32 _curPutTime;

int _curPos;
STATE _state;
InventoryState _state;
bool _bHasFocus;
int _nSelectObj;
int _nCombine;
Expand Down
10 changes: 5 additions & 5 deletions engines/tony/loc.h
View file
Expand Up @@ -314,7 +314,7 @@ class RMItem : public RMGfxTask {

class RMBox {
public:
struct T_HOTSPOT {
struct Hotspot {
int _hotx, _hoty; // Hotspot coordinates
int _destination; // Hotspot destination
};
Expand All @@ -324,7 +324,7 @@ class RMBox {
int _adj[MAXBOXES]; // List of adjacent bounding boxes
int _numHotspot; // Hotspot number
uint8 _destZ; // Z value for the bounding box
T_HOTSPOT _hotspot[MAXHOTSPOT]; // List of hotspots
Hotspot _hotspot[MAXHOTSPOT]; // List of hotspots

bool _bActive;
bool _bReversed;
Expand Down Expand Up @@ -388,7 +388,7 @@ class RMGameBoxes {

class RMCharacter : protected RMItem {
public:
enum PATTERNS {
enum Patterns {
PAT_STANDUP = 1,
PAT_STANDDOWN,
PAT_STANDLEFT,
Expand All @@ -400,7 +400,7 @@ class RMCharacter : protected RMItem {
};

private:
enum STATUS {
enum CharacterStatus {
STAND,
WALK
};
Expand All @@ -416,7 +416,7 @@ class RMCharacter : protected RMItem {
short _pathLength, _pathCount;
int _curBox;

STATUS _status;
CharacterStatus _status;
int _curSpeed;
bool _bEndOfPath;
uint32 _hEndOfPath;
Expand Down
2 changes: 1 addition & 1 deletion engines/tony/sound.h
View file
Expand Up @@ -44,7 +44,7 @@ namespace Tony {
class FPSTREAM;
class FPSFX;

enum CODECS {
enum SoundCodecs {
FPCODEC_RAW,
FPCODEC_ADPCM
};
Expand Down
4 changes: 2 additions & 2 deletions engines/tony/tony.h
View file
Expand Up @@ -104,7 +104,7 @@ class TonyEngine : public Engine {
Globals _globals;
Debugger *_debugger;

enum DATADIR {
enum DataDir {
DD_BASE = 1,
DD_SAVE,
DD_SHOTS,
Expand Down Expand Up @@ -161,7 +161,7 @@ class TonyEngine : public Engine {
void close();
void abortGame();

void getDataDirectory(DATADIR dir, char *path);
void getDataDirectory(DataDir dir, char *path);

void switchFullscreen(bool bFull);
void optionScreen(void);
Expand Down
12 changes: 6 additions & 6 deletions engines/tony/tonychar.cpp
View file
Expand Up @@ -550,7 +550,7 @@ void RMTony::put(int nWhere, int nPart) {
}


bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &bodyStartPat,
bool RMTony::startTalkCalculate(CharacterTalkType nTalkType, int &headStartPat, int &bodyStartPat,
int &headLoopPat, int &bodyLoopPat) {
assert(!_bIsTalking);

Expand Down Expand Up @@ -1109,7 +1109,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
return true;
}

void RMTony::startTalk(CORO_PARAM, TALKTYPE nTalkType) {
void RMTony::startTalk(CORO_PARAM, CharacterTalkType nTalkType) {
CORO_BEGIN_CONTEXT;
int headStartPat, bodyStartPat;
int headLoopPat, bodyLoopPat;
Expand Down Expand Up @@ -1518,7 +1518,7 @@ void RMTony::endTalk(CORO_PARAM) {
CORO_END_CODE;
}

void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat,
void RMTony::startStaticCalculate(CharacterTalkType nTalk, int &headPat, int &headLoopPat,
int &bodyStartPat, int &bodyLoopPat) {
int nPat = getCurPattern();

Expand Down Expand Up @@ -1725,7 +1725,7 @@ void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat
}
}

void RMTony::startStatic(CORO_PARAM, TALKTYPE nTalk) {
void RMTony::startStatic(CORO_PARAM, CharacterTalkType nTalk) {
CORO_BEGIN_CONTEXT;
int headPat, headLoopPat;
int bodyStartPat, bodyLoopPat;
Expand Down Expand Up @@ -1760,7 +1760,7 @@ void RMTony::startStatic(CORO_PARAM, TALKTYPE nTalk) {
}


void RMTony::endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat, int &headEndPat) {
void RMTony::endStaticCalculate(CharacterTalkType nTalk, int &bodyEndPat, int &finalPat, int &headEndPat) {
switch (_talkDirection) {
case UP:
case LEFT:
Expand Down Expand Up @@ -1896,7 +1896,7 @@ void RMTony::endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat,
}
}

void RMTony::endStatic(CORO_PARAM, TALKTYPE nTalk) {
void RMTony::endStatic(CORO_PARAM, CharacterTalkType nTalk) {
CORO_BEGIN_CONTEXT;
int bodyEndPat;
int finalPat;
Expand Down
24 changes: 12 additions & 12 deletions engines/tony/tonychar.h
View file
Expand Up @@ -36,12 +36,12 @@ namespace Tony {

class RMTony : public RMCharacter {
private:
enum DIRECTION {
enum CharacterDirection {
UP, DOWN, LEFT, RIGHT
};

public:
enum TALKTYPE {
enum CharacterTalkType {
TALK_NORMAL,
TALK_FIANCHI,
TALK_SING,
Expand Down Expand Up @@ -97,8 +97,8 @@ class RMTony : public RMCharacter {
bool _bIsStaticTalk;
bool _bIsTalking;
int _nPatB4Talking;
TALKTYPE _nTalkType;
DIRECTION _talkDirection;
CharacterTalkType _nTalkType;
CharacterDirection _talkDirection;
RMPoint _nBodyOffset;

int _nTimeLastStep;
Expand All @@ -114,7 +114,7 @@ class RMTony : public RMCharacter {
static void waitEndOfAction(CORO_PARAM, const void *param);

public:
enum PATTERNS {
enum CharacterPatterns {
PAT_TAKEUP_UP1 = 9,
PAT_TAKEUP_UP2,
PAT_TAKEUP_MID1,
Expand Down Expand Up @@ -247,7 +247,7 @@ class RMTony : public RMCharacter {
PAT_WITHSECRETARY
};

enum BODYPATTERNS {
enum CharacterBodyPatterns {
BPAT_STANDUP = 1,
BPAT_STANDDOWN,
BPAT_STANDLEFT,
Expand Down Expand Up @@ -421,18 +421,18 @@ class RMTony : public RMCharacter {
void put(int nWhere, int nPart);

// Start or End Talk
bool startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &bodyStartPat,
bool startTalkCalculate(CharacterTalkType nTalkType, int &headStartPat, int &bodyStartPat,
int &headLoopPat, int &bodyLoopPat);
void startTalk(CORO_PARAM, TALKTYPE nTalkType);
void startTalk(CORO_PARAM, CharacterTalkType nTalkType);
bool endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPat, int &finalPat, bool &bStatic);
void endTalk(CORO_PARAM);

// Start or End Static
void startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat,
void startStaticCalculate(CharacterTalkType nTalk, int &headPat, int &headLoopPat,
int &bodyStartPat, int &bodyLoopPat);
void startStatic(CORO_PARAM, TALKTYPE nTalkType);
void endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat, int &headEndPat);
void endStatic(CORO_PARAM, TALKTYPE nTalkType);
void startStatic(CORO_PARAM, CharacterTalkType nTalkType);
void endStaticCalculate(CharacterTalkType nTalk, int &bodyEndPat, int &finalPat, int &headEndPat);
void endStatic(CORO_PARAM, CharacterTalkType nTalkType);

// Tony disguises himself!
void setShepherdess(bool bIsPast) {
Expand Down

0 comments on commit 638b066

Please sign in to comment.