Mercurial > mm7

comparison mm7_2.cpp @ 834:95d9727412c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 27 Mar 2013 21:24:24 +0600
parents 3233927402e5 9c3f28b31b4a
children b66abf8b7d50
comparison
equal deleted inserted replaced
833:3233927402e5 834:95d9727412c9
7774 if ( !_strcmpi(pCurrentMapName, "out15.odm") ) 7774 if ( !_strcmpi(pCurrentMapName, "out15.odm") )
7775 { 7775 {
7776 bUnderwater = 1; 7776 bUnderwater = 1;
7777 pGame->uFlags2 |= 8u; 7777 pGame->uFlags2 |= 8u;
7778 } 7778 }
7779 pParty->field_6F4_packedid = 0; 7779 pParty->floor_face_pid = 0;
7780 if ( _strcmpi(Str1, "blv") ) 7780 if ( _strcmpi(Str1, "blv") )
7781 PrepareToLoadODM(v9, 0); 7781 PrepareToLoadODM(v9, 0);
7782 else 7782 else
7783 PrepareToLoadBLV(v9); 7783 PrepareToLoadBLV(v9);
7784 pAudioPlayer->SetMapEAX(); 7784 pAudioPlayer->SetMapEAX();