From 5ef32ad040b9abf784bc146183ed6b3d2bd6712d Mon Sep 17 00:00:00 2001
From: stpohle <stpohle>
Date: Sun, 3 Oct 2004 20:22:45 +0000
Subject: [PATCH] Playernames can now changed again. This wasn't working right
 in the past testing versions

---
 include/player.h    |  3 ++-
 src/configuration.c |  6 +++---
 src/playermenu.c    | 22 +++++++++++++++++++++-
 src/single.c        | 24 +++++++-----------------
 4 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/include/player.h b/include/player.h
index 0579a9d..02538bc 100644
--- a/include/player.h
+++ b/include/player.h
@@ -1,4 +1,4 @@
-/* $Id: player.h,v 1.6 2004/09/26 20:57:25 stpohle Exp $
+/* $Id: player.h,v 1.7 2004/10/03 20:22:45 stpohle Exp $
  * playerinclude file
  */
 
@@ -159,6 +159,7 @@ extern void playerinput_keyb_loop (int pl_nr);
 extern inline void playerinput_keyb_read (int pk_offset, int pl_nr);
 
 /* playermenu.c */
+extern void playernamemenu ();
 extern void playermenu ();
 extern int playermenu_selgfx (int pl_nr);
 extern void playermenu_getflags (char *text, _player *player);
diff --git a/src/configuration.c b/src/configuration.c
index f665f18..916dc4f 100644
--- a/src/configuration.c
+++ b/src/configuration.c
@@ -1,4 +1,4 @@
-/* $Id: configuration.c,v 1.64 2004/09/25 10:57:51 stpohle Exp $
+/* $Id: configuration.c,v 1.65 2004/10/03 20:22:46 stpohle Exp $
  * configuration */
 
 #include <SDL.h>
@@ -586,7 +586,7 @@ config_menu ()
     while (menuselect != -1 && bman.state != GS_quit) {
         menu = menu_new ("Configuration", 400, 300);
         menu_create_label (menu, "General Option", -1, 50, 1, COLOR_brown);
-        menu_create_button (menu, "Playermenu", 25, 85, 150, 1);
+        menu_create_button (menu, "Playernames", 25, 85, 150, 1);
         menu_create_button (menu, "Keyboard", 225, 85, 150, 2);
         menu_create_button (menu, "Video Setup", -1, 120, 200, 3);
         menu_create_label (menu, "Sound", 25, 154, 0, COLOR_brown);
@@ -614,7 +614,7 @@ config_menu ()
                 menuselect = -1;
             break;
 		case (1):				// player screen 
-			playermenu ();
+			playernamemenu ();
 			break;
 		case (2):				// keyboard settings
 			keyb_config ();
diff --git a/src/playermenu.c b/src/playermenu.c
index 552df22..e17f520 100644
--- a/src/playermenu.c
+++ b/src/playermenu.c
@@ -1,4 +1,4 @@
-/* $Id: playermenu.c,v 1.8 2004/09/26 02:28:06 stpohle Exp $ 
+/* $Id: playermenu.c,v 1.9 2004/10/03 20:22:46 stpohle Exp $ 
  *
  */
 
@@ -655,3 +655,23 @@ static void teammenu_ai_choosegfx () {
 		}
 	}
 };
+
+
+
+/*
+ * create a menu where we can change the playernames
+ */
+void playernamemenu () {
+	_menu *menu;
+
+	menu = menu_new ("Playernames", 350, 200);
+	
+	menu_create_entry (menu, "Player 1:", -1, 50, 300, &bman.playername, LEN_PLAYERNAME, MENU_entrytext, 1);
+	menu_create_entry (menu, "Player 2:", -1, 80, 300, &bman.player2name, LEN_PLAYERNAME, MENU_entrytext, 2);
+	
+	menu_create_button (menu, "Close", -1, 110, 100, 3); 
+	
+	menu_loop (menu);
+	
+	menu_delete (menu);
+}
diff --git a/src/single.c b/src/single.c
index d976040..d35843f 100644
--- a/src/single.c
+++ b/src/single.c
@@ -1,4 +1,4 @@
-/* $Id: single.c,v 1.74 2004/09/26 22:16:34 stpohle Exp $ */
+/* $Id: single.c,v 1.75 2004/10/03 20:22:46 stpohle Exp $ */
 /* single player */
 
 #include "basic.h"
@@ -756,12 +756,10 @@ single_menu ()
 		p, 
 		eventstate = 0,
         done = 0,
-		second_playerold = 0,
 		second_player = 0;
     _charlist nrplayerlist[MAX_PLAYERS + 1];
     _charlist *selnrplayer = &nrplayerlist[bman.ai_players];
 	_menu *menu;
-	_menuitem *pl2name = NULL;
 	_menuitem *aiplayer = NULL;
 	SDL_Event event;
 
@@ -784,7 +782,7 @@ single_menu ()
 	menu_create_text (menu, "numpl", 20, 50, 12, 2, COLOR_yellow, "Number of\nAI Players");
 	aiplayer = menu_create_list (menu, "AI Players", 40, 90, 50, 100, nrplayerlist, &selnrplayer, 3);
 	
-	menu_create_entry (menu,"Player 1:",150, 50, 230, &bman.playername, LEN_PLAYERNAME, MENU_entrytext, 4);
+	menu_create_button (menu,"Change Playernames" ,160, 50, 210, 4);
 
 	menu_create_bool (menu, "Use Second Player", 160, 90, 210, &second_player, 5);
 
@@ -798,19 +796,6 @@ single_menu ()
 	menu_draw (menu);
 	
 	do {
-		/* create or destroy second playername menuentry */
-		if (second_player != second_playerold) {
-			if (pl2name != NULL && !second_player) {
-				menu_del_menuitem (pl2name);
-				pl2name = NULL;
-			}
-			if (pl2name == NULL && second_player)
-				pl2name = menu_create_entry (menu,"Player 2:",150,120, 230, &bman.player2name, LEN_PLAYERNAME, MENU_entrytext, 6);
-			
-			second_playerold = second_player;
-			menu_draw (menu);		
-		}
-
 		gfx_blitdraw ();
 		eventstate = SDL_PollEvent (&event);
 
@@ -826,6 +811,11 @@ single_menu ()
 			mapmenu ();
 		}
 		
+		if (done > 0 && menu->focus->id == 4) {
+			done = 0;
+			playernamemenu ();
+		}
+		
 		if (done > 0 && menu->focus->id == 3)
 			done = 0;