From 391203d83ed7a72b54fb7d7c72dbe35db14f0ea9 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 28 Aug 2006 23:04:08 +0000
Subject: Merged trunk development between revisions 2530 and 2618 to the 0.1.0
 branch.

---
 src/gui/char_select.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/gui/char_select.cpp')

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index adcbe290..042a5be8 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -224,6 +224,11 @@ void CharSelectDialog::logic()
     updatePlayerInfo();
 }
 
+std::string CharSelectDialog::getName()
+{
+    return mNameLabel->getCaption();
+}
+
 CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     Window("Create Character", true, parent), mSlot(slot)
 {
-- 
cgit v1.2.3-70-g09d2