Mercurial > mm7
changeset 1323:bfde0563ecdc
removed weather.h from indoor.h
| author | Grumpy7 |
|---|---|
| date | Mon, 01 Jul 2013 22:42:09 +0200 |
| parents | 65d301bce717 |
| children | 78f0f74eab1d |
| files | Actor.cpp Events.cpp Indoor.h Outdoor.cpp Outdoor.h Weather.h mm7_3.cpp mm7_6.cpp |
| diffstat | 8 files changed, 44 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Mon Jul 01 00:00:49 2013 +0400 +++ b/Actor.cpp Mon Jul 01 22:42:09 2013 +0200 @@ -29,7 +29,6 @@ #include "LOD.h" #include "Party.h" #include "GUIWindow.h" -#include "GUIFont.h" #include "MM7.h" #include "SpriteObject.h"
--- a/Events.cpp Mon Jul 01 00:00:49 2013 +0400 +++ b/Events.cpp Mon Jul 01 22:42:09 2013 +0200 @@ -5,6 +5,7 @@ #include <assert.h> #include <stdlib.h> +#include "Weather.h" #include "Texture.h" #include "mm7_data.h" #include "VideoPlayer.h"
--- a/Indoor.h Mon Jul 01 00:00:49 2013 +0400 +++ b/Indoor.h Mon Jul 01 22:42:09 2013 +0200 @@ -1,9 +1,19 @@ #pragma once #include "VectorTypes.h" -#include "Weather.h" #include "Indoor_stuff.h" +#pragma pack(push, 1) +struct LocationTime_stru1 +{ + unsigned __int64 uLastVisitDay; + char sky_texture_name[12]; + int day_attrib; + int day_fogrange_1; + int day_fogrange_2; + char field_2F4[24]; +}; +#pragma pack(pop) /* 319 */ enum LEVEL_TYPE
--- a/Outdoor.cpp Mon Jul 01 00:00:49 2013 +0400 +++ b/Outdoor.cpp Mon Jul 01 22:42:09 2013 +0200 @@ -5,7 +5,7 @@ #include <assert.h> #include "stru6.h" - +#include "Weather.h" #include "Sprites.h" #include "LightmapBuilder.h" #include "Outdoor.h" @@ -3594,4 +3594,30 @@ pIcons_LOD->SyncLoadedFilesCount(); sprintf(pTmpBuf.data(), "TERRA%03d", pParty->uCurrentMinute / 6 + 10 * pParty->uCurrentHour); pTexture_RestUI_CurrentSkyFrame = pIcons_LOD->LoadTexturePtr(pTmpBuf.data(), TEXTURE_16BIT_PALETTE); -} \ No newline at end of file +} + + +//----- (004626BA) -------------------------------------------------------- +OutdoorLocation::OutdoorLocation() +{ + subconstuctor(); + uLastSunlightUpdateMinute = 0; + + uNumBModels = 0; + pBModels = nullptr; +} + +//----- (004626CD) -------------------------------------------------------- +void OutdoorLocation::subconstuctor() +{ + //OutdoorLocationTerrain::OutdoorLocationTerrain(&this->pTerrain); + field_F0 = 0; + field_F4 = 0x40000000u; + //DLVHeader::DLVHeader(&v1->ddm); + pSpawnPoints = 0; + pBModels = 0; + pCmap = 0; + pFaceIDLIST = 0; + pOMAP = 0; +} +
--- a/Outdoor.h Mon Jul 01 00:00:49 2013 +0400 +++ b/Outdoor.h Mon Jul 01 22:42:09 2013 +0200 @@ -127,28 +127,8 @@ #pragma pack(push, 1) struct OutdoorLocation { - //----- (004626BA) -------------------------------------------------------- - OutdoorLocation() - { - subconstuctor(); - uLastSunlightUpdateMinute = 0; - - uNumBModels = 0; - pBModels = nullptr; - } - //----- (004626CD) -------------------------------------------------------- - void subconstuctor() - { - //OutdoorLocationTerrain::OutdoorLocationTerrain(&this->pTerrain); - field_F0 = 0; - field_F4 = 0x40000000u; - //DLVHeader::DLVHeader(&v1->ddm); - pSpawnPoints = 0; - pBModels = 0; - pCmap = 0; - pFaceIDLIST = 0; - pOMAP = 0; - } + OutdoorLocation(); + void subconstuctor(); void ExecDraw(unsigned int bRedraw); void PrepareActorsDrawList();
--- a/Weather.h Mon Jul 01 00:00:49 2013 +0400 +++ b/Weather.h Mon Jul 01 22:42:09 2013 +0200 @@ -2,21 +2,10 @@ #pragma pack(push, 1) -struct LocationTime_stru1 - { - unsigned __int64 uLastVisitDay; - char sky_texture_name[12]; - int day_attrib; - int day_fogrange_1; - int day_fogrange_2; - char field_2F4[24]; - }; -#pragma pack(pop) /* 255 */ -#pragma pack(push, 1) struct Weather { inline Weather():