Mercurial > mm7

comparison Indoor.cpp @ 1172:d5dae0b4b98a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 24 May 2013 10:53:46 +0600
parents bcebd491e8fa
children d6bea22f8b53
comparison
equal deleted inserted replaced
1171:28ee6610a3d2 1172:d5dae0b4b98a
1732 1732
1733 1733
1734 //----- (004488F7) -------------------------------------------------------- 1734 //----- (004488F7) --------------------------------------------------------
1735 void IndoorLocation::ToggleLight(signed int sLightID, unsigned int bToggle) 1735 void IndoorLocation::ToggleLight(signed int sLightID, unsigned int bToggle)
1736 { 1736 {
1737 char *v2; // eax@4
1738
1739 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && (sLightID <= pIndoor->uNumLights - 1) && (sLightID >= 0) ) 1737 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && (sLightID <= pIndoor->uNumLights - 1) && (sLightID >= 0) )
1740 { 1738 {
1741 v2 = (char *)&pIndoor->pLights[sLightID].uAtributes;
1742 if ( bToggle ) 1739 if ( bToggle )
1743 *v2 &= 0xF7u; 1740 pIndoor->pLights[sLightID].uAtributes &= 0xFFFFFFF7u;
1744 else 1741 else
1745 *v2 |= 8u; 1742 pIndoor->pLights[sLightID].uAtributes |= 8u;
1746 pParty->uFlags |= 2u; 1743 pParty->uFlags |= 2u;
1747 } 1744 }
1748 } 1745 }
1749 1746
1750 1747
4206 viewparams->bRedrawGameUI = 1; 4203 viewparams->bRedrawGameUI = 1;
4207 goto LABEL_119; 4204 goto LABEL_119;
4208 } 4205 }
4209 v36 = stru_721530.uFaceID; 4206 v36 = stru_721530.uFaceID;
4210 LABEL_118: 4207 LABEL_118:
4211 Actor::FaceObject(v63, v36, v22, (AIDirection *)v22); 4208 Actor::AI_FaceObject(v63, v36, v22, (AIDirection *)v22);
4212 goto LABEL_119; 4209 goto LABEL_119;
4213 } 4210 }
4214 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 2 || pTurnEngine->field_4 == 3) ) 4211 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->field_4 == 2 || pTurnEngine->field_4 == 3) )
4215 goto LABEL_119; 4212 goto LABEL_119;
4216 if ( v0->pMonsterInfo.uHostilityType ) 4213 if ( v0->pMonsterInfo.uHostilityType )
4223 if ( v56 == v22 ) 4220 if ( v56 == v22 )
4224 { 4221 {
4225 if ( !pActors[v37].pMonsterInfo.uHostilityType ) 4222 if ( !pActors[v37].pMonsterInfo.uHostilityType )
4226 goto LABEL_118; 4223 goto LABEL_118;
4227 LABEL_114: 4224 LABEL_114:
4228 Actor::Flee(v63, v36, v22, (AIDirection *)v22); 4225 Actor::AI_Flee(v63, v36, v22, (AIDirection *)v22);
4229 goto LABEL_119; 4226 goto LABEL_119;
4230 } 4227 }
4231 } 4228 }
4232 Actor::AI_StandOrBored(v63, 4, v22, &v53); 4229 Actor::AI_StandOrBored(v63, 4, v22, &v53);
4233 goto LABEL_119; 4230 goto LABEL_119;