Mercurial > mm7
diff DecorationList.cpp @ 1306:13b7be8b06a0
Слияние
author | Ritor1 |
---|---|
date | Sun, 23 Jun 2013 14:27:57 +0600 |
parents | dcc52e17b517 5450af4f57ef |
children | 4fff79f04dbd |
line wrap: on
line diff
--- a/DecorationList.cpp Sun Jun 23 14:27:32 2013 +0600 +++ b/DecorationList.cpp Sun Jun 23 14:27:57 2013 +0600 @@ -1,27 +1,10 @@ +#include "Sprites.h" #include "DecorationList.h" -#include <string> #include "Allocator.h" -#include "mm7_data.h" -#include "Sprites.h" +#include "MM7.h" #include "FrameTableInc.h" - - -//----- (00458600) -------------------------------------------------------- -void DecorationList::ToFile() -{ - DecorationList *v1; // esi@1 - FILE *v2; // eax@1 - FILE *v3; // edi@1 - - v1 = this; - v2 = fopen("data\\ddeclist.bin", "wb"); - v3 = v2; - if ( !v2 ) - Abortf("Unable to save ddeclist.bin!"); - fwrite(v1, 4u, 1u, v2); - fwrite(v1->pDecorations, 0x54u, v1->uNumDecorations, v3); - fclose(v3); -} +#include "mm7_data.h" +#include "Indoor.h" //----- (0045864C) -------------------------------------------------------- void DecorationList::FromFile(void *pSerialized) @@ -235,7 +218,35 @@ fclose(File); return 1; } +//----- (00458600) -------------------------------------------------------- +void DecorationList::ToFile() +{ + DecorationList *v1; // esi@1 + FILE *v2; // eax@1 + FILE *v3; // edi@1 + v1 = this; + v2 = fopen("data\\ddeclist.bin", "wb"); + v3 = v2; + if ( !v2 ) + Abortf("Unable to save ddeclist.bin!"); + fwrite(v1, 4u, 1u, v2); + fwrite(v1->pDecorations, 0x54u, v1->uNumDecorations, v3); + fclose(v3); +} +//----- (004583B0) -------------------------------------------------------- +LevelDecoration::LevelDecoration() +{ + this->field_1A = 0; + this->field_18 = 0; + this->vPosition.z = 0; + this->vPosition.y = 0; + this->vPosition.x = 0; + this->uDecorationDescID = 0; + this->field_2 = 0; + this->field_16_event_id = 0; + this->uCog = 0; +} //----- (004488B6) -------------------------------------------------------- unsigned __int16 DecorationList::GetDecorIdByName(const char *pName) {