ready = false;\r
chatActive = false;\r
chatMessage = "";\r
- currentChat = new Queue<ChatMessage>();\r
+ currentChat = new Queue<ChatInfo>();\r
}\r
\r
public void LoadContent(ContentManager contentManager, GraphicsDeviceManager graphics)\r
\r
private void UpdateChat(GameTime gameTime, NetworkGame networkGame)\r
{\r
- currentChat.Concat(networkGame.ReceiveChats);\r
+ List<ChatInfo> chts = networkGame.ReceiveChats();\r
+ for (int x = 0; x < chts.Count(); x++)\r
+ currentChat.Enqueue(chts[x]);\r
+\r
+ //if number of chat messages has reached max remove older messages as new ones are added\r
+ if (currentChat.Count() > 8)\r
+ {\r
+ for (int x = 0; x < chts.Count(); x++)\r
+ {\r
+ currentChat.Dequeue();\r
+ }\r
+ }\r
\r
}\r
\r
}\r
}\r
\r
-\r
- Console.WriteLine("Finding");\r
break;\r
+\r
case lobbyState.Connected:\r
- if (chatActive)\r
+ if (chatActive) //If chat is activated by pressing T all inputs go to chat. Enter finishes chat esc returns\r
{\r
+ if (currentKeyboardState.IsKeyDown(Keys.Escape) && previousKeyboardState.IsKeyUp(Keys.Escape))\r
+ {\r
+ chatActive = false;\r
+ break;\r
+ }\r
if (currentKeyboardState.IsKeyDown(Keys.Enter) && previousKeyboardState.IsKeyUp(Keys.Enter))\r
{\r
networkGame.SendChat(chatMessage);\r
\r
foreach(Keys ky in newKeys)\r
{\r
- if(ky.Equals(Keys.Space))\r
+ if (ky.Equals(Keys.Back))\r
+ chatMessage = chatMessage.Substring(0, chatMessage.Length-1);\r
+ else if(ky.Equals(Keys.Space))\r
chatMessage = chatMessage + " ";\r
else\r
chatMessage = chatMessage + ky.ToString();\r
}\r
else\r
{\r
- updateChat(gameTime, networkGame);\r
+ UpdateChat(gameTime, networkGame);\r
chatMessage = "";\r
if (currentKeyboardState.IsKeyDown(Keys.T) && previousKeyboardState.IsKeyUp(Keys.T))\r
{\r
if (currentKeyboardState.IsKeyDown(Keys.X) && previousKeyboardState.IsKeyUp(Keys.X))\r
{\r
ready = false;\r
+ currentChat.Clear();\r
if (networkGame.HasActiveSession)\r
{\r
players = null;\r
\r
case lobbyState.FindingGames:\r
spriteBatch.Draw(selectGameScreen, backgroundPos, null, Color.White, 0, zero, scale, SpriteEffects.None, 0);\r
+ spriteBatch.DrawString(menuFont, "select game by pressing listed games index", new Vector2(250, 400), Color.Gray, 0f, zero, .7f, SpriteEffects.None, 0.5f);\r
if(availableSessions == null)\r
spriteBatch.DrawString(menuFont, "searching for available games ....", new Vector2(150, 100), Color.Gray, 0f, zero, .7f, SpriteEffects.None, 0.5f);\r
else if (availableSessions.Count == 0)\r
if (sessionIndex == selectedSessionIndex)\r
color = Color.Red;\r
\r
- spriteBatch.DrawString(menuFont, availableSessions[sessionIndex].HostGamertag, new Vector2(150, 100 + sessionIndex * menuFont.LineSpacing), color, 0f, zero, .7f, SpriteEffects.None, 0.5f);\r
- spriteBatch.DrawString(menuFont, availableSessions[sessionIndex].CurrentGamerCount + " / " + availableSessions[sessionIndex].OpenPublicGamerSlots + availableSessions[sessionIndex].OpenPrivateGamerSlots,\r
- new Vector2(400, 100 + sessionIndex * menuFont.LineSpacing), color, 0f, zero, .7f, SpriteEffects.None, 0.5f);\r
+ spriteBatch.DrawString(menuFont, sessionIndex+1 + " " + availableSessions[sessionIndex].HostGamertag, new Vector2(150, 125 + sessionIndex * menuFont.LineSpacing), color, 0f, zero, .7f, SpriteEffects.None, 0.5f);\r
+ spriteBatch.DrawString(menuFont, availableSessions[sessionIndex].CurrentGamerCount + " / 4",\r
+ new Vector2(450, 125 + sessionIndex * menuFont.LineSpacing), color, 0f, zero, .7f, SpriteEffects.None, 0.5f);\r
}\r
}\r
break;\r
for (int y = 0; y < currentChat.Count; y++)\r
{\r
spriteBatch.DrawString(menuFont, currentChat.ElementAt(y).Sender + ": " + currentChat.ElementAt(y).Message\r
- , new Vector2(400, 100 - y*10), Color.Blue, 0f, zero, .6f, SpriteEffects.None, 1f);\r
+ , new Vector2(400, 10 + y*15), Color.Blue, 0f, zero, .6f, SpriteEffects.None, 1f);\r
}\r
\r
}\r
if(chatActive)\r
- spriteBatch.DrawString(menuFont, chatMessage, new Vector2(400, 100), Color.Green, 0f, zero, .6f, SpriteEffects.None, 1f);\r
+ spriteBatch.DrawString(menuFont, chatMessage, new Vector2(400, 10 + 15*(currentChat.Count + 1)), Color.Green, 0f, zero, .6f, SpriteEffects.None, 1f);\r
}\r
\r
private void DrawPlayerList(SpriteBatch spriteBatch)\r
spriteBatch.DrawString(menuFont, "Current Players", new Vector2(topOfList.X + 15, topOfList.Y - 25), Color.White);\r
spriteBatch.DrawString(menuFont, "Command Options: to mark your self as ready", new Vector2(20, 20), Color.Gray, 0f, zero, .6f, SpriteEffects.None, 1f);\r
spriteBatch.DrawString(menuFont, "type players # to toggle chat", new Vector2(175, 40), Color.Gray, 0f, zero, .6f, SpriteEffects.None, 1f);\r
- spriteBatch.DrawString(menuFont, "return to main menu", new Vector2(175, 60), Color.Gray, 0f, zero, .6f, SpriteEffects.None, 1f);\r
+ spriteBatch.DrawString(menuFont, "return to main menu", new Vector2(175, 80), Color.Gray, 0f, zero, .6f, SpriteEffects.None, 1f);\r
+ spriteBatch.DrawString(menuFont, "enter chat mode", new Vector2(175, 60), Color.Gray, 0f, zero, .6f, SpriteEffects.None, 1f);\r
spriteBatch.DrawString(menuFont, "R", new Vector2(145, 20), Color.DarkGreen, 0f, zero, .6f, SpriteEffects.None, 1f);\r
spriteBatch.DrawString(menuFont, "#", new Vector2(145, 40), Color.DarkGreen, 0f, zero, .6f, SpriteEffects.None, 1f);\r
- spriteBatch.DrawString(menuFont, "X", new Vector2(145, 60), Color.DarkGreen, 0f, zero, .6f, SpriteEffects.None, 1f);\r
- \r
+ spriteBatch.DrawString(menuFont, "X", new Vector2(145, 80), Color.DarkGreen, 0f, zero, .6f, SpriteEffects.None, 1f);\r
+ spriteBatch.DrawString(menuFont, "T", new Vector2(145, 60), Color.DarkGreen, 0f, zero, .6f, SpriteEffects.None, 1f);\r
+\r
//Background squares\r
spriteBatch.Draw(menuItem, topOfList, null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);\r
spriteBatch.Draw(menuItem, new Vector2(topOfList.X, topOfList.Y + 65), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);\r
spriteBatch.DrawString(menuFont, "Chat with", new Vector2(topOfList.X + 152, topOfList.Y + 240), Color.DarkGray, 0f, zero, .6f, SpriteEffects.None, 1f);\r
\r
//Chat CheckBoxs\r
- Boolean chatwith = false; // change to reflect info from network, move to update and create one for each player\r
+ Boolean chatwith = true; // change to reflect info from network, move to update and create one for each player\r
if (!chatwith)\r
spriteBatch.Draw(deselectBox, new Vector2(topOfList.X +218, topOfList.Y + 35), null, Color.White, 0, zero, scale, SpriteEffects.None, 1f);\r
else\r