Mercurial > mm7
diff mm7_4.cpp @ 1026:6afa77761a00
Слияние
author | Ritor1 |
---|---|
date | Tue, 21 May 2013 12:43:08 +0600 |
parents | 8b492d4722d4 9ac94d00012e |
children | c94d6a37d298 |
line wrap: on
line diff
--- a/mm7_4.cpp Tue May 21 12:42:57 2013 +0600 +++ b/mm7_4.cpp Tue May 21 12:43:08 2013 +0600 @@ -1,7 +1,15 @@ -#include <io.h> -#include <direct.h> #include <assert.h> +#include "VideoPlayer.h" +#include "Sprites.h" +#include "BSPModel.h" +#include "OutdoorCamera.h" +#include "Mouse.h" +#include "stru6.h" +#include "stru11.h" +#include "stru12.h" + +#include "LightmapBuilder.h" #include "MM7.h" #include "MapInfo.h" #include "Game.h" @@ -11,9 +19,6 @@ #include "AudioPlayer.h" #include "Outdoor.h" #include "IndoorCamera.h" -#include "Overlays.h" -#include "Monsters.h" -#include "Arcomage.h" #include "LOD.h" #include "Actor.h" #include "Allocator.h" @@ -23,27 +28,12 @@ #include "Math.h" #include "SpriteObject.h" #include "ObjectList.h" -#include "Chest.h" -#include "PaletteManager.h" #include "DecorationList.h" -#include "SaveLoad.h" -#include "stru123.h" #include "Time.h" #include "IconFrameTable.h" -#include "GUIProgressBar.h" -#include "Bink_Smacker.h" -#include "TileFrameTable.h" #include "PlayerFrameTable.h" #include "Awards.h" -#include "Autonotes.h" -#include "stru160.h" #include "TurnEngine.h" -#include "FactionTable.h" -#include "StorylineTextTable.h" -#include "Random.h" -#include "CastSpellInfo.h" -#include "stru298.h" -#include "stru12.h" #include "Events2D.h" #include "stru159.h" #include "texts.h" @@ -8020,12 +8010,12 @@ } //----- (004B46A5) -------------------------------------------------------- -char __fastcall DrawTextAtStatusBar(const char *sText, int font_color) -{ +void __fastcall DrawTextAtStatusBar( const char *Str, int a5 ) + { int v4; // eax@1 pRenderer->DrawTextureRGB(0, 352, pTexture_StatusBar); - v4 = pFontLucida->AlignText_Center(450, sText); - return pPrimaryWindow->DrawText(pFontLucida, v4 + 11, 357, font_color, sText, 0, 0, 0); + v4 = pFontLucida->AlignText_Center(450, Str); + pPrimaryWindow->DrawText(pFontLucida, v4 + 11, 357, a5, Str, 0, 0, 0); } //----- (004B46F8) --------------------------------------------------------