Mercurial > mm7

comparison NPC.cpp @ 1028:fbde7d8fcdb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Tue, 21 May 2013 11:24:35 +0200
parents c45d51b3f4f4
children c40d40027b77
comparison
equal deleted inserted replaced
1027:5aba2a5047c4 1028:fbde7d8fcdb1
1 #include <string.h> 1
2 #include <stdlib.h>
3 2
4 #include "Allocator.h" 3 #include "Allocator.h"
5 #include "texts.h" 4 #include "texts.h"
6 #include "Party.h"
7 #include "LOD.h" 5 #include "LOD.h"
8 #include "Autonotes.h" 6 #include "Autonotes.h"
9 #include "Awards.h" 7 #include "Awards.h"
10 #include "mm7_data.h" 8 #include "mm7_data.h"
11 #include "MM7.h" 9 #include "MM7.h"
10 #include "Party.h"
12 #include "NPC.h" 11 #include "NPC.h"
13 12
14 int pDialogueNPCCount; 13 int pDialogueNPCCount;
15 struct Texture *pDialogueNPCPortraits[6]; 14 struct Texture *pDialogueNPCPortraits[6];
16 int uNumDialogueNPCPortraits; // weak 15 int uNumDialogueNPCPortraits; // weak