From f4a96bbf0c319fc3cdc33395002ee426a21ed45a Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Tue, 1 Apr 2003 00:39:33 +0000
Subject: [PATCH] Chat messages use the player color
---
src/include/player.h | 1 +
src/stratagus/player.cpp | 23 +++++++++++++++++++++--
src/ui/interface.cpp | 5 +++--
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/include/player.h b/src/include/player.h
index 35f0bcef0..7b23f7d88 100644
--- a/src/include/player.h
+++ b/src/include/player.h
@@ -453,6 +453,7 @@ extern Player Players[PlayerMax]; /// All players
extern Player* ThisPlayer; /// Player on local computer
extern int NoRescueCheck; /// Disable rescue check
extern int PlayerColors[PlayerMax]; /// Player colors
+extern char* PlayerColorNames[PlayerMax]; /// Player color names
extern char** RaceWcNames; /// pud original -> internal
diff --git a/src/stratagus/player.cpp b/src/stratagus/player.cpp
index c4efedd4b..a17b19fcb 100644
--- a/src/stratagus/player.cpp
+++ b/src/stratagus/player.cpp
@@ -69,7 +69,7 @@ global int PlayerColors[PlayerMax] = {
208, // red
1, // blue
216, // green
- 220, // violett
+ 220, // violet
224, // orange
228, // black
255, // white
@@ -78,7 +78,7 @@ global int PlayerColors[PlayerMax] = {
208, // red
1, // blue
216, // green
- 220, // violett
+ 220, // violet
224, // orange
228, // black
255, // white
@@ -86,6 +86,25 @@ global int PlayerColors[PlayerMax] = {
251, // yellow
};
+global char* PlayerColorNames[PlayerMax] = {
+ "red",
+ "blue",
+ "green",
+ "violet",
+ "orange",
+ "black",
+ "white"
+ "yellow",
+ "red",
+ "blue",
+ "green",
+ "violet",
+ "orange",
+ "black",
+ "white"
+ "yellow",
+};
+
/*----------------------------------------------------------------------------
-- Functions
----------------------------------------------------------------------------*/
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 2f9286196..5b219ee86 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -10,7 +10,7 @@
//
/**@name interface.c - The interface. */
//
-// (c) Copyright 1998-2002 by Lutz Sammer
+// (c) Copyright 1998-2003 by Lutz Sammer
//
// FreeCraft is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published
@@ -1086,7 +1086,8 @@ local int InputKey(int key)
}
if (strlen(Input)) {
- sprintf(ChatMessage, "<%s> %s", ThisPlayer->Name, Input);
+ sprintf(ChatMessage, "~%s~<%s>~> %s", PlayerColorNames[ThisPlayer->Player],
+ ThisPlayer->Name, Input);
// FIXME: only to selected players ...
NetworkChatMessage(ChatMessage);
}