Skip to content

Commit

Permalink
HOPKINS: Some more function renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Dec 10, 2012
1 parent 663bf31 commit 269a6f9
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 96 deletions.
4 changes: 2 additions & 2 deletions engines/hopkins/anim.cpp
View file
Expand Up @@ -790,8 +790,8 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {
int height;
do {
ptr = v4;
width = _vm->_objectsManager.Get_Largeur(v4, v8);
height = _vm->_objectsManager.Get_Hauteur(ptr, v8);
width = _vm->_objectsManager.getWidth(v4, v8);
height = _vm->_objectsManager.getHeight(ptr, v8);
v4 = ptr;
if (!width && !height)
loopCond = true;
Expand Down
91 changes: 48 additions & 43 deletions engines/hopkins/dialogs.cpp
View file
Expand Up @@ -37,10 +37,10 @@ namespace Hopkins {

DialogsManager::DialogsManager() {
INVENTFLAG = false;
AFFINVEN = false;
_inventDisplayedFl = false;
VIRE_INVENT = false;
inventairex = inventairey = 0;
inventairel = inventaireh = 0;
_inventX = _inventY = 0;
_inventWidth = _inventHeight = 0;
Winventaire = NULL;
inventaire2 = g_PTRNUL;
}
Expand Down Expand Up @@ -302,7 +302,7 @@ void DialogsManager::showOptionsDialog() {
}

void DialogsManager::showInventory() {
if (!VIRE_INVENT && !AFFINVEN && !_vm->_globals.DESACTIVE_INVENT) {
if (!VIRE_INVENT && !_inventDisplayedFl && !_vm->_globals.DESACTIVE_INVENT) {
_vm->_graphicsManager.no_scroll = 1;
_vm->_objectsManager.FLAG_VISIBLE_EFFACE = 4;
_vm->_objectsManager.FLAG_VISIBLE = false;
Expand Down Expand Up @@ -343,13 +343,12 @@ void DialogsManager::showInventory() {

_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "INVENT2.SPR");
inventaire2 = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
int v19 = _vm->_graphicsManager.ofscroll + 152;
int v18 = _vm->_objectsManager.Get_Largeur(_vm->_dialogsManager.Winventaire, 0);
int v17 = _vm->_objectsManager.Get_Hauteur(_vm->_dialogsManager.Winventaire, 0);
inventairex = v19;
inventairey = 114;
inventairel = v18;
inventaireh = v17;

int v19 = _inventX = _vm->_graphicsManager.ofscroll + 152;
_inventY = 114;
int v18 = _inventWidth = _vm->_objectsManager.getWidth(_vm->_dialogsManager.Winventaire, 0);
int v17 = _inventHeight = _vm->_objectsManager.getHeight(_vm->_dialogsManager.Winventaire, 0);

_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_BUFFER, _vm->_dialogsManager.Winventaire,
v19 + 300, 414, 0, 0, 0, 0);
int v15 = 0;
Expand All @@ -369,15 +368,15 @@ void DialogsManager::showInventory() {
};
v15 += 38;
}
_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager.VESA_BUFFER, _vm->_dialogsManager.Winventaire, inventairex, inventairey, inventairel, inventaireh);
_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager.VESA_BUFFER, _vm->_dialogsManager.Winventaire, _inventX, _inventY, _inventWidth, _inventHeight);
_vm->_eventsManager.souris_bb = 0;
bool v20 = false;
int v13 = 0;

// Main loop to select an inventory item
while (!_vm->shouldQuit()) {
// Turn on drawing the inventory dialog in the event manager
AFFINVEN = true;
_inventDisplayedFl = true;

int v8 = _vm->_eventsManager.XMOUSE();
int v9 = _vm->_eventsManager.YMOUSE();
Expand Down Expand Up @@ -430,7 +429,7 @@ void DialogsManager::showInventory() {
goto LABEL_7;
}
} else if (!v20) {
AFFINVEN = true;
_inventDisplayedFl = true;
}
}
}
Expand All @@ -443,8 +442,8 @@ void DialogsManager::showInventory() {
_vm->_objectsManager.SPECIAL_JEU();
}
_vm->_fontManager.TEXTE_OFF(9);
if (AFFINVEN) {
AFFINVEN = false;
if (_inventDisplayedFl) {
_inventDisplayedFl = false;
// v9 = 114;
_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, v19, 114, v18, v17, _vm->_graphicsManager.VESA_BUFFER, v19, 114);
_vm->_graphicsManager.Ajoute_Segment_Vesa(v19, 114, v19 + v18, v18 + 114);
Expand All @@ -456,10 +455,10 @@ void DialogsManager::showInventory() {

if (_vm->_eventsManager.btsouris == 1)
showOptionsDialog();
if (_vm->_eventsManager.btsouris == 3)
_vm->_dialogsManager.CHARGE_PARTIE();
if (_vm->_eventsManager.btsouris == 2)
_vm->_dialogsManager.SAUVE_PARTIE();
else if (_vm->_eventsManager.btsouris == 3)
_vm->_dialogsManager.showLoadGame();
else if (_vm->_eventsManager.btsouris == 2)
_vm->_dialogsManager.showSaveGame();

_vm->_eventsManager.btsouris = 4;
_vm->_eventsManager.CHANGE_MOUSE(4);
Expand Down Expand Up @@ -515,7 +514,10 @@ void DialogsManager::INVENT_ANIM() {
}
}

void DialogsManager::TestForDialogOpening() {
/**
* Test dialog opening
*/
void DialogsManager::testDialogOpening() {
if (_vm->_globals.PLAN_FLAG)
_vm->_eventsManager.GAME_KEY = KEY_NONE;

Expand All @@ -536,12 +538,12 @@ void DialogsManager::TestForDialogOpening() {
break;
case KEY_LOAD:
_vm->_graphicsManager.no_scroll = 1;
_vm->_dialogsManager.CHARGE_PARTIE();
_vm->_dialogsManager.showLoadGame();
_vm->_graphicsManager.no_scroll = 0;
break;
case KEY_SAVE:
_vm->_graphicsManager.no_scroll = 1;
_vm->_dialogsManager.SAUVE_PARTIE();
_vm->_dialogsManager.showSaveGame();
_vm->_graphicsManager.no_scroll = 0;
break;
default:
Expand All @@ -554,15 +556,17 @@ void DialogsManager::TestForDialogOpening() {
}
}

// Load Game
void DialogsManager::CHARGE_PARTIE() {
/**
* Load Game dialog
*/
void DialogsManager::showLoadGame() {
int slotNumber;

_vm->_eventsManager.VBL();
LOAD_SAUVE(2);
showSaveLoad(2);
do {
do {
slotNumber = CHERCHE_PARTIE();
slotNumber = searchSavegames();
_vm->_eventsManager.VBL();
} while (_vm->_eventsManager.BMOUSE() != 1);
} while (!slotNumber);
Expand All @@ -582,17 +586,19 @@ void DialogsManager::CHARGE_PARTIE() {
_vm->_objectsManager.CHANGE_OBJET(14);
}

// Save Game
void DialogsManager::SAUVE_PARTIE() {
/**
* Save Game dialog
*/
void DialogsManager::showSaveGame() {
int slotNumber;
Common::String saveName;

_vm->_eventsManager.VBL();

LOAD_SAUVE(1);
showSaveLoad(1);
do {
do {
slotNumber = CHERCHE_PARTIE();
slotNumber = searchSavegames();
_vm->_eventsManager.VBL();
} while (!_vm->shouldQuit() && _vm->_eventsManager.BMOUSE() != 1);
} while (!_vm->shouldQuit() && !slotNumber);
Expand All @@ -615,9 +621,10 @@ void DialogsManager::SAUVE_PARTIE() {
}
}


// Load Save
void DialogsManager::LOAD_SAUVE(int a1) {
/**
* Load/Save dialog
*/
void DialogsManager::showSaveLoad(int a1) {
int slotNumber;
hopkinsSavegameHeader header;
byte *thumb;
Expand Down Expand Up @@ -692,15 +699,13 @@ void DialogsManager::LOAD_SAUVE(int a1) {
_vm->_objectsManager.SL_Y = 0;
}

// Search Game
int DialogsManager::CHERCHE_PARTIE() {
int slotNumber;
int xp;
int yp;

slotNumber = 0;
xp = _vm->_eventsManager.XMOUSE();
yp = _vm->_eventsManager.YMOUSE();
/**
* Search savegames
*/
int DialogsManager::searchSavegames() {
int slotNumber = 0;
int xp = _vm->_eventsManager.XMOUSE();
int yp = _vm->_eventsManager.YMOUSE();

_vm->_graphicsManager.ofscroll = _vm->_eventsManager.start_x;
if ((uint16)(yp - 112) <= 0x56u) {
Expand Down
18 changes: 9 additions & 9 deletions engines/hopkins/dialogs.h
View file
Expand Up @@ -38,27 +38,27 @@ class DialogsManager {
private:
HopkinsEngine *_vm;
public:
int _inventX, _inventY;
int _inventWidth, _inventHeight;

bool INVENTFLAG;
bool AFFINVEN;
bool _inventDisplayedFl;
bool VIRE_INVENT;
int inventairex, inventairey;
int inventairel, inventaireh;
byte *Winventaire;
byte *inventaire2;
public:
DialogsManager();
~DialogsManager();
void setParent(HopkinsEngine *vm);

void showLoadGame();
void showSaveGame();
void showSaveLoad(int a1);
void showOptionsDialog();
void showInventory();
int searchSavegames();
void testDialogOpening();

void INVENT_ANIM();
void TestForDialogOpening();
void CHARGE_PARTIE();
void SAUVE_PARTIE();
void LOAD_SAUVE(int a1);
int CHERCHE_PARTIE();
};

} // End of namespace Hopkins
Expand Down
12 changes: 6 additions & 6 deletions engines/hopkins/font.cpp
View file
Expand Up @@ -254,7 +254,7 @@ void FontManager::BOITE(int idx, int messageId, const Common::String &filename,
byte v16 = *(v60 + v15);
if ((byte)v16 <= 0x1Fu)
v16 = 32;
_vm->_globals.largeur_boite += _vm->_objectsManager.Get_Largeur(_vm->_globals.police, (byte)v16 - 32);
_vm->_globals.largeur_boite += _vm->_objectsManager.getWidth(_vm->_globals.police, (byte)v16 - 32);
}
}
_vm->_globals.largeur_boite += 2;
Expand Down Expand Up @@ -327,7 +327,7 @@ void FontManager::BOITE(int idx, int messageId, const Common::String &filename,
byte v24 = (v23 >= (int)line.size()) ? '\0' : line.c_str()[v23];
if ((byte)v24 <= 0x1Fu)
v24 = 32;
ptrc += _vm->_objectsManager.Get_Largeur(_vm->_globals.police, (byte)v24 - 32);
ptrc += _vm->_objectsManager.getWidth(_vm->_globals.police, (byte)v24 - 32);
}
}
TRIER_TEXT[i] = ptrc;
Expand Down Expand Up @@ -450,7 +450,7 @@ void FontManager::TEXT_NOW(int xp, int yp, const Common::String &message, int co
charIndex = currChar - 32;
_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.police,
currentX, yp, currChar - 32, col);
currentX += _vm->_objectsManager.Get_Largeur(_vm->_globals.police, charIndex);
currentX += _vm->_objectsManager.getWidth(_vm->_globals.police, charIndex);
}
}

Expand All @@ -466,7 +466,7 @@ void FontManager::TEXT_NOW1(int xp, int yp, const Common::String &message, int c
int characterIndex = currentChar - 32;
_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.police,
xp, yp, characterIndex, col);
xp += _vm->_objectsManager.Get_Largeur(_vm->_globals.police, characterIndex);
xp += _vm->_objectsManager.getWidth(_vm->_globals.police, characterIndex);
}
}
}
Expand Down Expand Up @@ -497,8 +497,8 @@ void FontManager::TEXT_COMPUT(int xp, int yp, const Common::String &msg, int col
if (v7 >= 32) {
v5 = v7 - 32;
_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.police, v9, yp, v7 - 32, fontCol);
v9 += _vm->_objectsManager.Get_Largeur(_vm->_globals.police, v5);
v6 = _vm->_objectsManager.Get_Largeur(_vm->_globals.police, v5);
v9 += _vm->_objectsManager.getWidth(_vm->_globals.police, v5);
v6 = _vm->_objectsManager.getWidth(_vm->_globals.police, v5);
_vm->_graphicsManager.Ajoute_Segment_Vesa(v9 - v6, yp, v9, yp + 12);
if (_vm->_eventsManager.ESC_KEY) {
_vm->_globals.iRegul = 1;
Expand Down
4 changes: 2 additions & 2 deletions engines/hopkins/globals.cpp
View file
Expand Up @@ -604,8 +604,8 @@ void Globals::CHARGE_CACHE(const Common::String &file) {
if (spriteData == g_PTRNUL) {
Cache[i].fieldA = 0;
} else {
int v8 = _vm->_objectsManager.Get_Largeur(spriteData, v11);
int v9 = _vm->_objectsManager.Get_Hauteur(spriteData, v11);
int v8 = _vm->_objectsManager.getWidth(spriteData, v11);
int v9 = _vm->_objectsManager.getHeight(spriteData, v11);
Cache[i].fieldC = spriteData;
Cache[i].field6 = v8;
Cache[i].field8 = v9;
Expand Down
8 changes: 4 additions & 4 deletions engines/hopkins/graphics.cpp
View file
Expand Up @@ -1636,8 +1636,8 @@ void GraphicsManager::Affiche_Segment_Vesa() {
void GraphicsManager::AFFICHE_SPEEDVGA(const byte *objectData, int xp, int yp, int idx) {
int height, width;

width = _vm->_objectsManager.Get_Largeur(objectData, idx);
height = _vm->_objectsManager.Get_Hauteur(objectData, idx);
width = _vm->_objectsManager.getWidth(objectData, idx);
height = _vm->_objectsManager.getHeight(objectData, idx);
if (*objectData == 78) {
Affiche_Perfect(VESA_SCREEN, objectData, xp + 300, yp + 300, idx, 0, 0, 0);
Affiche_Perfect(VESA_BUFFER, objectData, xp + 300, yp + 300, idx, 0, 0, 0);
Expand Down Expand Up @@ -2161,8 +2161,8 @@ void GraphicsManager::Affiche_Perfect(byte *surface, const byte *srcData, int xp
void GraphicsManager::AFFICHE_SPEED(const byte *spriteData, int xp, int yp, int spriteIndex) {
int width, height;

width = _vm->_objectsManager.Get_Largeur(spriteData, spriteIndex);
height = _vm->_objectsManager.Get_Hauteur(spriteData, spriteIndex);
width = _vm->_objectsManager.getWidth(spriteData, spriteIndex);
height = _vm->_objectsManager.getHeight(spriteData, spriteIndex);
if (*spriteData == 78) {
Affiche_Perfect(VESA_SCREEN, spriteData, xp + 300, yp + 300, spriteIndex, 0, 0, 0);
Affiche_Perfect(VESA_BUFFER, spriteData, xp + 300, yp + 300, spriteIndex, 0, 0, 0);
Expand Down
4 changes: 2 additions & 2 deletions engines/hopkins/hopkins.cpp
View file
Expand Up @@ -3603,7 +3603,7 @@ void HopkinsEngine::CREDIT_AFFICHE(int startPosY, byte *buffer, char colour) {
if (!curChar)
break;
if (curChar > 31)
strWidth += _objectsManager.Get_Largeur(_globals.police, curChar - 32);
strWidth += _objectsManager.getWidth(_globals.police, curChar - 32);
}
int startPosX = 320 - strWidth / 2;
int endPosX = strWidth + startPosX;
Expand All @@ -3630,7 +3630,7 @@ void HopkinsEngine::CREDIT_AFFICHE(int startPosY, byte *buffer, char colour) {
break;
if (curChar > 31) {
_graphicsManager.Affiche_Fonte(_graphicsManager.VESA_BUFFER, _globals.police, startPosX, startPosY, curChar - 32, colour);
startPosX += _objectsManager.Get_Largeur(_globals.police, curChar - 32);
startPosX += _objectsManager.getWidth(_globals.police, curChar - 32);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/menu.cpp
View file
Expand Up @@ -192,7 +192,7 @@ int MenuManager::MENU() {
_vm->_eventsManager.delay(200);

_vm->_globals.SORTIE = -1;
_vm->_dialogsManager.CHARGE_PARTIE();
_vm->_dialogsManager.showLoadGame();

if (_vm->_globals.SORTIE != -1) {
result = _vm->_globals.SORTIE;
Expand Down

0 comments on commit 269a6f9

Please sign in to comment.