Mercurial > mm7
diff NPC.cpp @ 1026:6afa77761a00
Слияние
author | Ritor1 |
---|---|
date | Tue, 21 May 2013 12:43:08 +0600 |
parents | c45d51b3f4f4 |
children | c40d40027b77 |
line wrap: on
line diff
--- a/NPC.cpp Tue May 21 12:42:57 2013 +0600 +++ b/NPC.cpp Tue May 21 12:43:08 2013 +0600 @@ -1,14 +1,13 @@ -#include <string.h> -#include <stdlib.h> + #include "Allocator.h" #include "texts.h" -#include "Party.h" #include "LOD.h" #include "Autonotes.h" #include "Awards.h" #include "mm7_data.h" #include "MM7.h" +#include "Party.h" #include "NPC.h" int pDialogueNPCCount;