Fixed auto-character-select and switch_character combination. Added svn-properties keyword and eol-style, where appropriate.

18 files changed, 26 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index db49251b..b90c35ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2007-03-03  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+2007-03-03  Rogier Polak     <rogier.l.a.polak@gmail.com>
+
+        * src/main.cpp: Fixed a minor annoyance regarding
+        auto-character-select and switch_character.
+
+2007-03-03  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/CMakeLists.txt: Updated CMake file.
 	* src/Makefile.am: Updated Makefile.
diff --git a/src/channel.cpp b/src/channel.cpp
index c9849aba..ae79d7a7 100644
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software

  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  *

- *

+ *  $Id$

  */

 

 

diff --git a/src/channel.h b/src/channel.h
index 9bf69c78..2845eb39 100644
--- a/src/channel.h
+++ b/src/channel.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software

  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  *

- *

+ *  $Id$

  */

 

 #include <string>

diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp
index b2010465..352b3ab5 100644
--- a/src/channelmanager.cpp
+++ b/src/channelmanager.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software

  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  *

- *

+ *  $Id$

  */

 

 #include <list>

diff --git a/src/channelmanager.h b/src/channelmanager.h
index 7053a143..75c86a93 100644
--- a/src/channelmanager.h
+++ b/src/channelmanager.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software

  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  *

- *

+ *  $Id$

  */

 

 #ifndef _TMW_CHANNELMANAGER_H

diff --git a/src/gui/selectionlistener.h b/src/gui/selectionlistener.h
index a2fc6533..b39672b5 100644
--- a/src/gui/selectionlistener.h
+++ b/src/gui/selectionlistener.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: selectionlistener.h 2651 2006-09-03 16:47:48Z b_lindeijer $
+ *  $Id$
  */
 
 #ifndef _TMW_SELECTIONLISTENER_H__
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index 946f518b..0e2ea6d3 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: listbox.cpp 2655 2006-09-03 21:25:02Z b_lindeijer $
+ *  $Id$
  */
 
 #include "shoplistbox.h"
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index 1cfb183b..44a68445 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: listbox.h 2655 2006-09-03 21:25:02Z b_lindeijer $
+ *  $Id$
  */
 
 #ifndef _TMW_SHOPLISTBOX_H
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index 03e4880f..9a09389d 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -18,6 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ *  $Id$
  */
 
 #include "unregisterdialog.h"
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index 40fdf7fe..8ba380dd 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: register.h 3036 2007-01-14 16:45:13Z b_lindeijer $
+ *  $Id$
  */
 
 #ifndef _TMW_UNREGISTERDIALOG_H
diff --git a/src/main.cpp b/src/main.cpp
index 7fa996af..1e7ae32d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -853,8 +853,12 @@ int main(int argc, char *argv[])
                             config.getValue("lastCharacter", ""));
 
                     if (options.chooseDefault)
+                    {
                         ((CharSelectDialog*) currentDialog)->action(
                             gcn::ActionEvent(NULL, "ok"));
+                        options.chooseDefault = false;
+                    }
+
                     break;
 
                 case STATE_UNREGISTER_ATTEMPT:
diff --git a/src/net/logouthandler.cpp b/src/net/logouthandler.cpp
index b52a38c5..d8b9d435 100644
--- a/src/net/logouthandler.cpp
+++ b/src/net/logouthandler.cpp
@@ -18,6 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ *  $Id$
  */
 
 #include "logouthandler.h"
diff --git a/src/net/logouthandler.h b/src/net/logouthandler.h
index bf4e1221..fa906234 100644
--- a/src/net/logouthandler.h
+++ b/src/net/logouthandler.h
@@ -18,6 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ *  $Id$
  */
 
 #ifndef _TMW_NET_LOGOUTHANDLER_H
diff --git a/src/resources/equipmentdb.cpp b/src/resources/equipmentdb.cpp
index 52a9fbd3..a6c26624 100644
--- a/src/resources/equipmentdb.cpp
+++ b/src/resources/equipmentdb.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software

  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  *

- *  $Id:

+ *  $Id$

  */

 

 #include "equipmentdb.h"

diff --git a/src/resources/equipmentdb.h b/src/resources/equipmentdb.h
index b43a6145..1c1db7d1 100644
--- a/src/resources/equipmentdb.h
+++ b/src/resources/equipmentdb.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id:
+ *  $Id$
  */
 
 #ifndef _TMW_EQUIPMENT_DB_H
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index b09d1cc0..3a41c657 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -18,6 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ *  $Id$
  */
 
 #include "iteminfo.h"
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index e4406f9c..e773911d 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software

  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  *

- *  $Id:

+ *  $Id$

  */

 

 #include "monsterdb.h"

diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 3b69523d..048638c2 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id:
+ *  $Id$
  */
 
 #ifndef _TMW_MONSTER_DB_H