Mercurial > mm7

comparison UI/UIHouses.cpp @ 1477:7ef4b64f6329

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load Added support for most of mm6 resources, placeholders for mm8 resources. Fixed few C4258
author Nomad
date Wed, 28 Aug 2013 18:43:07 +0200
parents 845907a747d3
children ab6bf38b2940
comparison
equal deleted inserted replaced
1475:d7720c1f1d3b 1477:7ef4b64f6329
2296 Party::TakeGold(s1); 2296 Party::TakeGold(s1);
2297 2297
2298 v5 = &transport_schedule[transport_routes[(unsigned int)window_SpeakInHouse->ptr_1C - HOUSE_STABLES_HARMONDALE][dialog_menu_id - HOUSE_DIALOGUE_TRANSPORT_SCHEDULE_1]]; 2298 v5 = &transport_schedule[transport_routes[(unsigned int)window_SpeakInHouse->ptr_1C - HOUSE_STABLES_HARMONDALE][dialog_menu_id - HOUSE_DIALOGUE_TRANSPORT_SCHEDULE_1]];
2299 if ( v5->pSchedule[pParty->uDaysPlayed % 7] ) 2299 if ( v5->pSchedule[pParty->uDaysPlayed % 7] )
2300 { 2300 {
2301 if ( _stricmp(pCurrentMapName.data(), pMapStats->pInfos[v5->uMapInfoID].pFilename) ) 2301 if ( _stricmp(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename) )
2302 { 2302 {
2303 SaveGame(1, 0); 2303 SaveGame(1, 0);
2304 strcpy(pCurrentMapName.data(), pMapStats->pInfos[v5->uMapInfoID].pFilename); 2304 strcpy(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename);
2305 2305
2306 dword_6BE364_game_settings_1 |= 1u; 2306 dword_6BE364_game_settings_1 |= 1u;
2307 _5B65B8_npcdata_hiword_house_or_other = 0; 2307 _5B65B8_npcdata_hiword_house_or_other = 0;
2308 dword_5B65BC = 0; 2308 dword_5B65BC = 0;
2309 _5B65B4_npcdata_loword_house_or_other = v5->arrival_rot_y; 2309 _5B65B4_npcdata_loword_house_or_other = v5->arrival_rot_y;