X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FRunState.cpp;h=155313f0f686e675979ad4775815d334a3cc2017;hb=b53c2ec2621ccc654e819cb203dc26e0a482bd41;hp=7fdc0665c82b6bd09bc64fa2c31d033ae728ad8c;hpb=923422e6a71f57b8fa24b826d1e2914faa144081;p=l2e.git

diff --git a/src/battle/states/RunState.cpp b/src/battle/states/RunState.cpp
index 7fdc066..155313f 100644
--- a/src/battle/states/RunState.cpp
+++ b/src/battle/states/RunState.cpp
@@ -49,8 +49,8 @@ void RunState::Resize(int width, int height) {
 
 void RunState::HandleEvents(const Input &input) {
 	if (timer.Finished()) {
+		battle->SetRunaway();
 		ctrl->PopState(); // pop self
-		ctrl->PopState(); // pop battle
 	}
 }
 
@@ -64,16 +64,16 @@ void RunState::Render(SDL_Surface *screen) {
 	battle->RenderBackground(screen, offset);
 	battle->RenderMonsters(screen, offset);
 	battle->RenderHeroes(screen, offset);
-	// render small tags
+	battle->RenderSmallHeroTags(screen, offset);
 	RenderTitleBar(screen, offset);
 }
 
 void RunState::RenderTitleBar(SDL_Surface *screen, const Vector<int> &offset) {
 	int height(battle->Res().titleFrame->BorderHeight() * 2 + battle->Res().titleFont->CharHeight());
-	battle->Res().titleFrame->Draw(screen, Point<int>(offset.X(), offset.Y()), battle->BackgroundWidth(), height);
+	battle->Res().titleFrame->Draw(screen, Point<int>(offset.X(), offset.Y()), battle->Width(), height);
 
 	Point<int> textPosition(
-			(battle->BackgroundWidth() - (std::strlen(battle->Res().escapeText) * battle->Res().titleFont->CharWidth())) / 2,
+			(battle->Width() - (std::strlen(battle->Res().escapeText) * battle->Res().titleFont->CharWidth())) / 2,
 			battle->Res().titleFrame->BorderHeight());
 	battle->Res().titleFont->DrawString(battle->Res().escapeText, screen, textPosition + offset);
 }