comparison Events.cpp @ 373:edd2d8b7e3c4

Interface reloading fix & party alignment enum
author Nomad
date Fri, 22 Feb 2013 18:40:38 +0200
parents ea55d6414029
children 88c30918eef7
comparison
equal deleted inserted replaced
372:6a2b4d1be013 373:edd2d8b7e3c4
23 #include "stru123.h" 23 #include "stru123.h"
24 #include "stru159.h" 24 #include "stru159.h"
25 #include "Events.h" 25 #include "Events.h"
26 #include "Events2D.h" 26 #include "Events2D.h"
27 #include "Weather.h" 27 #include "Weather.h"
28 #include "Party.h"
28 29
29 30
30 31
31 EventIndex pSomeOtherEVT_Events[4400]; 32 EventIndex pSomeOtherEVT_Events[4400];
32 unsigned int uSomeOtherEVT_NumEvents; 33 unsigned int uSomeOtherEVT_NumEvents;
365 v15 = _evt->v6; 366 v15 = _evt->v6;
366 strcpy(Str, Source); 367 strcpy(Str, Source);
367 v16 = RemoveQuotes(Str); 368 v16 = RemoveQuotes(Str);
368 VideoPlayer::MovieLoop(v16, 0, v14, 1); 369 VideoPlayer::MovieLoop(v16, 0, v14, 1);
369 if ( !_strcmpi(v16, "arbiter good") ) 370 if ( !_strcmpi(v16, "arbiter good") )
370 { 371 {
371 pParty->uAlignment = 0; 372 pParty->alignment = PartyAlignment_Good;
372 v18 = 0; 373 v18 = 0;
373 LOBYTE(v17) = 1; 374 LOBYTE(v17) = 1;
374 SetUserInterface(v18, v17); 375 SetUserInterface(PartyAlignment_Good, v17);
375 if ( !v15 || v128 == 3 ) 376 if ( !v15 || v128 == 3 )
376 { 377 {
377 pCurrentScreen = v128; 378 pCurrentScreen = v128;
378 if ( v128 == 3 ) 379 if ( v128 == 3 )
379 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen; 380 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
390 break; 391 break;
391 } 392 }
392 if ( !_strcmpi(v16, "arbiter evil") ) 393 if ( !_strcmpi(v16, "arbiter evil") )
393 { 394 {
394 v18 = 2; 395 v18 = 2;
395 pParty->uAlignment = 2; 396 pParty->alignment = PartyAlignment_Evil;
396 LOBYTE(v17) = 1; 397 LOBYTE(v17) = 1;
397 SetUserInterface(v18, v17); 398 SetUserInterface(PartyAlignment_Evil, v17);
398 if ( !v15 || v128 == 3 ) 399 if ( !v15 || v128 == 3 )
399 { 400 {
400 pCurrentScreen = v128; 401 pCurrentScreen = v128;
401 if ( v128 == 3 ) 402 if ( v128 == 3 )
402 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen; 403 pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;