Mercurial > mm7
comparison mm7_3.cpp @ 1264:6bc88137a019
Merge
author | Gloval |
---|---|
date | Thu, 13 Jun 2013 00:56:22 +0400 |
parents | 73269755dd89 0aeac0b9ca30 |
children | 1803172dffd9 8a196c858180 24bc24b64ec2 |
comparison
equal
deleted
inserted
replaced
1263:73269755dd89 | 1264:6bc88137a019 |
---|---|
3 #endif | 3 #endif |
4 | 4 |
5 #include <assert.h> | 5 #include <assert.h> |
6 | 6 |
7 | 7 |
8 #include "VideoPlayer.h" | 8 #include "Texture.h" |
9 #include "mm7_data.h" | |
9 #include "Sprites.h" | 10 #include "Sprites.h" |
10 #include "BSPModel.h" | 11 #include "BSPModel.h" |
11 #include "OutdoorCamera.h" | 12 #include "OutdoorCamera.h" |
12 #include "LightmapBuilder.h" | 13 #include "LightmapBuilder.h" |
13 #include "DecalBuilder.h" | 14 #include "DecalBuilder.h" |
44 #include "Events2D.h" | 45 #include "Events2D.h" |
45 #include "stru176.h" | 46 #include "stru176.h" |
46 #include "stru298.h" | 47 #include "stru298.h" |
47 #include "texts.h" | 48 #include "texts.h" |
48 #include "Log.h" | 49 #include "Log.h" |
50 #include "Lights.h" | |
49 | 51 |
50 #include "MM7.h" | 52 #include "MM7.h" |
51 | 53 |
52 //----- (0046E44E) -------------------------------------------------------- | 54 //----- (0046E44E) -------------------------------------------------------- |
53 int __thiscall _46E44E_collide_against_faces_and_portals(unsigned int b1) | 55 int __thiscall _46E44E_collide_against_faces_and_portals(unsigned int b1) |