Mercurial > mm7

comparison Events.cpp @ 1033:3a5c8df8381d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* UI cleans and moves * Deleted many junk global variables.
author Nomad
date Tue, 21 May 2013 23:44:51 +0200
parents 9ac94d00012e
children 7f8be9f9769e 39f42990698f
comparison
equal deleted inserted replaced
1031:f93d17337113 1033:3a5c8df8381d
527 { 527 {
528 //Actor::Actor(&Dst); 528 //Actor::Actor(&Dst);
529 memset(&Dst, 0, 0x344u); 529 memset(&Dst, 0, 0x344u);
530 dword_5B65D0_dialogue_actor_npc_id = _evt->v5 + ((_evt->v6 + ((_evt->v7 + ((unsigned int)_evt->v8 << 8)) << 8)) << 8); 530 dword_5B65D0_dialogue_actor_npc_id = _evt->v5 + ((_evt->v6 + ((_evt->v7 + ((unsigned int)_evt->v8 << 8)) << 8)) << 8);
531 Dst.sNPC_ID = dword_5B65D0_dialogue_actor_npc_id; 531 Dst.sNPC_ID = dword_5B65D0_dialogue_actor_npc_id;
532 Dst.InitializeDialogue(0); 532 GameUI_InitializeDialogue(&Dst, false);
533 } 533 }
534 else 534 else
535 { 535 {
536 bDialogueUI_InitializeActor_NPC_ID = _evt->v5 + ((_evt->v6 + ((_evt->v7 + ((unsigned int)_evt->v8 << 8)) << 8)) << 8); 536 bDialogueUI_InitializeActor_NPC_ID = _evt->v5 + ((_evt->v6 + ((_evt->v7 + ((unsigned int)_evt->v8 << 8)) << 8)) << 8);
537 } 537 }
1255 v134 = v96 + ((_evt->v26 + ((_evt->v27 + ((uint)_evt->v28 << 8)) << 8)) << 8); 1255 v134 = v96 + ((_evt->v26 + ((_evt->v27 + ((uint)_evt->v28 << 8)) << 8)) << 8);
1256 if ( _evt->v29 || _evt->v30 ) 1256 if ( _evt->v29 || _evt->v30 )
1257 { 1257 {
1258 if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode ) 1258 if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode )
1259 pRenderer->_49FD3A(); 1259 pRenderer->_49FD3A();
1260 sub_444839_move_map(_evt->v29, _evt->v30, v135, v132, v126, v129, v95, v134, (char *)&_evt->v31); 1260 TransitionUI_Load(_evt->v29, _evt->v30, v135, v132, v126, v129, v95, v134, (char *)&_evt->v31);
1261 dword_5C3418 = uEventID; 1261 dword_5C3418 = uEventID;
1262 dword_5C341C = curr_seq_num + 1; 1262 dword_5C341C = curr_seq_num + 1;
1263 goto LABEL_301; 1263 goto LABEL_301;
1264 } 1264 }
1265 _5B65AC_npcdata_fame_or_other = _evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8); 1265 _5B65AC_npcdata_fame_or_other = _evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8);