X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=d9586636d9667ee2d97756e83c28fcc3913bc77a;hb=b02da898c7c8a08141df4e797774a61cf5e0163f;hp=5ba60d67bb02ac29061df9509834b307145c40ba;hpb=70641f2eb3f9fce8c89dcbf345e202050609a142;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 5ba60d6..d958663 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -80,9 +80,9 @@ void BattleState::Resize(int w, int h) {
 void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 	for (int i(0); i < 4; ++i) {
 		heroes[i].Position() = heroesLayout->CalculatePosition(i, background->w, background->h);
-		heroes[i].SpellMenu() = res->spellMenuPrototype;
+		heroes[i].SpellMenu() = *res->spellMenuProperties;
 		heroes[i].UpdateSpellMenu();
-		heroes[i].IkariMenu() = res->ikariMenuPrototype;
+		heroes[i].IkariMenu() = *res->ikariMenuProperties;
 		heroes[i].UpdateIkariMenu(res);
 		heroTags[i] = HeroTag(this, i);
 		smallHeroTags[i] = SmallHeroTag(this, i);
@@ -109,7 +109,7 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 	smallHeroTagPositions[2] = Vector<int>(xOffset + tagWidth, yOffset);
 	smallHeroTagPositions[3] = Vector<int>(xOffset + 3 * tagWidth, yOffset);
 
-	itemMenu = res->itemMenuPrototype;
+	itemMenu = *res->itemMenuProperties;
 	LoadInventory();
 }
 
@@ -422,7 +422,7 @@ void BattleState::RenderSmallHeroTags(SDL_Surface *screen, const Vector<int> &of
 	SDL_FillRect(screen, &rect, SDL_MapRGB(screen->format, 0, 0, 0));
 	rect.y += res->normalFont->CharHeight() / 8;
 	rect.h -= res->normalFont->CharHeight() / 4;
-	SDL_FillRect(screen, &rect, res->heroesBgColor);
+	SDL_FillRect(screen, &rect, res->heroesBgColor.MapRGB(screen->format));
 
 	for (int i(0); i < numHeroes; ++i) {
 		smallHeroTags[i].Render(screen, tagWidth, tagHeight, smallHeroTagPositions[i] + offset);