Mercurial > mm7

comparison Engine/Engine.cpp @ 2575:a76d408c5132 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DrawTranslucent -> DrawTextureGrayShade Removed old texture drawing stuff
author a.parshin
date Wed, 09 Mar 2016 01:39:52 +0200
parents dd36326a9994
children
comparison
equal deleted inserted replaced
2574:dd36326a9994 2575:a76d408c5132
13 #include "Engine/texts.h" 13 #include "Engine/texts.h"
14 #include "Engine/stru123.h" 14 #include "Engine/stru123.h"
15 #include "Engine/LuaVM.h" 15 #include "Engine/LuaVM.h"
16 #include "Engine/MMT.h" 16 #include "Engine/MMT.h"
17 #include "Engine/SaveLoad.h" 17 #include "Engine/SaveLoad.h"
18 #include "Engine/Registry.h"
19 #include "Engine/Graphics/Vis.h" 18 #include "Engine/Graphics/Vis.h"
20 #include "Engine/Graphics/Weather.h" 19 #include "Engine/Graphics/Weather.h"
21 #include "Engine/Graphics/LightmapBuilder.h" 20 #include "Engine/Graphics/LightmapBuilder.h"
22 #include "Engine/Graphics/DecalBuilder.h" 21 #include "Engine/Graphics/DecalBuilder.h"
23 #include "Engine/Graphics/ParticleEngine.h" 22 #include "Engine/Graphics/ParticleEngine.h"
959 static_assert(sizeof(OverlayDesc) == 8, "Wrong type size"); 958 static_assert(sizeof(OverlayDesc) == 8, "Wrong type size");
960 static_assert(sizeof(ChestDesc) == 36, "Wrong type size"); 959 static_assert(sizeof(ChestDesc) == 36, "Wrong type size");
961 static_assert(sizeof(ObjectDesc_mm6) == 52, "Wrong type size"); 960 static_assert(sizeof(ObjectDesc_mm6) == 52, "Wrong type size");
962 static_assert(sizeof(ObjectDesc) == 56, "Wrong type size"); 961 static_assert(sizeof(ObjectDesc) == 56, "Wrong type size");
963 static_assert(sizeof(DecorationDesc) == 84, "Wrong type size"); 962 static_assert(sizeof(DecorationDesc) == 84, "Wrong type size");
964 static_assert(sizeof(IconFrame) == 32, "Wrong type size");
965 static_assert(sizeof(PlayerFrame) == 10, "Wrong type size"); 963 static_assert(sizeof(PlayerFrame) == 10, "Wrong type size");
966 static_assert(sizeof(TextureFrame) == 20, "Wrong type size"); 964 static_assert(sizeof(TextureFrame) == 20, "Wrong type size");
967 static_assert(sizeof(SpriteFrame) == 60, "Wrong type size"); 965 static_assert(sizeof(SpriteFrame) == 60, "Wrong type size");
968 static_assert(sizeof(RenderVertexSoft) == 0x30, "Wrong type size"); 966 static_assert(sizeof(RenderVertexSoft) == 0x30, "Wrong type size");
969 static_assert(sizeof(RenderBillboard) == 0x34, "Wrong type size"); 967 static_assert(sizeof(RenderBillboard) == 0x34, "Wrong type size");
970 static_assert(sizeof(Texture_MM7) == 0x48, "Wrong type size");
971 //static_assert(sizeof(RGBTexture) == 0x28, "Wrong type size"); 968 //static_assert(sizeof(RGBTexture) == 0x28, "Wrong type size");
972 //static_assert(sizeof(LODFile_IconsBitmaps) == 0x11BB8 + 4, "Wrong type size"); // + virtual dtor ptr 969 //static_assert(sizeof(LODFile_IconsBitmaps) == 0x11BB8 + 4, "Wrong type size"); // + virtual dtor ptr
973 static_assert(sizeof(AudioPlayer) == 0xC84, "Wrong type size"); 970 static_assert(sizeof(AudioPlayer) == 0xC84, "Wrong type size");
974 static_assert(sizeof(SoundDesc) == 0x78, "Wrong type size"); 971 static_assert(sizeof(SoundDesc) == 0x78, "Wrong type size");
975 static_assert(sizeof(stru339_spell_sound) == 0xAFD8, "Wrong type size"); 972 static_assert(sizeof(stru339_spell_sound) == 0xAFD8, "Wrong type size");
996 static_assert(sizeof(AIDirection) == 0x1C, "Wrong type size"); 993 static_assert(sizeof(AIDirection) == 0x1C, "Wrong type size");
997 static_assert(sizeof(ActorJob) == 0xC, "Wrong type size"); 994 static_assert(sizeof(ActorJob) == 0xC, "Wrong type size");
998 static_assert(sizeof(Actor) == 0x344, "Wrong type size"); 995 static_assert(sizeof(Actor) == 0x344, "Wrong type size");
999 static_assert(sizeof(LevelDecoration) == 0x20, "Wrong type size"); 996 static_assert(sizeof(LevelDecoration) == 0x20, "Wrong type size");
1000 static_assert(sizeof(KeyboardActionMapping) == 0x20C, "Wrong type size"); 997 static_assert(sizeof(KeyboardActionMapping) == 0x20C, "Wrong type size");
1001 static_assert(sizeof(UIAnimation) == 0xD, "Wrong type size"); 998 //static_assert(sizeof(UIAnimation) == 0xD, "Wrong type size");
1002 //static_assert(sizeof(SpawnPointMM7) == 0x18, "Wrong type size"); 999 //static_assert(sizeof(SpawnPointMM7) == 0x18, "Wrong type size");
1003 static_assert(sizeof(ODMFace) == 0x134, "Wrong type size"); 1000 static_assert(sizeof(ODMFace) == 0x134, "Wrong type size");
1004 static_assert(sizeof(BSPNode) == 0x8, "Wrong type size"); 1001 static_assert(sizeof(BSPNode) == 0x8, "Wrong type size");
1005 static_assert(sizeof(BSPModel) == 0xBC, "Wrong type size"); 1002 static_assert(sizeof(BSPModel) == 0xBC, "Wrong type size");
1006 static_assert(sizeof(OutdoorLocation) == 0x1C28C, "Wrong type size"); 1003 static_assert(sizeof(OutdoorLocation) == 0x1C28C, "Wrong type size");
1690 { 585, 0, 332, 0 }, 1687 { 585, 0, 332, 0 },
1691 { 468, 0, 0, 0 }, 1688 { 468, 0, 0, 0 },
1692 { 606, 0, 0, 0 } 1689 { 606, 0, 0, 0 }
1693 }; 1690 };
1694 1691
1695 pUIAnims[i]->uIconID = pIconsFrameTable->FindIcon(pUIAnimNames[i]); 1692 //pUIAnims[i]->uIconID = pIconsFrameTable->FindIcon(pUIAnimNames[i]);
1696 pIconsFrameTable->InitializeAnimation(pUIAnims[i]->uIconID); 1693 pUIAnims[i]->icon = pIconsFrameTable->GetIcon(pUIAnimNames[i]);
1694 pIconsFrameTable->InitializeAnimation(pUIAnims[i]->icon->id);
1697 1695
1698 pUIAnims[i]->uAnimLength = 0; 1696 pUIAnims[i]->uAnimLength = 0;
1699 pUIAnims[i]->uAnimTime = 0; 1697 pUIAnims[i]->uAnimTime = 0;
1700 pUIAnims[i]->x = _4E98D0[i][0]; 1698 pUIAnims[i]->x = _4E98D0[i][0];
1701 pUIAnims[i]->y = _4E98D0[i][2]; 1699 pUIAnims[i]->y = _4E98D0[i][2];