Mercurial > mm7

diff Events.h @ 427:49d945ce4285

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Sat, 23 Feb 2013 23:04:00 +0200
parents 88c30918eef7
children 24936a5ff8ca
line wrap: on
line diff
--- a/Events.h	Sat Feb 23 22:59:01 2013 +0200
+++ b/Events.h	Sat Feb 23 23:04:00 2013 +0200
@@ -105,14 +105,15 @@
   EVENT_GiveItem = 0x29,
   EVENT_ChangeEvent = 0x2A,
   EVENT_CheckSkill = 0x2B,
-  EVENT_OnCanShowDialogItemCmp = 0x2C,
-  EVENT_EndCanShowDialogItem = 0x2D,
-  EVENT_SetCanShowDialogItem = 0x2E,
+  EVENT_OnCanShowDialogItemCmp = 44,
+  EVENT_EndCanShowDialogItem = 45,
+  EVENT_SetCanShowDialogItem = 46,
   EVENT_SetNPCGroupNews = 0x2F,
   EVENT_SetActorGroup = 0x30,
   EVENT_NPCSetItem = 0x31,
   EVENT_SetNPCGreeting = 0x32,
   EVENT_IsActorAlive = 0x33,
+  EVENT_IsActorAssasinated =52,
   EVENT_OnMapLeave = 0x35,
   EVENT_ChangeGroup = 0x36,
   EVENT_ChangeGroupAlly = 0x37,
@@ -298,7 +299,7 @@
 #define EVT_BYTE(x) (unsigned char)x
 
 extern EventIndex pSomeOtherEVT_Events[4400];
-extern unsigned int uSomeOtherEVT_NumEvents;
+extern signed int uSomeOtherEVT_NumEvents;
 extern char *pSomeOtherEVT;
 extern EventIndex pSomeEVT_Events[4400];
 extern unsigned int uSomeEVT_NumEvents;