TRECISION: Rename most flags

engines/trecision/inventory.cpp

@@ -104,7 +104,7 @@ void TrecisionEngine::moveInventoryRight() {
 void TrecisionEngine::doInventory() {
 	switch (_curMessage->_event) {
 	case ME_OPEN:
-		if (!_flagInventoryLocked && (_inventoryStatus == INV_OFF) && !FlagDialogActive) {
+		if (!_flagInventoryLocked && (_inventoryStatus == INV_OFF) && !_flagDialogActive) {
 			_inventoryCounter = INVENTORY_HIDE;
 			_inventorySpeedIndex = 0;
 			_inventoryStatus = INV_PAINT;
@@ -112,7 +112,7 @@ void TrecisionEngine::doInventory() {
 		break;
 
 	case ME_CLOSE:
-		if (!_flagInventoryLocked && (_inventoryStatus == INV_INACTION) && !FlagDialogActive) {
+		if (!_flagInventoryLocked && (_inventoryStatus == INV_INACTION) && !_flagDialogActive) {
 			_inventoryCounter = INVENTORY_SHOW;
 			_inventorySpeedIndex = 0;
 			_inventoryStatus = INV_DEPAINT;
@@ -135,9 +135,9 @@ void TrecisionEngine::doInventory() {
 		if (_curInventory == 0)
 			break;
 
-		if (FlagUseWithStarted) {
+		if (_flagUseWithStarted) {
 			_flagInventoryLocked = false;
-			FlagUseWithStarted = false;
+			_flagUseWithStarted = false;
 			_useWith[WITH] = _curInventory;
 			_useWithInv[WITH] = true;
 
@@ -158,7 +158,7 @@ void TrecisionEngine::doInventory() {
 			_lightIcon = _curInventory;
 			setInventoryStart(_iconBase, INVENTORY_SHOW);
 			_flagInventoryLocked = true;
-			FlagUseWithStarted = true;
+			_flagUseWithStarted = true;
 			_useWith[USED] = _curInventory;
 			_useWithInv[USED] = true;
 			showInventoryName(_curInventory, true);
@@ -170,9 +170,9 @@ void TrecisionEngine::doInventory() {
 		_curInventory = whatIcon(mx);
 		actorStop();
 		nextStep();
-		if (FlagUseWithStarted) {
+		if (_flagUseWithStarted) {
 			_flagInventoryLocked = false;
-			FlagUseWithStarted = false;
+			_flagUseWithStarted = false;
 			_useWith[WITH] = _curInventory;
 			_useWithInv[WITH] = true;
 			if (_useWith[USED] != _curInventory) {
@@ -194,14 +194,14 @@ void TrecisionEngine::doInventory() {
 			_curInventory = whatIcon(mx);
 			showInventoryName(_curInventory, true);
 
-			if (!FlagUseWithStarted && !FlagSomeOneSpeak) {
+			if (!_flagUseWithStarted && !_flagSomeoneSpeaks) {
 				setInventoryStart(_iconBase, INVENTORY_SHOW);
 			}
 		} else {
 			if (!isInventoryArea(my))
 				break;
 			showInventoryName(NO_OBJECTS, true);
-			if (!FlagUseWithStarted) {
+			if (!_flagUseWithStarted) {
 				_lightIcon = 0xFF;
 				setInventoryStart(_iconBase, INVENTORY_SHOW);
 			}
@@ -245,7 +245,7 @@ void TrecisionEngine::showInventoryName(uint16 obj, bool showhide) {
 	 || (_curRoom == rSYS) || (_curRoom == r12CU) || (_curRoom == r13CU))
 		return;
 
-	if (FlagSomeOneSpeak)
+	if (_flagSomeoneSpeaks)
 		return;
 
 	if (_lastObj) {
@@ -253,7 +253,7 @@ void TrecisionEngine::showInventoryName(uint16 obj, bool showhide) {
 		_lastObj = 0;
 	}
 
-	if (FlagUseWithStarted && !FlagUseWithLocked) {
+	if (_flagUseWithStarted && !FlagUseWithLocked) {
 		if (!showhide) {
 			clearText();
 			_lastInv = 0;
@@ -424,7 +424,7 @@ void TrecisionEngine::rollInventory(uint8 status) {
 			setInventoryStart(_iconBase, INVENTORY_HIDE);
 			_inventoryStatus = INV_OFF;
 			_inventoryCounter = INVENTORY_HIDE;
-			if (isInventoryArea(my) && !(FlagDialogActive || FlagDialogMenuActive))
+			if (isInventoryArea(my) && !(_flagDialogActive || _flagDialogMenuActive))
 				doEvent(MC_INVENTORY, ME_OPEN, MP_DEFAULT, 0, 0, 0, 0);
 			else
 				redrawString();

engines/trecision/logic.cpp

@@ -2601,7 +2601,7 @@ bool LogicManager::mouseOperate(uint16 curObj) {
 			_vm->_obj[oCARTELLOS2C]._mode &= ~OBJMODE_OBJSTATUS;
 			_vm->_obj[oCARTELLOA2C]._mode &= ~OBJMODE_OBJSTATUS;
 			_vm->_obj[od2CALLA26]._mode &= ~OBJMODE_OBJSTATUS;
-			_vm->FlagShowCharacter = false;
+			_vm->_flagShowCharacter = false;
 			ReadExtraObj2C();
 			RegenRoom();
 		} else
@@ -2829,9 +2829,9 @@ bool LogicManager::mouseOperate(uint16 curObj) {
 			_vm->_obj[oSUNDIAL49]._mode &= ~OBJMODE_OBJSTATUS;
 			_vm->_obj[oAGENDA49]._examine = 1099;
 			_vm->_obj[oAGENDA49]._action = 1100;
-			_vm->FlagCharacterExist = true;
+			_vm->_flagCharacterExists = true;
 			_vm->_curObj = oAGENDA49;
-			//_vm->FlagShowCharacter=true;
+			//_vm->_flagShowCharacter=true;
 			//doEvent(MC_SYSTEM,ME_CHANGEROOM,MP_SYSTEM,r4A,0,1,TheObj);
 			_vm->playScript(s49SUNDIAL);
 		}
@@ -2889,16 +2889,16 @@ bool LogicManager::mouseOperate(uint16 curObj) {
 				_vm->_obj[oAST14C + a]._mode &= ~OBJMODE_OBJSTATUS;
 			}
 			doEvent(MC_SYSTEM, ME_CHANGEROOM, MP_SYSTEM, r51, 0, 1, curObj);
-			_vm->FlagCharacterExist = true;
-			//_vm->FlagShowCharacter=true;
+			_vm->_flagCharacterExists = true;
+			//_vm->_flagShowCharacter=true;
 		} else {
 			for (a = 0; a < 6; a++) {
 				_comb4CT[a] = 0;
 				_vm->_obj[oAST14C + a]._mode &= ~OBJMODE_OBJSTATUS;
 			}
 			doEvent(MC_SYSTEM, ME_CHANGEROOM, MP_SYSTEM, r4C, 0, 4, curObj);
-			_vm->FlagCharacterExist = true;
-			//_vm->FlagShowCharacter=true;
+			_vm->_flagCharacterExists = true;
+			//_vm->_flagShowCharacter=true;
 		}
 		retVal = false;
 		break;
@@ -3237,7 +3237,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oDOORC21:
-			if ((_vm->_useWith[USED] == iPISTOLA15) && (_vm->FlagUseWithStarted)) {
+			if ((_vm->_useWith[USED] == iPISTOLA15) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 1)
 					goToPosition(1);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3247,7 +3247,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oTUBO21:
-			if ((_vm->_useWith[USED] == oRAMPINO21) && (_vm->FlagUseWithStarted)) {
+			if ((_vm->_useWith[USED] == oRAMPINO21) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 4)
 					goToPosition(4);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3257,7 +3257,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oCAMPO23:
-			if ((_vm->_useWith[USED] == oCAVIE23) && (_vm->FlagUseWithStarted)) {
+			if ((_vm->_useWith[USED] == oCAVIE23) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 2)
 					goToPosition(2);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3267,7 +3267,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oTASTO2F:
-			if ((_vm->_useWith[USED] == iTELECOMANDO2G) && (_vm->FlagUseWithStarted)) {
+			if ((_vm->_useWith[USED] == iTELECOMANDO2G) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 9)
 					goToPosition(9);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3278,7 +3278,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 
 		case oSAMA33:
 		case oSERRATURA33:
-			if ((_vm->_useWith[USED] == oTUBET33) && (_vm->_obj[oVALVOLA34]._mode & OBJMODE_OBJSTATUS) && (_vm->_obj[oSAMA33]._mode & OBJMODE_OBJSTATUS) && (_vm->FlagUseWithStarted)) {
+			if ((_vm->_useWith[USED] == oTUBET33) && (_vm->_obj[oVALVOLA34]._mode & OBJMODE_OBJSTATUS) && (_vm->_obj[oSAMA33]._mode & OBJMODE_OBJSTATUS) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 4)
 					goToPosition(4);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3298,7 +3298,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oPRESA35:
-			if (!_vm->FlagUseWithStarted) {
+			if (!_vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 2)
 					goToPosition(2);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3308,7 +3308,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oTRIPLA35:
-			if (!_vm->FlagUseWithStarted && mleft) {
+			if (!_vm->_flagUseWithStarted && mleft) {
 				if (_characterGoToPosition != 2)
 					goToPosition(2);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3318,7 +3318,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oPORTALC36:
-			if ((_vm->_useWith[USED] == iSTETOSCOPIO) && _vm->FlagUseWithStarted) {
+			if ((_vm->_useWith[USED] == iSTETOSCOPIO) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 8)
 					goToPosition(8);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3328,7 +3328,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oSERBATOIOA2G:
-			if ((_vm->_useWith[USED] == iCANDELOTTO) && (_vm->_inventoryObj[iBOMBOLA]._flag & OBJFLAG_EXTRA) && (_vm->_inventoryObj[iLATTINA28]._flag & OBJFLAG_EXTRA) && _vm->FlagUseWithStarted) {
+			if ((_vm->_useWith[USED] == iCANDELOTTO) && (_vm->_inventoryObj[iBOMBOLA]._flag & OBJFLAG_EXTRA) && (_vm->_inventoryObj[iLATTINA28]._flag & OBJFLAG_EXTRA) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 6)
 					goToPosition(6);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3338,7 +3338,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oRAGNO41:
-			if ((_vm->_useWith[USED] == iMARTELLO) && _vm->FlagUseWithStarted) {
+			if ((_vm->_useWith[USED] == iMARTELLO) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 1)
 					goToPosition(1);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3348,7 +3348,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oTAMBURO43:
-			if ((_vm->_useWith[USED] == iMAZZA) && _vm->FlagUseWithStarted) {
+			if ((_vm->_useWith[USED] == iMAZZA) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 5)
 					goToPosition(5);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3358,7 +3358,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oLUCCHETTO53:
-			if ((_vm->_useWith[USED] == iLASER35) && _vm->FlagUseWithStarted) {
+			if ((_vm->_useWith[USED] == iLASER35) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 2)
 					goToPosition(2);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3368,7 +3368,7 @@ bool LogicManager::mouseClick(uint16 curObj) {
 			break;
 
 		case oPORTA58C55:
-			if ((_vm->_useWith[USED] == iCHIAVI) && _vm->FlagUseWithStarted) {
+			if ((_vm->_useWith[USED] == iCHIAVI) && _vm->_flagUseWithStarted) {
 				if (_characterGoToPosition != 2)
 					goToPosition(2);
 			} else if (_characterGoToPosition != _vm->_obj[curObj]._position)
@@ -3572,7 +3572,7 @@ void LogicManager::doMouseGame() {
 bool LogicManager::doMouseInventory() {
 	bool retVal = false;
 	// Inventory area
-	if (!_vm->FlagCharacterExist && ((_vm->_curRoom != r31P) && (_vm->_curRoom != r35P)))
+	if (!_vm->_flagCharacterExists && ((_vm->_curRoom != r31P) && (_vm->_curRoom != r35P)))
 		retVal = true; // When it's in a room without a character, such as the map
 	return retVal;
 }
@@ -3603,7 +3603,7 @@ void LogicManager::doMouseLeftRight() {
 	if (_vm->_curRoom == r52) {
 		// snake escape 52
 		if (_vm->_obj[oSNAKEU52]._mode & OBJMODE_OBJSTATUS) {
-			if (GAMEAREA(_vm->_curMessage->_u16Param2) && !_vm->FlagUseWithStarted && (_vm->_curObj != oSNAKEU52)) {
+			if (GAMEAREA(_vm->_curMessage->_u16Param2) && !_vm->_flagUseWithStarted && (_vm->_curObj != oSNAKEU52)) {
 				StartCharacterAction(a526, 0, 1, 0);
 				_vm->_obj[oSCAVO51]._anim = a516;
 				memcpy(&_vm->_snake52, _vm->_curMessage, sizeof(_vm->_snake52));
@@ -3618,7 +3618,7 @@ void LogicManager::doMouseLeftRight() {
 	}
 
 	// If it's in a room without a character, like a map or a book
-	if (!_vm->FlagCharacterExist) {
+	if (!_vm->_flagCharacterExists) {
 		if ((isInventoryArea(_vm->_curMessage->_u16Param2)) && ((_vm->_curRoom == r31P) || (_vm->_curRoom == r35P))) {
 			if (ICONAREA(_vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2)
 			&& (_vm->whatIcon(_vm->_curMessage->_u16Param1)) && (_vm->_inventoryStatus == INV_INACTION)) {
@@ -3626,7 +3626,7 @@ void LogicManager::doMouseLeftRight() {
 				_vm->_curObj = 0;
 				_vm->_lightIcon = 0xFF;
 				_vm->setInventoryStart(_vm->_iconBase, INVENTORY_SHOW);
-				if (_vm->_curMessage->_event == ME_MRIGHT || _vm->FlagUseWithStarted)
+				if (_vm->_curMessage->_event == ME_MRIGHT || _vm->_flagUseWithStarted)
 					doEvent(MC_INVENTORY, ME_OPERATEICON, MP_DEFAULT, _vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2, 0, 0);
 				else
 					doEvent(MC_INVENTORY, ME_EXAMINEICON, MP_DEFAULT, _vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2, 0, 0);
@@ -3671,7 +3671,7 @@ void LogicManager::doMouseLeftRight() {
 				_vm->_obj[oCARTELLOA2C]._mode |= OBJMODE_OBJSTATUS;
 				_vm->_obj[od2CALLA26]._mode |= OBJMODE_OBJSTATUS;
 				_vm->_obj[oWHEELS2C]._mode |= OBJMODE_OBJSTATUS;
-				_vm->FlagShowCharacter = true;
+				_vm->_flagShowCharacter = true;
 				RegenRoom();
 				memcpy(_vm->_smackImageBuffer, ImagePointer, MAXX * AREA * 2);
 				_vm->_animMgr->startSmkAnim(_vm->_room[_vm->_curRoom]._bkgAnim);
@@ -3719,14 +3719,14 @@ void LogicManager::doMouseLeftRight() {
 		}
 		_vm->_characterQueue.initQueue();
 
-		if (CheckMask(_vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2) && !_vm->FlagDialogActive) {
+		if (CheckMask(_vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2) && !_vm->_flagDialogActive) {
 			if ((_vm->_curRoom == r1D) && !(_vm->_room[r1D]._flag & OBJFLAG_EXTRA) && (_vm->_curObj != oSCALA1D))
 				_vm->_curObj = oDONNA1D;
 			else if ((_vm->_curRoom == r2B) && (_vm->_room[r2B]._flag & OBJFLAG_EXTRA) && (_vm->_curObj != oCARTELLO2B) && (_vm->_curObj != od2BALLA28)) {
 				_vm->clearText();
 				_vm->_curObj = oPORTA2B;
 				StartCharacterAction(a2B1PROVAAPRIREPORTA, 0, 0, 0);
-				if (_vm->FlagUseWithStarted) {
+				if (_vm->_flagUseWithStarted) {
 					if (_vm->_useWithInv[USED]) {
 						_vm->_lightIcon = 0xFF;
 						_vm->_animMgr->stopSmkAnim(_vm->_inventoryObj[_vm->_useWith[USED]]._anim);
@@ -3737,14 +3737,14 @@ void LogicManager::doMouseLeftRight() {
 					_vm->_useWith[WITH] = 0;
 					_vm->_useWithInv[USED] = false;
 					_vm->_useWithInv[WITH] = false;
-					_vm->FlagUseWithStarted = false;
+					_vm->_flagUseWithStarted = false;
 					_vm->clearText();
 				}
 				return;
 			} else if ((_vm->_curRoom == r35) && !(_vm->_room[r35]._flag & OBJFLAG_EXTRA) && ((_vm->_curObj == oFRONTOFFICEC35) || (_vm->_curObj == oFRONTOFFICEA35) || (_vm->_curObj == oASCENSORE35) || (_vm->_curObj == oMONITOR35) || (_vm->_curObj == oSEDIA35) || (_vm->_curObj == oRIBELLEA35) || (_vm->_curObj == oCOMPUTER35) || (_vm->_curObj == oGIORNALE35))) {
 				_vm->_curObj = oLASTLEV5;
 				doEvent(MC_CHARACTER, ME_CHARACTERGOTOEXAMINE, MP_DEFAULT, _vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2, 0, _vm->_curObj);
-				if (_vm->FlagUseWithStarted) {
+				if (_vm->_flagUseWithStarted) {
 					if (_vm->_useWithInv[USED]) {
 						_vm->_lightIcon = 0xFF;
 						_vm->_animMgr->stopSmkAnim(_vm->_inventoryObj[_vm->_useWith[USED]]._anim);
@@ -3755,7 +3755,7 @@ void LogicManager::doMouseLeftRight() {
 					_vm->_useWith[WITH] = 0;
 					_vm->_useWithInv[USED] = false;
 					_vm->_useWithInv[WITH] = false;
-					_vm->FlagUseWithStarted = false;
+					_vm->_flagUseWithStarted = false;
 					_vm->clearText();
 				}
 				return;
@@ -3768,7 +3768,7 @@ void LogicManager::doMouseLeftRight() {
 
 			if (_vm->_curMessage->_event == ME_MRIGHT) {
 				if (!(_vm->_obj[_vm->_curObj]._flag & OBJFLAG_EXAMINE) && (_vm->_curObj != 0)) {
-					if (_vm->FlagUseWithStarted) {
+					if (_vm->_flagUseWithStarted) {
 						doEvent(MC_CHARACTER, ME_CHARACTERGOTO, MP_DEFAULT, _vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2, 0, 0);
 						return;
 					}
@@ -3792,7 +3792,7 @@ void LogicManager::doMouseLeftRight() {
 			doEvent(MC_CHARACTER, ME_CHARACTERGOTO, MP_DEFAULT, _vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2, 0, 0);
 	} else if (isInventoryArea(_vm->_curMessage->_u16Param2)) {
 		// Inventory area
-		if (_vm->_animMgr->_playingAnims[kSmackerAction] || _vm->FlagDialogActive || _vm->_curRoom == rSYS)
+		if (_vm->_animMgr->_playingAnims[kSmackerAction] || _vm->_flagDialogActive || _vm->_curRoom == rSYS)
 			return;
 
 		if (ICONAREA(_vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2) && _vm->whatIcon(_vm->_curMessage->_u16Param1) && (_vm->_inventoryStatus == INV_INACTION)) {
@@ -3804,7 +3804,7 @@ void LogicManager::doMouseLeftRight() {
 			_vm->_curObj = 0;
 			_vm->_lightIcon = 0xFF;
 			_vm->setInventoryStart(_vm->_iconBase, INVENTORY_SHOW);
-			if (_vm->_curMessage->_event == ME_MRIGHT || _vm->FlagUseWithStarted)
+			if (_vm->_curMessage->_event == ME_MRIGHT || _vm->_flagUseWithStarted)
 				doEvent(MC_INVENTORY, ME_OPERATEICON, MP_DEFAULT, _vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2, 0, 0);
 			else
 				doEvent(MC_INVENTORY, ME_EXAMINEICON, MP_DEFAULT, _vm->_curMessage->_u16Param1, _vm->_curMessage->_u16Param2, 0, 0);
@@ -3829,18 +3829,18 @@ void LogicManager::doSystemChangeRoom() {
 	_vm->_inventoryRefreshStartLine = INVENTORY_HIDE;
 	_vm->_inventoryCounter = INVENTORY_HIDE;
 	_vm->setInventoryStart(_vm->_inventoryRefreshStartIcon, INVENTORY_HIDE);
-	_vm->FlagCharacterExist = true;
-	_vm->FlagShowCharacter = true;
+	_vm->_flagCharacterExists = true;
+	_vm->_flagShowCharacter = true;
 	_vm->_animMgr->stopSmkAnim(_vm->_inventoryObj[_vm->_useWith[USED]]._anim);
 	_vm->_useWith[USED] = 0;
 	_vm->_useWith[WITH] = 0;
 	_vm->_useWithInv[USED] = false;
 	_vm->_useWithInv[WITH] = false;
-	_vm->FlagUseWithStarted = false;
+	_vm->_flagUseWithStarted = false;
 	_vm->FlagUseWithLocked = false;
 	_vm->_lightIcon = 0xFF;
-	_vm->FlagCharacterSpeak = false;
-	_vm->FlagSomeOneSpeak = false;
+	_vm->_flagCharacterSpeak = false;
+	_vm->_flagSomeoneSpeaks = false;
 	actorStop();
 	nextStep();
 

engines/trecision/nl/classes.cpp

@@ -53,10 +53,10 @@ void doAction() {
 		if (g_vm->_obj[g_vm->_curObj]._mode & OBJMODE_HIDDEN)
 			g_vm->_obj[g_vm->_curObj]._mode &= ~OBJMODE_HIDDEN;
 
-		if (g_vm->FlagUseWithStarted) {
+		if (g_vm->_flagUseWithStarted) {
 			if ((g_vm->_obj[g_vm->_curObj]._flag & (OBJFLAG_ROOMOUT | OBJFLAG_ROOMIN)) && !(g_vm->_obj[g_vm->_curObj]._flag & OBJFLAG_EXAMINE))
 				return;
-			g_vm->FlagUseWithStarted = false;
+			g_vm->_flagUseWithStarted = false;
 			g_vm->_flagInventoryLocked = false;
 			g_vm->_useWith[WITH] = g_vm->_curObj;
 			g_vm->_useWithInv[WITH] = false;
@@ -67,7 +67,7 @@ void doAction() {
 				g_vm->_useWith[WITH] = 0;
 				g_vm->_useWithInv[USED] = false;
 				g_vm->_useWithInv[WITH] = false;
-				g_vm->FlagUseWithStarted = false;
+				g_vm->_flagUseWithStarted = false;
 				g_vm->clearText();
 			} else
 				doEvent(MC_ACTION, ME_USEWITH, MP_SYSTEM, 0, 0, 0, 0);
@@ -76,7 +76,7 @@ void doAction() {
 		}
 
 		if ((g_vm->_curMessage->_event == ME_MOUSEOPERATE) && (g_vm->_obj[g_vm->_curObj]._flag & OBJFLAG_USEWITH)) {
-			g_vm->FlagUseWithStarted = true;
+			g_vm->_flagUseWithStarted = true;
 			g_vm->_flagInventoryLocked = true;
 			g_vm->_useWith[USED] = g_vm->_curObj;
 			g_vm->_useWith[WITH] = 0;
@@ -149,7 +149,7 @@ void doMouse() {
 
 		if (curpos == POSGAME) {
 		// Game area
-			if (g_vm->FlagSomeOneSpeak || g_vm->FlagDialogMenuActive || g_vm->FlagDialogActive || g_vm->FlagUseWithLocked)
+			if (g_vm->_flagSomeoneSpeaks || g_vm->_flagDialogMenuActive || g_vm->_flagDialogActive || g_vm->FlagUseWithLocked)
 				break;
 
 			CheckMask(g_vm->_curMessage->_u16Param1, g_vm->_curMessage->_u16Param2);
@@ -157,7 +157,7 @@ void doMouse() {
 		} else if (curpos == POSINV) {
 			if (g_vm->_logicMgr->doMouseInventory())
 				break;
-			if ((g_vm->FlagSomeOneSpeak && !g_vm->FlagCharacterSpeak) || g_vm->FlagDialogMenuActive || g_vm->FlagDialogActive || g_vm->FlagUseWithLocked)
+			if ((g_vm->_flagSomeoneSpeaks && !g_vm->_flagCharacterSpeak) || g_vm->_flagDialogMenuActive || g_vm->_flagDialogActive || g_vm->FlagUseWithLocked)
 				break;
 			if (g_vm->_animMgr->_playingAnims[kSmackerAction])
 				break;
@@ -174,15 +174,15 @@ void doMouse() {
 			g_vm->_curObj = 0;
 			ShowObjName(g_vm->_curObj, true);
 
-			if (g_vm->FlagDialogMenuActive)
+			if (g_vm->_flagDialogMenuActive)
 				UpdateChoices(g_vm->_curMessage->_u16Param1, g_vm->_curMessage->_u16Param2);
 		}
 		break;
 
 	case ME_MRIGHT:
 	case ME_MLEFT:
-		if (g_vm->FlagSomeOneSpeak) {
-			g_vm->Flagskiptalk = g_vm->Flagskipenable;
+		if (g_vm->_flagSomeoneSpeaks) {
+			g_vm->_flagSkipTalk = g_vm->_flagSkipEnable;
 			break;
 		}
 		if (g_vm->_actor->_curAction > hWALKIN)
@@ -190,7 +190,7 @@ void doMouse() {
 		if (g_vm->FlagWalkNoInterrupt && (g_vm->_actor->_curAction != hSTAND))
 			break;
 
-		if (g_vm->FlagDialogActive && g_vm->FlagDialogMenuActive) {
+		if (g_vm->_flagDialogActive && g_vm->_flagDialogMenuActive) {
 			SelectChoice(g_vm->_curMessage->_u16Param1, g_vm->_curMessage->_u16Param2);
 			break;
 		}
@@ -213,7 +213,7 @@ void StartCharacterAction(uint16 Act, uint16 NewRoom, uint8 NewPos, uint16 sent)
 		g_vm->_animMgr->startSmkAnim(Act);
 		InitAtFrameHandler(Act, g_vm->_curObj);
 		g_vm->_flagMouseEnabled = false;
-		g_vm->FlagShowCharacter = false;
+		g_vm->_flagShowCharacter = false;
 		doEvent(MC_CHARACTER, ME_CHARACTERCONTINUEACTION, MP_DEFAULT, Act, NewRoom, NewPos, g_vm->_curObj);
 	} else {
 		if ((Act == aWALKIN) || (Act == aWALKOUT))
@@ -243,7 +243,7 @@ void doCharacter() {
 		if (nextStep()) {
 			_characterInMovement = false;
 			_characterGoToPosition = -1;
-			g_vm->FlagWaitRegen = true;
+			g_vm->_flagWaitRegen = true;
 		} else
 			_characterInMovement = true;
 
@@ -251,12 +251,12 @@ void doCharacter() {
 			if (nextStep()) {
 				_characterInMovement = false;
 				_characterGoToPosition = -1;
-				g_vm->FlagWaitRegen = true;
+				g_vm->_flagWaitRegen = true;
 			} else
 				_characterInMovement = true;
 		}
 
-		g_vm->FlagPaintCharacter = true;
+		g_vm->_flagPaintCharacter = true;
 
 		if (_characterInMovement)
 			REEVENT;
@@ -268,7 +268,7 @@ void doCharacter() {
 			else if (g_vm->_curMessage->_event == ME_CHARACTERGOTOEXAMINE)
 				doEvent(MC_ACTION, ME_MOUSEEXAMINE, g_vm->_curMessage->_priority, g_vm->_curMessage->_u16Param1, g_vm->_curMessage->_u16Param2, 0, g_vm->_curMessage->_u32Param);
 			else if (g_vm->_curMessage->_event == ME_CHARACTERGOTOEXIT) {
-				g_vm->FlagShowCharacter = false;
+				g_vm->_flagShowCharacter = false;
 				doEvent(MC_SYSTEM, ME_CHANGEROOM, g_vm->_curMessage->_priority, g_vm->_curMessage->_u16Param1, g_vm->_curMessage->_u16Param2, g_vm->_curMessage->_u8Param, g_vm->_curMessage->_u32Param);
 			} else if (g_vm->_curMessage->_event == ME_CHARACTERDOACTION) {
 				g_vm->_lastObj = 0;
@@ -279,7 +279,7 @@ void doCharacter() {
 		break;
 
 	case ME_CHARACTERACTION:
-		if (g_vm->FlagWaitRegen)
+		if (g_vm->_flagWaitRegen)
 			REEVENT;
 		g_vm->_characterQueue.initQueue();
 		g_vm->_inventoryRefreshStartLine = INVENTORY_HIDE;
@@ -297,21 +297,21 @@ void doCharacter() {
 		break;
 
 	case ME_CHARACTERCONTINUEACTION:
-		g_vm->FlagShowCharacter = false;
+		g_vm->_flagShowCharacter = false;
 		AtFrameHandler(CHARACTER_ANIM);
 		//	If the animation is over
 		if (!g_vm->_animMgr->_playingAnims[kSmackerAction]) {
 			g_vm->_flagMouseEnabled = true;
-			g_vm->FlagShowCharacter = true;
+			g_vm->_flagShowCharacter = true;
 			_characterInMovement = false;
 			g_vm->_characterQueue.initQueue();
 			AtFrameEnd(CHARACTER_ANIM);
-			g_vm->FlagWaitRegen = true;
+			g_vm->_flagWaitRegen = true;
 			g_vm->_lastObj = 0;
 			ShowObjName(g_vm->_curObj, true);
 			//	If the room changes at the end
 			if (g_vm->_curMessage->_u16Param2) {
-				g_vm->FlagShowCharacter = false;
+				g_vm->_flagShowCharacter = false;
 				doEvent(MC_SYSTEM, ME_CHANGEROOM, MP_SYSTEM, g_vm->_curMessage->_u16Param2, 0, g_vm->_curMessage->_u8Param, g_vm->_curMessage->_u32Param);
 			} else if (g_vm->_curMessage->_u8Param)
 				setPosition(g_vm->_curMessage->_u8Param);
@@ -349,7 +349,7 @@ void doSystem() {
 			return;
 
 		// if regen still has to occur
-		if (g_vm->FlagWaitRegen)
+		if (g_vm->_flagWaitRegen)
 			REEVENT;
 
 		g_vm->_logicMgr->doSystemChangeRoom();
@@ -380,7 +380,7 @@ void doIdle() {
 	// Quit
 	case 'q':
 	case 'Q':
-		if (!g_vm->FlagDialogActive && !g_vm->FlagDialogMenuActive) {
+		if (!g_vm->_flagDialogActive && !g_vm->_flagDialogMenuActive) {
 			if (QuitGame())
 				doEvent(MC_SYSTEM, ME_QUIT, MP_SYSTEM, 0, 0, 0, 0);
 #if (!USE_NEW_VIDEO_CODE)
@@ -394,30 +394,30 @@ void doIdle() {
 	// Skip
 	case 0x1B:
 #if (!USE_NEW_VIDEO_CODE)
-		if (g_vm->FlagDialogActive) {
+		if (g_vm->_flagDialogActive) {
 			if (g_vm->_animMgr->_fullMotionEnd != g_vm->_animMgr->_curAnimFrame[kSmackerFullMotion])
 				g_vm->_animMgr->_fullMotionEnd = g_vm->_animMgr->_curAnimFrame[kSmackerFullMotion] + 1;
 		}
 #endif
 
-		if (!g_vm->FlagSomeOneSpeak && !g_vm->_flagscriptactive && !g_vm->FlagDialogActive && !g_vm->FlagDialogMenuActive
-		&& (g_vm->_actor->_curAction < hWALKIN) && !g_vm->FlagUseWithStarted && g_vm->FlagShowCharacter && !g_vm->_animMgr->_playingAnims[kSmackerAction]) {
+		if (!g_vm->_flagSomeoneSpeaks && !g_vm->_flagscriptactive && !g_vm->_flagDialogActive && !g_vm->_flagDialogMenuActive
+		&& (g_vm->_actor->_curAction < hWALKIN) && !g_vm->_flagUseWithStarted && g_vm->_flagShowCharacter && !g_vm->_animMgr->_playingAnims[kSmackerAction]) {
 			actorStop();
 			nextStep();
 			Mouse(MCMD_ON);
 			g_vm->_flagMouseEnabled = true;
 			g_vm->_obj[o00EXIT]._goRoom = g_vm->_curRoom;
 			doEvent(MC_SYSTEM, ME_CHANGEROOM, MP_SYSTEM, rSYS, 0, 0, c);
-			g_vm->FlagShowCharacter = false;
-			g_vm->FlagCharacterExist = false;
+			g_vm->_flagShowCharacter = false;
+			g_vm->_flagCharacterExists = false;
 			IconSnapShot();
 		}
 		break;
 
 	// Sys
 	case 0x3B:
-		if (!g_vm->FlagSomeOneSpeak && !g_vm->_flagscriptactive && !g_vm->FlagDialogActive && !g_vm->FlagDialogMenuActive
-		&& (g_vm->_actor->_curAction < hWALKIN) && !g_vm->FlagUseWithStarted && g_vm->FlagShowCharacter
+		if (!g_vm->_flagSomeoneSpeaks && !g_vm->_flagscriptactive && !g_vm->_flagDialogActive && !g_vm->_flagDialogMenuActive
+		&& (g_vm->_actor->_curAction < hWALKIN) && !g_vm->_flagUseWithStarted && g_vm->_flagShowCharacter
 		&& !g_vm->_animMgr->_playingAnims[kSmackerAction]) {
 			actorStop();
 			nextStep();
@@ -425,16 +425,16 @@ void doIdle() {
 			g_vm->_flagMouseEnabled = true;
 			g_vm->_obj[o00EXIT]._goRoom = g_vm->_curRoom;
 			doEvent(MC_SYSTEM, ME_CHANGEROOM, MP_SYSTEM, rSYS, 0, 0, c);
-			g_vm->FlagShowCharacter = false;
-			g_vm->FlagCharacterExist = false;
+			g_vm->_flagShowCharacter = false;
+			g_vm->_flagCharacterExists = false;
 			IconSnapShot();
 		}
 		break;
 
 	// Save
 	case 0x3C:
-		if (!g_vm->FlagSomeOneSpeak && !g_vm->_flagscriptactive && !g_vm->FlagDialogActive && !g_vm->FlagDialogMenuActive
-		&& (g_vm->_actor->_curAction < hWALKIN) && !g_vm->FlagUseWithStarted && g_vm->FlagShowCharacter
+		if (!g_vm->_flagSomeoneSpeaks && !g_vm->_flagscriptactive && !g_vm->_flagDialogActive && !g_vm->_flagDialogMenuActive
+		&& (g_vm->_actor->_curAction < hWALKIN) && !g_vm->_flagUseWithStarted && g_vm->_flagShowCharacter
 		&& !g_vm->_animMgr->_playingAnims[kSmackerAction]) {
 			IconSnapShot();
 			DataSave();
@@ -446,8 +446,8 @@ void doIdle() {
 
 	// Load
 	case 0x3D:
-		if (!g_vm->FlagSomeOneSpeak && !g_vm->_flagscriptactive && !g_vm->FlagDialogActive && !g_vm->FlagDialogMenuActive
-		&& (g_vm->_actor->_curAction < hWALKIN) && !g_vm->FlagUseWithStarted && g_vm->FlagShowCharacter
+		if (!g_vm->_flagSomeoneSpeaks && !g_vm->_flagscriptactive && !g_vm->_flagDialogActive && !g_vm->_flagDialogMenuActive
+		&& (g_vm->_actor->_curAction < hWALKIN) && !g_vm->_flagUseWithStarted && g_vm->_flagShowCharacter
 		&& !g_vm->_animMgr->_playingAnims[kSmackerAction]) {
 			IconSnapShot();
 			if (!DataLoad()) {
@@ -472,7 +472,7 @@ void doIdle() {
 		g_vm->_inventoryScrollTime = TheTime;
 	}
 
-	if (g_engine->shouldQuit() && !g_vm->FlagDialogActive && !g_vm->FlagDialogMenuActive)
+	if (g_engine->shouldQuit() && !g_vm->_flagDialogActive && !g_vm->_flagDialogMenuActive)
 		doEvent(MC_SYSTEM, ME_QUIT, MP_SYSTEM, 0, 0, 0, 0);
 }
 

engines/trecision/nl/dialog.cpp

@@ -64,7 +64,7 @@ void ShowChoices(uint16 i) {
 
 	g_vm->_graphicsMgr->copyToScreen(0, 0, MAXX, TOP);
 
-	g_vm->FlagDialogMenuActive = true;
+	g_vm->_flagDialogMenuActive = true;
 	g_vm->_flagMouseEnabled = true;
 }
 
@@ -92,17 +92,17 @@ void SelectChoice(int16 dmx, int16 dmy) {
 	UpdateChoices(dmx, dmy);
 
 	if (CurPos != -1) {
-		g_vm->FlagDialogMenuActive = false;
+		g_vm->_flagDialogMenuActive = false;
 		PlayChoice(DispChoice[CurPos]);
 	}
 }
 
 void PlayDialog(uint16 i) {
 	_curDialog = i;
-	g_vm->FlagDialogActive = true;
+	g_vm->_flagDialogActive = true;
 	_curChoice = 0;
 	_curSubTitle = 0;
-	g_vm->FlagShowCharacter = false;
+	g_vm->_flagShowCharacter = false;
 
 	g_vm->_characterQueue.initQueue();
 	g_vm->_inventoryStatus = INV_OFF;
@@ -217,7 +217,7 @@ void afterChoice(int numframe) {
 
 	case dF321:
 		g_vm->removeIcon(iTORCIA32);
-		g_vm->FlagShowCharacter = false;
+		g_vm->_flagShowCharacter = false;
 		break;
 
 	case dF4A3:
@@ -376,7 +376,7 @@ void afterChoice(int numframe) {
 			break;
 
 		case dF431:
-			g_vm->FlagShowCharacter = true;
+			g_vm->_flagShowCharacter = true;
 			StartCharacterAction(aWALKIN, 0, 11, 0);
 			break;
 
@@ -400,8 +400,8 @@ void afterChoice(int numframe) {
 			break;
 
 		case dC4A1:
-			g_vm->FlagCharacterExist = true;
-			g_vm->FlagShowCharacter = true;
+			g_vm->_flagCharacterExists = true;
+			g_vm->_flagShowCharacter = true;
 			actorStop();
 			nextStep();
 			break;
@@ -497,7 +497,7 @@ void afterChoice(int numframe) {
 	// se parte altro dialogo
 	if (g_vm->_choice[_curChoice]._nextDialog != 0) {
 		_curDialog = g_vm->_choice[_curChoice]._nextDialog;
-		g_vm->FlagDialogActive = true;
+		g_vm->_flagDialogActive = true;
 		_curChoice = 0;
 
 		d = &_dialog[_curDialog];
@@ -566,7 +566,7 @@ void afterChoice(int numframe) {
 }
 
 void DialogHandler(int numframe) {
-	if (g_vm->FlagDialogActive && !g_vm->FlagDialogMenuActive) {
+	if (g_vm->_flagDialogActive && !g_vm->_flagDialogMenuActive) {
 		g_vm->_flagMouseEnabled = false;
 		if (numframe == _subTitles[_curSubTitle]._startFrame) {
 			int i = _curSubTitle++;
@@ -589,7 +589,7 @@ void PlayChoice(uint16 i) {
 
 	_curChoice = i;
 	_curSubTitle = ss->_firstSubTitle;
-	g_vm->FlagDialogMenuActive = false;
+	g_vm->_flagDialogMenuActive = false;
 
 	ss->_flag |= OBJFLAG_DONE;
 

engines/trecision/nl/do.cpp

@@ -156,7 +156,7 @@ void doUseWith() {
 	g_vm->_useWith[WITH] = 0;
 	g_vm->_useWithInv[USED] = false;
 	g_vm->_useWithInv[WITH] = false;
-	g_vm->FlagUseWithStarted = false;
+	g_vm->_flagUseWithStarted = false;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -470,18 +470,18 @@ void AtEndChangeRoom() {
 	else if ((g_vm->_curRoom == r23A) && (g_vm->_oldRoom == r21) && (g_vm->_room[r23A]._flag & OBJFLAG_DONE))
 		StartCharacterAction(aWALKIN, 0, 0, 0);
 	else if ((g_vm->_curRoom == r23A) && (g_vm->_oldRoom == r21) && (!(g_vm->_room[r23A]._flag & OBJFLAG_DONE)))
-		g_vm->FlagShowCharacter = false;
+		g_vm->_flagShowCharacter = false;
 	else if ((g_vm->_curRoom == r21) && ((g_vm->_oldRoom == r23A) || (g_vm->_oldRoom == r23B)))
 		StartCharacterAction(aWALKIN, 0, 0, 0);
 	else if ((g_vm->_curRoom == r2BL) || (g_vm->_curRoom == r36F) || (g_vm->_curRoom == r41D) || (g_vm->_curRoom == r49M) || (g_vm->_curRoom == r4CT) ||
 	         (g_vm->_curRoom == r58T) || (g_vm->_curRoom == r58M) || (g_vm->_curRoom == r59L) || (g_vm->_curRoom == rSYS) ||
 	         (g_vm->_curRoom == r12CU) || (g_vm->_curRoom == r13CU)) { // Screens without inventory
-		g_vm->FlagShowCharacter = false;
-		g_vm->FlagCharacterExist = false;
+		g_vm->_flagShowCharacter = false;
+		g_vm->_flagCharacterExists = false;
 		g_vm->_flagInventoryLocked = true;
 	} else if ((g_vm->_curRoom == r31P) || (g_vm->_curRoom == r35P)) { // Screens with inventory
-		g_vm->FlagShowCharacter = false;
-		g_vm->FlagCharacterExist = false;
+		g_vm->_flagShowCharacter = false;
+		g_vm->_flagCharacterExists = false;
 	} else if ((g_vm->_curRoom == r2F) && (g_vm->_oldRoom == r31))
 		StartCharacterAction(a2F4ESCEASCENSORE, 0, 0, 0);
 	else if ((g_vm->_curRoom == r31) && (g_vm->_oldRoom == r2F))
@@ -543,12 +543,12 @@ void AtEndChangeRoom() {
 		WaitSoundFadEnd();
 	} else if ((g_vm->_curRoom == r31) && (g_vm->_oldRoom == r32) && (g_vm->_room[r32]._flag & OBJFLAG_EXTRA)) {
 		PlayDialog(dF321);
-		g_vm->FlagShowCharacter = false;
+		g_vm->_flagShowCharacter = false;
 		WaitSoundFadEnd();
 		g_vm->_room[r32]._flag &= ~OBJFLAG_EXTRA;
 	} else if ((g_vm->_curRoom == r19) && !(g_vm->_room[r19]._flag & OBJFLAG_DONE)) {
 		g_vm->playScript(s19EVA);
-		g_vm->FlagNoPaintScreen = false;
+		g_vm->_flagNoPaintScreen = false;
 		g_vm->clearText();
 		g_vm->redrawString();
 		WaitSoundFadEnd();
@@ -557,7 +557,7 @@ void AtEndChangeRoom() {
 	else if ((g_vm->_curRoom == r21) && (/*!( _room[g_vm->_curRoom]._flag & OBJFLAG_DONE ) || */ (g_vm->_oldRoom == r1C))) {
 		setPosition(10);
 		TendIn();
-		g_vm->FlagNoPaintScreen = false;
+		g_vm->_flagNoPaintScreen = false;
 		g_vm->clearText();
 		g_vm->redrawString();
 	} else if ((g_vm->_curRoom == r46) && (g_vm->_oldRoom == r43) && !(g_vm->_inventoryObj[iDISLOCATORE]._flag & OBJFLAG_EXTRA)) {
@@ -574,11 +574,11 @@ void AtEndChangeRoom() {
 		PlayDialog(dC4A1);
 	} else if ((g_vm->_curRoom == r4P) && (g_vm->_oldRoom == r4O) && !(g_vm->_room[r4P]._flag & OBJFLAG_DONE)) {
 		PlayDialog(dF4PI);
-		g_vm->FlagShowCharacter = false;
+		g_vm->_flagShowCharacter = false;
 		WaitSoundFadEnd();
 	} else if ((g_vm->_curRoom == r51) && (g_vm->_oldRoom == r4CT)) {
 		PlayDialog(dF4C1);
-		g_vm->FlagShowCharacter = false;
+		g_vm->_flagShowCharacter = false;
 		WaitSoundFadEnd();
 	} else if ((g_vm->_curRoom == r1A) && (g_vm->_oldRoom == r18)) {
 		if (!(g_vm->_room[r1A]._flag & OBJFLAG_DONE)) {
@@ -588,12 +588,12 @@ void AtEndChangeRoom() {
 			g_vm->_obj[oTOPO1C]._anim = a1C3RACCOGLIETOPO;
 		} else {
 			TendIn();
-			g_vm->FlagNoPaintScreen = false;
+			g_vm->_flagNoPaintScreen = false;
 			g_vm->redrawString();
 		}
 	} else {
 		TendIn();
-		g_vm->FlagNoPaintScreen = false;
+		g_vm->_flagNoPaintScreen = false;
 		g_vm->clearText();
 		g_vm->redrawString();
 	}
@@ -604,7 +604,7 @@ void AtEndChangeRoom() {
 	if (((g_vm->_curRoom == r12CU) || (g_vm->_curRoom == r13CU)) && g_vm->_closeUpObj && g_vm->_obj[g_vm->_closeUpObj]._examine)
 		CharacterSay(g_vm->_obj[g_vm->_closeUpObj]._examine);
 	else if ((g_vm->_curRoom == r23A) && (g_vm->_oldRoom == r21) && !(g_vm->_room[r23A]._flag & OBJFLAG_DONE)) {
-		g_vm->FlagShowCharacter = true;
+		g_vm->_flagShowCharacter = true;
 		StartCharacterAction(aWALKIN, 0, 0, 361);
 	} else if ((g_vm->_curRoom == r24) && !(g_vm->_room[r24]._flag & OBJFLAG_DONE))
 		CharacterSay(381);
@@ -696,10 +696,10 @@ void ExecuteATFDO(ATFHandle *h, int doit, int obj) {
 		break;
 
 	case fCHARACTEROFF:
-		g_vm->FlagCharacterExist = false;
+		g_vm->_flagCharacterExists = false;
 		break;
 	case fCHARACTERON:
-		g_vm->FlagCharacterExist = true;
+		g_vm->_flagCharacterExists = true;
 		break;
 	case fCHARACTERFOREGROUND:
 		_forcedActorPos = FOREGROUND;
@@ -911,11 +911,11 @@ void InitAtFrameHandler(uint16 an, uint16 obj) {
 					AtFrameNext
  --------------------------------------------------*/
 void AtFrameNext() {
-	if (!((AnimType[0].status & ATF_WAITTEXT) && g_vm->FlagCharacterSpeak))
+	if (!((AnimType[0].status & ATF_WAITTEXT) && g_vm->_flagCharacterSpeak))
 		AnimType[0].curframe++;
-	if (!((AnimType[1].status & ATF_WAITTEXT) && g_vm->FlagCharacterSpeak))
+	if (!((AnimType[1].status & ATF_WAITTEXT) && g_vm->_flagCharacterSpeak))
 		AnimType[1].curframe++;
-	if (!((AnimType[2].status & ATF_WAITTEXT) && g_vm->FlagCharacterSpeak))
+	if (!((AnimType[2].status & ATF_WAITTEXT) && g_vm->_flagCharacterSpeak))
 		AnimType[2].curframe++;
 }
 

engines/trecision/nl/ll/llanim.cpp

@@ -36,7 +36,7 @@ namespace Trecision {
 --------------------------------------------------*/
 void RedrawRoom() {
 	if ((_curDialog != dF321) && (_curDialog != dF431) && (_curDialog != dF4C1) && (_curDialog != dASCENSORE12) && (_curDialog != dASCENSORE13) && (_curDialog != dASCENSORE16))
-		g_vm->FlagShowCharacter = true;
+		g_vm->_flagShowCharacter = true;
 
 	switch (_curDialog) {
 	case dASCENSORE12:
@@ -83,7 +83,7 @@ void RedrawRoom() {
 	RegenRoom();
 
 	TextStatus = TEXT_OFF;
-	g_vm->FlagPaintCharacter = true;
+	g_vm->_flagPaintCharacter = true;
 	PaintScreen(1);
 	g_vm->_graphicsMgr->copyToScreen(0, 0, 640, 480);
 }

engines/trecision/nl/ll/llmouse.cpp

@@ -684,7 +684,7 @@ void performLoad(int slot, bool skipLoad) {
 
 		g_vm->loadGameState(slot + 1);
 
-		g_vm->FlagNoPaintScreen = true;
+		g_vm->_flagNoPaintScreen = true;
 		g_vm->_curStack = 0;
 		g_vm->_flagscriptactive = false;
 

engines/trecision/nl/ll/llscreen.cpp

@@ -454,7 +454,7 @@ int actionInRoom(int curA) {
 --------------------------------------------------*/
 void ReadLoc() {
 	if (g_vm->_curRoom == r11 && !(g_vm->_room[r11]._flag & OBJFLAG_DONE))
-		g_vm->FlagShowCharacter = true;
+		g_vm->_flagShowCharacter = true;
 
 	SoundFadOut();
 
@@ -508,7 +508,7 @@ void TendIn() {
 		return;
 	}
 
-	g_vm->FlagPaintCharacter = true;
+	g_vm->_flagPaintCharacter = true;
 	WaitSoundFadEnd();
 	PaintScreen(1);
 

engines/trecision/nl/regen.cpp

@@ -51,7 +51,7 @@ void PaintScreen(uint8 flag) {
 	AtFrameNext();
 	PaintRegenRoom();
 
-//	if( ( !FlagPaintCharacter) && ( _curSortTableNum == 0 ) &&  ( curString.sign == NULL ) && ( oldString.sign == NULL ) )
+//	if( ( !_flagPaintCharacter) && ( _curSortTableNum == 0 ) &&  ( curString.sign == NULL ) && ( oldString.sign == NULL ) )
 //		return;
 
 	g_vm->_actorLimit = 255;
@@ -59,7 +59,7 @@ void PaintScreen(uint8 flag) {
 		VisualRef[a] = 255;
 
 	g_vm->_limitsNum = 0;
-	g_vm->FlagPaintCharacter = true; // always redraws the character
+	g_vm->_flagPaintCharacter = true; // always redraws the character
 
 #if USE_DIRTY_RECTS	
 	AddLine(0, 0, 0);
@@ -71,7 +71,7 @@ void PaintScreen(uint8 flag) {
 	int y2 = g_vm->_actor->_lim[3] - TOP;
 	
 	// erase character
-	if (g_vm->FlagShowCharacter && x2 > x1 && y2 > y1) {                    // if a description exists
+	if (g_vm->_flagShowCharacter && x2 > x1 && y2 > y1) {                    // if a description exists
 		DObj.x    = 0;
 		DObj.y    = TOP;
 		DObj.dx   = SCREENLEN;
@@ -221,7 +221,7 @@ void PaintScreen(uint8 flag) {
 	}
 #endif
 
-	if (!flag && !g_vm->FlagDialogActive) {
+	if (!flag && !g_vm->_flagDialogActive) {
 #if USE_DIRTY_RECTS
 
 		// Sort the blocks to copy and remove the useless ones
@@ -250,8 +250,8 @@ void PaintScreen(uint8 flag) {
 
 	g_vm->_curSortTableNum = 0;
 
-	g_vm->FlagPaintCharacter = false;
-	g_vm->FlagWaitRegen = false;
+	g_vm->_flagPaintCharacter = false;
+	g_vm->_flagWaitRegen = false;
 
 	// Handle papaverine delayed action
 	if ((g_vm->_curRoom == r4A) && (g_vm->_obj[oCHOCOLATES4A]._flag & OBJFLAG_EXTRA)) {
@@ -414,7 +414,7 @@ void PaintObjAnm(uint16 CurBox) {
 		}
 	}
 
-	if (_actorPos == CurBox && g_vm->FlagShowCharacter && g_vm->FlagCharacterExist) {
+	if (_actorPos == CurBox && g_vm->_flagShowCharacter && g_vm->_flagCharacterExists) {
 		drawCharacter(CALCPOINTS);
 
 		int x1 = g_vm->_actor->_lim[0];
@@ -432,7 +432,7 @@ void PaintObjAnm(uint16 CurBox) {
 
 		drawCharacter(DRAWFACES);
 
-	} else if (_actorPos == CurBox && !g_vm->FlagDialogActive) {
+	} else if (_actorPos == CurBox && !g_vm->_flagDialogActive) {
 		g_vm->_animMgr->refreshSmkAnim(g_vm->_animMgr->_playingAnims[kSmackerAction]);
 	}
 }

engines/trecision/nl/schedule.cpp

@@ -127,7 +127,7 @@ void Scheduler() {
 
 		case CLASS_CHAR:
 			token = CLASS_GAME;
-			if (g_vm->FlagPaintCharacter || g_vm->_characterQueue.getMessage())
+			if (g_vm->_flagPaintCharacter || g_vm->_characterQueue.getMessage())
 				retry = true;
 			break;
 

engines/trecision/nl/string.cpp

@@ -82,7 +82,7 @@ void ShowObjName(uint16 obj, bool showhide) {
 	uint16 posy;
 	Common::String locsent;
 
-	if (g_vm->FlagSomeOneSpeak)
+	if (g_vm->_flagSomeoneSpeaks)
 		return;
 
 	if (g_vm->_lastInv) {
@@ -90,7 +90,7 @@ void ShowObjName(uint16 obj, bool showhide) {
 		g_vm->_lastInv = 0;
 	}
 
-	if (g_vm->FlagUseWithStarted && !g_vm->FlagUseWithLocked) {
+	if (g_vm->_flagUseWithStarted && !g_vm->FlagUseWithLocked) {
 		if (!showhide) {
 			g_vm->clearText();
 			g_vm->_lastObj = obj;
@@ -207,7 +207,7 @@ void CharacterSay(uint16 i) {
 	CurS = i;
 
 	//	TODO: Use a define...  ************************
-	g_vm->Flagskipenable = (i != 99999);
+	g_vm->_flagSkipEnable = (i != 99999);
 
 	//	if he took some action
 	if (g_vm->_sentence[i][0] == '*' && !g_vm->_animMgr->_playingAnims[kSmackerAction]
@@ -221,9 +221,9 @@ void CharacterSay(uint16 i) {
 /*                                CharacterTalk            				   */
 /*-------------------------------------------------------------------------*/
 void CharacterTalk(const char *s, bool FromCharacterSay) {
-	g_vm->FlagSomeOneSpeak = true;
-	g_vm->FlagCharacterSpeak = true;
-	g_vm->Flagskiptalk = false;
+	g_vm->_flagSomeoneSpeaks = true;
+	g_vm->_flagCharacterSpeak = true;
+	g_vm->_flagSkipTalk = false;
 
 	SuperString = s;
 	SuperStringLen = strlen(SuperString);
@@ -232,7 +232,7 @@ void CharacterTalk(const char *s, bool FromCharacterSay) {
 	FormattingSuperString();
 
 	if (!FromCharacterSay)
-		g_vm->Flagskipenable = true;
+		g_vm->_flagSkipEnable = true;
 
 	CharacterContinueTalk();
 
@@ -250,10 +250,10 @@ void CharacterTalkInAction(uint16 ss) {
 		return;
 	CurS = ss;
 
-	g_vm->FlagSomeOneSpeak = true;
-	g_vm->FlagCharacterSpeak = true;
-	g_vm->Flagskiptalk = false;
-	g_vm->Flagskipenable = true;
+	g_vm->_flagSomeoneSpeaks = true;
+	g_vm->_flagCharacterSpeak = true;
+	g_vm->_flagSkipTalk = false;
+	g_vm->_flagSkipEnable = true;
 
 	SuperString = s;
 	SuperStringLen = strlen(SuperString);
@@ -270,12 +270,12 @@ void CharacterTalkInAction(uint16 ss) {
 void CharacterContinueTalk() {
 	uint16 posx, posy;
 
-	g_vm->Flagskiptalk = false;
+	g_vm->_flagSkipTalk = false;
 	CharacterSpeakTime = TheTime;
 
 	substringagain = (CurSubString < (SubStringUsed - 1));
 
-	if (g_vm->FlagCharacterExist)
+	if (g_vm->_flagCharacterExists)
 		PositionString(g_vm->_actor->_lim[0], g_vm->_actor->_lim[2], SubString[CurSubString], &posx, &posy, true);
 	else
 		PositionString(MAXX / 2, 30, SubString[CurSubString], &posx, &posy, false);
@@ -284,7 +284,7 @@ void CharacterContinueTalk() {
 	if (ConfMan.getBool("subtitles"))
 		g_vm->addText(posx, posy, SubString[CurSubString], COLOR_OBJECT, MASKCOL);
 
-	if (!g_vm->FlagDialogActive) {
+	if (!g_vm->_flagDialogActive) {
 		if (CurSubString)
 			sprintf(sn, "s%04d%c.wav", CurS, CurSubString + 'a');
 		else
@@ -304,9 +304,9 @@ void CharacterContinueTalk() {
 /*                                CharacterMute            				   */
 /*-------------------------------------------------------------------------*/
 void CharacterMute() {
-	g_vm->FlagSomeOneSpeak = false;
-	g_vm->FlagCharacterSpeak = false;
-	g_vm->Flagskiptalk = false;
+	g_vm->_flagSomeoneSpeaks = false;
+	g_vm->_flagCharacterSpeak = false;
+	g_vm->_flagSkipTalk = false;
 	CharacterSpeakTime = 0L;
 
 	g_vm->clearText();
@@ -320,7 +320,7 @@ void CharacterMute() {
 		doEvent(MC_SYSTEM, ME_CHANGEROOM, MP_SYSTEM, g_vm->_oldRoom, 0, 0, g_vm->_curObj);
 
 	//	actorStop();
-	//	if(FlagDialogActive) doEvent(MC_DIALOG,ME_FINEBATTUTA,MP_DEFAULT,0,0,0,0);
+	//	if(_flagDialogActive) doEvent(MC_DIALOG,ME_FINEBATTUTA,MP_DEFAULT,0,0,0,0);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -329,8 +329,8 @@ void CharacterMute() {
 void SomeOneTalk(uint16 s, uint16 Person, uint16 NewAnim, bool FromSomeOneSay) {
 	SpeakSomeOneAnimation = NewAnim;
 	SpeakSomeOnePerson = Person;
-	g_vm->FlagSomeOneSpeak = true;
-	g_vm->Flagskiptalk = false;
+	g_vm->_flagSomeoneSpeaks = true;
+	g_vm->_flagSkipTalk = false;
 
 	CurS = s;
 	SuperString = g_vm->_sentence[s];
@@ -339,7 +339,7 @@ void SomeOneTalk(uint16 s, uint16 Person, uint16 NewAnim, bool FromSomeOneSay) {
 	CurSubString = 0;
 
 	if (!FromSomeOneSay)
-		g_vm->Flagskipenable = true;
+		g_vm->_flagSkipEnable = true;
 
 	FormattingSuperString();
 
@@ -355,7 +355,7 @@ void SomeOneContinueTalk() {
 	uint16 posx, posy;
 
 	SomeOneSpeakTime = TheTime;
-	g_vm->Flagskiptalk = false;
+	g_vm->_flagSkipTalk = false;
 
 	substringagain = (CurSubString < (SubStringUsed - 1));
 
@@ -385,9 +385,9 @@ void SomeOneContinueTalk() {
 /*                                SOMEONEMUTE                 			   */
 /*-------------------------------------------------------------------------*/
 void SomeOneMute() {
-	g_vm->FlagCharacterSpeak = false;
-	g_vm->Flagskiptalk = false;
-	g_vm->FlagSomeOneSpeak = false;
+	g_vm->_flagCharacterSpeak = false;
+	g_vm->_flagSkipTalk = false;
+	g_vm->_flagSomeoneSpeaks = false;
 	SomeOneSpeakTime = 0L;
 
 	g_vm->clearText();
@@ -408,8 +408,8 @@ void doString() {
 		break;
 
 	case ME_CHARACTERSPEAKING:
-		if (g_vm->FlagCharacterSpeak) {
-			if (g_vm->Flagskiptalk || (TheTime > TalkTime + CharacterSpeakTime)) {
+		if (g_vm->_flagCharacterSpeak) {
+			if (g_vm->_flagSkipTalk || (TheTime > TalkTime + CharacterSpeakTime)) {
 				if (substringagain)
 					CharacterContinueTalk();
 				else
@@ -434,8 +434,8 @@ void doString() {
 		break;
 
 	case ME_SOMEONESPEAKING:
-		if (g_vm->FlagSomeOneSpeak) {
-			if (g_vm->Flagskiptalk || (TheTime >= (TalkTime + SomeOneSpeakTime))) {
+		if (g_vm->_flagSomeoneSpeaks) {
+			if (g_vm->_flagSkipTalk || (TheTime >= (TalkTime + SomeOneSpeakTime))) {
 				if (substringagain)
 					SomeOneContinueTalk();
 				else {

engines/trecision/trecision.cpp

@@ -157,20 +157,20 @@ TrecisionEngine::TrecisionEngine(OSystem *syst) : Engine(syst) {
 	_zBuffer = nullptr;
 	_actor = nullptr;
 
-	FlagDialogActive = false;
-	FlagDialogMenuActive = false;
-	Flagskiptalk = false;
-	Flagskipenable = false;
-	FlagPaintCharacter = false;
-	FlagShowCharacter = true;
-	FlagSomeOneSpeak = false;
-	FlagCharacterSpeak = false;
-	FlagUseWithStarted = false;
+	_flagDialogActive = false;
+	_flagDialogMenuActive = false;
+	_flagSkipTalk = false;
+	_flagSkipEnable = false;
+	_flagPaintCharacter = false;
+	_flagShowCharacter = true;
+	_flagSomeoneSpeaks = false;
+	_flagCharacterSpeak = false;
+	_flagUseWithStarted = false;
 	FlagUseWithLocked = false;
-	FlagCharacterExist = true;
+	_flagCharacterExists = true;
 	FlagWalkNoInterrupt = false;
-	FlagNoPaintScreen = false;
-	FlagWaitRegen = false;
+	_flagNoPaintScreen = false;
+	_flagWaitRegen = false;
 }
 
 TrecisionEngine::~TrecisionEngine() {
@@ -217,7 +217,7 @@ Common::Error TrecisionEngine::run() {
 
 	while (!shouldQuit()) {
 		eventLoop();
-		if (!FlagNoPaintScreen)
+		if (!_flagNoPaintScreen)
 			ProcessTime();
 
 		ProcessMouse();
@@ -333,18 +333,18 @@ bool TrecisionEngine::syncGameStream(Common::Serializer &ser) {
 	ser.syncAsByte(_inventorySize);
 	ser.syncAsByte(_cyberInventorySize);
 	ser.syncAsByte(_iconBase);
-	ser.syncAsSint16LE(Flagskiptalk);
-	ser.syncAsSint16LE(Flagskipenable);
+	ser.syncAsSint16LE(_flagSkipTalk);
+	ser.syncAsSint16LE(_flagSkipEnable);
 	ser.syncAsSint16LE(_flagMouseEnabled);
 	ser.syncAsSint16LE(_flagScreenRefreshed);
-	ser.syncAsSint16LE(FlagPaintCharacter);
-	ser.syncAsSint16LE(FlagSomeOneSpeak);
-	ser.syncAsSint16LE(FlagCharacterSpeak);
+	ser.syncAsSint16LE(_flagPaintCharacter);
+	ser.syncAsSint16LE(_flagSomeoneSpeaks);
+	ser.syncAsSint16LE(_flagCharacterSpeak);
 	ser.syncAsSint16LE(_flagInventoryLocked);
-	ser.syncAsSint16LE(FlagUseWithStarted);
+	ser.syncAsSint16LE(_flagUseWithStarted);
 	ser.syncAsSint16LE(unused);	// FlagMousePolling
 	ser.syncAsSint16LE(unused); // FlagDialogSolitaire
-	ser.syncAsSint16LE(FlagCharacterExist);
+	ser.syncAsSint16LE(_flagCharacterExists);
 	ser.syncBytes(_inventory, MAXICON);
 	ser.syncBytes(_cyberInventory, MAXICON);
 	ser.syncAsFloatLE(_actor->_px);

engines/trecision/trecision.h

@@ -238,20 +238,20 @@ public:
 	FastFile _dataFile;	// nldata.cd0
 	FastFile _speechFile;	// nlspeech.cd0
 
-	bool FlagDialogActive;
-	bool FlagDialogMenuActive;
-	bool Flagskiptalk;
-	bool Flagskipenable;
-	bool FlagPaintCharacter;
-	bool FlagShowCharacter = true;
-	bool FlagSomeOneSpeak;
-	bool FlagCharacterSpeak;
-	bool FlagUseWithStarted;
+	bool _flagDialogActive;
+	bool _flagDialogMenuActive;
+	bool _flagSkipTalk;
+	bool _flagSkipEnable;
+	bool _flagPaintCharacter;
+	bool _flagShowCharacter;
+	bool _flagSomeoneSpeaks;
+	bool _flagCharacterSpeak;
+	bool _flagUseWithStarted;
 	bool FlagUseWithLocked;
-	bool FlagCharacterExist = true;
+	bool _flagCharacterExists;
 	bool FlagWalkNoInterrupt;
-	bool FlagNoPaintScreen;
-	bool FlagWaitRegen;
+	bool _flagNoPaintScreen;
+	bool _flagWaitRegen;
 };
 
 extern TrecisionEngine *g_vm;

engines/trecision/utils.cpp

@@ -108,7 +108,7 @@ void TrecisionEngine::drawString() {
 /*                           redrawString		        				   */
 /*-------------------------------------------------------------------------*/
 void TrecisionEngine::redrawString() {
-	if (!FlagDialogActive && !FlagDialogMenuActive && !FlagSomeOneSpeak && !_flagscriptactive && _flagMouseEnabled) {
+	if (!_flagDialogActive && !_flagDialogMenuActive && !_flagSomeoneSpeaks && !_flagscriptactive && _flagMouseEnabled) {
 		if (isInventoryArea(my))
 			doEvent(MC_INVENTORY, ME_SHOWICONNAME, MP_DEFAULT, 0, 0, 0, 0);
 		else {

engines/trecision/video.cpp

@@ -425,7 +425,7 @@ void AnimManager::startFullMotion(const char *name) {
 	_fullMotionEnd = 0;
 #endif
 
-	g_vm->FlagShowCharacter = false;
+	g_vm->_flagShowCharacter = false;
 	TextStatus = TEXT_OFF;
 	memset(_vm->_screenBuffer, 0, TOP * MAXX * 2);
 	_vm->_graphicsMgr->copyToScreen(0, 0, MAXX, TOP);
@@ -459,10 +459,10 @@ void AnimManager::stopFullMotion() {
 
 	closeSmk();
 
-	g_vm->FlagDialogActive = false;
-	g_vm->FlagDialogMenuActive = false;
+	g_vm->_flagDialogActive = false;
+	g_vm->_flagDialogMenuActive = false;
 	g_vm->_flagMouseEnabled = true;
-	g_vm->FlagSomeOneSpeak = false;
+	g_vm->_flagSomeoneSpeaks = false;
 
 	_vm->_lightIcon = 0xFF;
 	if (_curDialog == dFCRED) {
@@ -474,7 +474,7 @@ void AnimManager::stopFullMotion() {
 		if ((_curDialog == dF582) || (_curDialog == dFLOG) || (_curDialog == dINTRO) || (_curDialog == dF362) || (_curDialog == dC381) || (_curDialog == dF381) ||
 		    (_curDialog == dF491) || ((_curDialog == dC581) && !(g_vm->_choice[886]._flag & OBJFLAG_DONE) && (g_vm->_choice[258]._flag & OBJFLAG_DONE)) ||
 		    ((_curDialog == dC5A1) && (_vm->_room[r5A]._flag & OBJFLAG_EXTRA)))
-			g_vm->FlagShowCharacter = false;
+			g_vm->_flagShowCharacter = false;
 		else
 			RedrawRoom();
 
@@ -647,7 +647,7 @@ void AnimManager::refreshSmkAnim(int num) {
 	if (!(_animTab[num]._flag & SMKANIM_LOOP) && !(_animTab[num]._flag & SMKANIM_BKG)) {
 		if (_curAnimFrame[pos] >= _smkAnims[pos]->getFrameCount()) {
 			stopSmkAnim(num);
-			g_vm->FlagPaintCharacter = true;
+			g_vm->_flagPaintCharacter = true;
 
 			_animMaxX = 0;
 			_animMinX = MAXX;