thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MORTEVIELLE: Remove some useless g_vm uses, some more renaming

Browse source
This commit is contained in:
Strangerke 2012-03-14 23:29:42 +01:00
parent 0919546917
commit 01e899b965
4 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

45
engines/mortevielle/mor.cpp
View file

@ -1106,14 +1106,14 @@ int MortevielleEngine::setPresenceLanding() {
int rand = 0; int rand = 0;
do { do {
rand = getRandomNumber(1, 8); rand = getRandomNumber(1, 8);
test = (((rand == 1) && (g_vm->_purpleRoomPresenceLeo || g_vm->_room9PresenceLeo)) || test = (((rand == 1) && (_purpleRoomPresenceLeo || _room9PresenceLeo)) ||
((rand == 2) && g_vm->_roomPresencePat) || ((rand == 2) && _roomPresencePat) ||
((rand == 3) && g_vm->_roomPresenceGuy) || ((rand == 3) && _roomPresenceGuy) ||
((rand == 4) && g_vm->_roomPresenceEva) || ((rand == 4) && _roomPresenceEva) ||
((rand == 5) && g_vm->_roomPresenceBob) || ((rand == 5) && _roomPresenceBob) ||
((rand == 6) && g_vm->_roomPresenceLuc) || ((rand == 6) && _roomPresenceLuc) ||
((rand == 7) && g_vm->_roomPresenceIda) || ((rand == 7) && _roomPresenceIda) ||
((rand == 8) && g_vm->_roomPresenceMax)); ((rand == 8) && _roomPresenceMax));
} while (test); } while (test);
int retVal = convertCharacterIndexToBitIndex(rand); int retVal = convertCharacterIndexToBitIndex(rand);
@ -1404,7 +1404,7 @@ void MortevielleEngine::setRandomPresencePurpleRoom(int cf) {
* @remarks Originally called 'pl5' * @remarks Originally called 'pl5'
*/ */
void MortevielleEngine::setRandomPresenceBlueRoom(int cf) { void MortevielleEngine::setRandomPresenceBlueRoom(int cf) {
if (!g_vm->_roomPresenceMax) { if (!_roomPresenceMax) {
int p = getPresenceStatsBlueRoom(); int p = getPresenceStatsBlueRoom();
int rand; int rand;
@ -2032,7 +2032,11 @@ bool MortevielleEngine::checkInventory(int objectId) {
return retVal; return retVal;
} }
void st1sama() { /**
* Engine function - Display Dining Room
* @remarks Originally called 'st1sama'
*/
void MortevielleEngine::displayDiningRoom() {
g_s._currPlace = DINING_ROOM; g_s._currPlace = DINING_ROOM;
affrep(); affrep();
} }
@ -2141,13 +2145,13 @@ void MortevielleEngine::gotoDiningRoom() {
g_crep = 1511; g_crep = 1511;
loseGame(); loseGame();
} else } else
st1sama(); displayDiningRoom();
} else if (!g_s._alreadyEnteredManor) { //Is it your first time? } else if (!g_s._alreadyEnteredManor) { //Is it your first time?
_currBitIndex = 255; // Everybody is present _currBitIndex = 255; // Everybody is present
g_vm->showPeoplePresent(_currBitIndex); showPeoplePresent(_currBitIndex);
g_caff = 77; g_caff = 77;
afdes(0); afdes(0);
g_vm->_screenSurface.drawBox(223, 47, 155, 91, 15); _screenSurface.drawBox(223, 47, 155, 91, 15);
repon(2, 33); repon(2, 33);
tkey1(false); tkey1(false);
mennor(); mennor();
@ -2160,19 +2164,14 @@ void MortevielleEngine::gotoDiningRoom() {
showMouse(); showMouse();
g_s._currPlace = OWN_ROOM; g_s._currPlace = OWN_ROOM;
affrep(); affrep();
g_vm->resetPresenceInRooms(DINING_ROOM); resetPresenceInRooms(DINING_ROOM);
if (!g_vm->_blo) if (!_blo)
minute = t11(OWN_ROOM); minute = t11(OWN_ROOM);
_currBitIndex = 0; _currBitIndex = 0;
g_mpers = 0; g_mpers = 0;
g_s._alreadyEnteredManor = true; g_s._alreadyEnteredManor = true;
} else } else
st1sama(); displayDiningRoom();
}
void t1vier() {
g_s._currPlace = SECRET_PASSAGE;
affrep();
} }
/** /**
@ -2216,7 +2215,7 @@ void MortevielleEngine::gotoManorBack() {
*/ */
void MortevielleEngine::floodedInWell() { void MortevielleEngine::floodedInWell() {
g_crep = 1503; g_crep = 1503;
g_vm->loseGame(); loseGame();
} }
void tctrm() { void tctrm() {
@ -2552,7 +2551,7 @@ void MortevielleEngine::gameLoaded() {
repon(2, g_crep); repon(2, g_crep);
clearScreenType3(); clearScreenType3();
_endGame = false; _endGame = false;
g_vm->_menu.setDestinationMenuText(g_s._currPlace); _menu.setDestinationMenuText(g_s._currPlace);
modinv(); modinv();
if (g_s._selectedObjectId != 0) if (g_s._selectedObjectId != 0)
modobj(g_s._selectedObjectId + 400); modobj(g_s._selectedObjectId + 400);

3
engines/mortevielle/mor.h
View file

@ -111,7 +111,7 @@ extern void affrep();
/* NIVEAU 6 */ /* NIVEAU 6 */
extern void tsort(); extern void tsort();
extern void st4(int ob); extern void st4(int ob);
extern void st1sama(); extern void displayDiningRoom();
extern void modinv(); extern void modinv();
extern void sparl(float adr, float rep); extern void sparl(float adr, float rep);
extern void endSearch(); extern void endSearch();
@ -120,7 +120,6 @@ extern void premtet();
/* NIVEAU 5 */ /* NIVEAU 5 */
extern void ajchai(); extern void ajchai();
extern void ajjer(int ob); extern void ajjer(int ob);
extern void t1vier();
extern void tctrm(); extern void tctrm();
extern void quelquun(); extern void quelquun();
extern void tsuiv(); extern void tsuiv();

2
engines/mortevielle/mortevielle.h
View file

@ -269,7 +269,7 @@ public:
bool checkInventory(int objectId); bool checkInventory(int objectId);
void loseGame(); void loseGame();
void floodedInWell(); void floodedInWell();
void displayDiningRoom();
}; };
extern MortevielleEngine *g_vm; extern MortevielleEngine *g_vm;

10
engines/mortevielle/saveload.cpp
View file

@ -48,9 +48,13 @@ Common::String SavegameManager::generateSaveName(int slotNumber) {
*/ */
void SavegameManager::sync_save(Common::Serializer &sz) { void SavegameManager::sync_save(Common::Serializer &sz) {
sz.syncAsSint16LE(g_s1._faithScore); sz.syncAsSint16LE(g_s1._faithScore);
sz.syncBytes((byte *)&g_s1._pourc[0], 11); for (int i = 0; i < 11; ++i)
sz.syncBytes((byte *)&g_s1._teauto[0], 43); sz.syncAsByte(g_s1._pourc[i]);
sz.syncBytes((byte *)&g_s1._sjer[0], 31); for (int i = 0; i < 43; ++i)
sz.syncAsByte(g_s1._teauto[i]);
for (int i = 0; i < 31; ++i)
sz.syncAsByte(g_s1._sjer[i]);
sz.syncAsSint16LE(g_s1._currPlace); sz.syncAsSint16LE(g_s1._currPlace);
sz.syncAsSint16LE(g_s1._atticBallHoleObjectId); sz.syncAsSint16LE(g_s1._atticBallHoleObjectId);
sz.syncAsSint16LE(g_s1._atticRodHoleObjectId); sz.syncAsSint16LE(g_s1._atticRodHoleObjectId);