Mercurial > mm7

comparison Arcomage.cpp @ 1982:2647e2f820a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 01 Nov 2013 14:44:06 +0600
parents c1c74df0a33e
children 28cb79ae2f6f
comparison
equal deleted inserted replaced
1981:d9ea00250e2e 1982:2647e2f820a6
269 } 269 }
270 270
271 //----- (0040E01A) -------------------------------------------------------- 271 //----- (0040E01A) --------------------------------------------------------
272 int stru272_stru0::StartFill( stru272_stru2* a2 ) 272 int stru272_stru0::StartFill( stru272_stru2* a2 )
273 { 273 {
274 auto a1 = this; 274 stru272_stru0* a1 = this;
275 if ( a1->signature == SIG_trpg ) 275 if ( a1->signature == SIG_trpg )
276 { 276 {
277 a1->field_4 = a2->field_20; 277 a1->field_4 = a2->field_20;
278 a1->field_C = a2->effect_area.left << 16; 278 a1->field_C = a2->effect_area.left << 16;
279 a1->field_10 = a2->effect_area.top << 16; 279 a1->field_10 = a2->effect_area.top << 16;
3898 if (( v8 >= 108 )&&( v8 <= 120 )) 3898 if (( v8 >= 108 )&&( v8 <= 120 ))
3899 { 3899 {
3900 if ( !pParty->pArcomageWins[v8-108] ) 3900 if ( !pParty->pArcomageWins[v8-108] )
3901 { 3901 {
3902 pParty->pArcomageWins[v8-108] = 1; 3902 pParty->pArcomageWins[v8-108] = 1;
3903 auto _a = (signed int)(p2DEvents[ window_SpeakInHouse->par1C - 1].fPriceMultiplier * 100.0); 3903 signed int _a = (signed int)(p2DEvents[ window_SpeakInHouse->par1C - 1].fPriceMultiplier * 100.0);
3904 pParty->PartyFindsGold(_a, 0); 3904 pParty->PartyFindsGold(_a, 0);
3905 } 3905 }
3906 3906
3907 } 3907 }
3908 v10 = 108; 3908 v10 = 108;