comparison UI/Books/UIMapBook.cpp @ 1836:f017f8e79aa1

Merge
author Ritor1
date Fri, 11 Oct 2013 18:55:43 +0600
parents 35c1e4ff6ba7
children 211dfe2d8db1
comparison
equal deleted inserted replaced
1835:a5637690ffbb 1836:f017f8e79aa1
14 #include "..\..\Outdoor.h" 14 #include "..\..\Outdoor.h"
15 #include "..\..\LOD.h" 15 #include "..\..\LOD.h"
16 #include "..\..\Viewport.h" 16 #include "..\..\Viewport.h"
17 #include "..\..\Math.h" 17 #include "..\..\Math.h"
18 #include "..\..\texts.h" 18 #include "..\..\texts.h"
19 #include "..\..\Level/Decoration.h"
19 // 20 //
20 #include "..\..\mm7_data.h" 21 #include "..\..\mm7_data.h"
21 22
22 std::array<__int16, 6> pTownPortalBook_xs = {{260, 324, 147, 385, 390, 19}}; 23 std::array<__int16, 6> pTownPortalBook_xs = {{260, 324, 147, 385, 390, 19}};
23 std::array<__int16, 6> pTownPortalBook_ys = {{206, 84, 182, 239, 17, 283}}; 24 std::array<__int16, 6> pTownPortalBook_ys = {{206, 84, 182, 239, 17, 283}};