1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

Rest of commit: broken battles, starting hero, town displaying and linker errors.

Further changes for netcode.
This commit is contained in:
Michał W. Urbańczyk
2008-06-30 00:06:41 +00:00
parent b26024e607
commit ea8562a6b1
33 changed files with 1027 additions and 2450 deletions

View File

@@ -10,6 +10,7 @@
#include "CGameState.h"
#include "hch\CGeneralTextHandler.h"
#include "client/CCreatureAnimation.h"
#include "client/Graphics.h"
#include <queue>
#include <sstream>
@@ -37,7 +38,7 @@ CBattleInterface::CBattleInterface(CCreatureSet * army1, CCreatureSet * army2, C
std::vector< std::string > & backref = CGI->mh->battleBacks[ LOCPLINT->cb->battleGetBattlefieldType() ];
background = BitmapHandler::loadBitmap(backref[ rand() % backref.size()] );
menu = BitmapHandler::loadBitmap("CBAR.BMP");
CSDL_Ext::blueToPlayersAdv(menu, hero1->tempOwner);
graphics->blueToPlayersAdv(menu, hero1->tempOwner);
//preparing graphics for displaying amounts of creatures
amountBasic = BitmapHandler::loadBitmap("CMNUMWIN.BMP");
@@ -949,7 +950,7 @@ CBattleHero::CBattleHero(std::string defName, int phaseG, int imageG, bool flipG
for(int i=0; i<flag->ourImages.size(); ++i)
{
flag->ourImages[i].bitmap = CSDL_Ext::alphaTransform(flag->ourImages[i].bitmap);
CSDL_Ext::blueToPlayersAdv(flag->ourImages[i].bitmap, player);
graphics->blueToPlayersAdv(flag->ourImages[i].bitmap, player);
}
}