Mercurial > mm7

comparison Game.cpp @ 2338:1e865e8690ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moving some function declarations from unsorted subs to Actor.h and SpriteObject.h
author Grumpy7
date Sat, 05 Apr 2014 20:27:09 +0200
parents d6887ee81068
children 63e1388c5463
comparison
equal deleted inserted replaced
2337:d04017f3d2fa 2338:1e865e8690ba
361 361
362 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_0001) 362 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_0001)
363 dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_0001; 363 dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_0001;
364 else 364 else
365 { 365 {
366 UpdateActorAI(); 366 Actor::UpdateActorAI();
367 UpdateUserInput_and_MapSpecificStuff(); 367 UpdateUserInput_and_MapSpecificStuff();
368 } 368 }
369 } 369 }
370 if ( v16 ) 370 if ( v16 )
371 { 371 {
475 _5B65B4_npcdata_loword_house_or_other = pParty->sRotationY; 475 _5B65B4_npcdata_loword_house_or_other = pParty->sRotationY;
476 _5B65B8_npcdata_hiword_house_or_other = pParty->sRotationX; 476 _5B65B8_npcdata_hiword_house_or_other = pParty->sRotationX;
477 dword_5B65C0 = 1; 477 dword_5B65C0 = 1;
478 PrepareWorld(1); 478 PrepareWorld(1);
479 } 479 }
480 InitializeActors(); 480 Actor::InitializeActors();
481 481
482 int num_conscious_players = 0; 482 int num_conscious_players = 0;
483 int conscious_players_ids[4] = {-1, -1, -1, -1}; 483 int conscious_players_ids[4] = {-1, -1, -1, -1};
484 for (int i = 0; i < 4; ++i) 484 for (int i = 0; i < 4; ++i)
485 { 485 {
3127 _5B65AC_npcdata_fame_or_other = TownPortalList[uMessageParam].pos.y; 3127 _5B65AC_npcdata_fame_or_other = TownPortalList[uMessageParam].pos.y;
3128 _5B65B0_npcdata_rep_or_other = TownPortalList[uMessageParam].pos.z; 3128 _5B65B0_npcdata_rep_or_other = TownPortalList[uMessageParam].pos.z;
3129 v66 = TownPortalList[uMessageParam].rot_x; 3129 v66 = TownPortalList[uMessageParam].rot_x;
3130 _5B65B4_npcdata_loword_house_or_other = TownPortalList[uMessageParam].rot_y; 3130 _5B65B4_npcdata_loword_house_or_other = TownPortalList[uMessageParam].rot_y;
3131 _5B65B8_npcdata_hiword_house_or_other = v66; 3131 _5B65B8_npcdata_hiword_house_or_other = v66;
3132 InitializeActors(); 3132 Actor::InitializeActors();
3133 } 3133 }
3134 v67 = (char*)pGUIWindow_CurrentMenu->Hint; 3134 v67 = (char*)pGUIWindow_CurrentMenu->Hint;
3135 if ( v67 ) 3135 if ( v67 )
3136 *((int *)v67 + 17) = 1; 3136 *((int *)v67 + 17) = 1;
3137 else 3137 else