Mercurial > mm7

diff Events.cpp @ 373:edd2d8b7e3c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Interface reloading fix & party alignment enum
author Nomad
date Fri, 22 Feb 2013 18:40:38 +0200
parents ea55d6414029
children 88c30918eef7
line wrap: on
line diff
--- a/Events.cpp	Fri Feb 22 17:56:00 2013 +0200
+++ b/Events.cpp	Fri Feb 22 18:40:38 2013 +0200
@@ -25,6 +25,7 @@
 #include "Events.h"
 #include "Events2D.h"
 #include "Weather.h"
+#include "Party.h"
 
 
 
@@ -367,11 +368,11 @@
 				v16 = RemoveQuotes(Str);
 				VideoPlayer::MovieLoop(v16, 0, v14, 1);
 				if ( !_strcmpi(v16, "arbiter good") )
-					{
-					pParty->uAlignment = 0;
+                {
+                  pParty->alignment = PartyAlignment_Good;
 					v18 = 0;
 					LOBYTE(v17) = 1;
-					SetUserInterface(v18, v17);
+					SetUserInterface(PartyAlignment_Good, v17);
 					if ( !v15 || v128 == 3 )
 						{
 						pCurrentScreen = v128;
@@ -392,9 +393,9 @@
 				if ( !_strcmpi(v16, "arbiter evil") )
 					{
 					v18 = 2;
-					pParty->uAlignment = 2;
+					pParty->alignment = PartyAlignment_Evil;
 					LOBYTE(v17) = 1;
-					SetUserInterface(v18, v17);
+					SetUserInterface(PartyAlignment_Evil, v17);
 					if ( !v15 || v128 == 3 )
 						{
 						pCurrentScreen = v128;