Mercurial > mm7
diff Outdoor.cpp @ 1026:6afa77761a00
Слияние
author | Ritor1 |
---|---|
date | Tue, 21 May 2013 12:43:08 +0600 |
parents | c45d51b3f4f4 |
children | 7735bdb3c30f |
line wrap: on
line diff
--- a/Outdoor.cpp Tue May 21 12:42:57 2013 +0600 +++ b/Outdoor.cpp Tue May 21 12:43:08 2013 +0600 @@ -1,18 +1,19 @@ #include <assert.h> +#include "stru6.h" + +#include "Sprites.h" +#include "LightmapBuilder.h" #include "Outdoor.h" #include "Party.h" #include "SpriteObject.h" #include "LOD.h" -#include "Render.h" #include "Allocator.h" -#include "Weather.h" #include "PaletteManager.h" #include "GUIProgressBar.h" #include "AudioPlayer.h" #include "IndoorCamera.h" #include "DecorationList.h" -#include "TileFrameTable.h" #include "Math.h" #include "ObjectList.h" #include "Game.h" @@ -27,8 +28,9 @@ #include "MM7.h" - - +#include "MapInfo.h" +#include "OutdoorCamera.h" +#include "BSPModel.h" MapStartPoint uLevel_StartingPointType; // weak