From 5afffc2f9be88b2f9656df85657cac86dac4d01a Mon Sep 17 00:00:00 2001 From: Cyp Date: Fri, 18 Jan 2013 08:53:36 +0100 Subject: [PATCH 1/2] Remove old autogenerated notice, add notice that tools/image is no longer useful. Icons are now always in separate image files (and joined at run-time), so there is currently no tool which autogenerates the header. The header should be updated manually, if adding new icons. Fixes ticket:3886. --- src/frend.h | 26 +++++++++++++++++++++++++- src/intfac.h | 1 + tools/image/image.cpp | 3 +++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/frend.h b/src/frend.h index 3a646d4f5..fa77941e2 100644 --- a/src/frend.h +++ b/src/frend.h @@ -1,4 +1,28 @@ -// THIS IS AN AUTOGENERATED HEADER! DO NOT EDIT (since your changes would be lost, anyway)! +/* + This file is part of Warzone 2100. + Copyright (C) 2013 Warzone 2100 Project + + Warzone 2100 is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Warzone 2100 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Warzone 2100; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +/** + * @file frend.h + * + * List corresponding to the files in data/base/images/frontend.img + * This used to be autogenerated at some point. + */ + #ifndef __INCLUDED_SRC_FREND_H__ #define __INCLUDED_SRC_FREND_H__ diff --git a/src/intfac.h b/src/intfac.h index 1dc0881f7..64fb7205f 100644 --- a/src/intfac.h +++ b/src/intfac.h @@ -20,6 +20,7 @@ * @file intfac.h * * interface enums + * List corresponding to the files in data/base/images/intfac.img */ diff --git a/tools/image/image.cpp b/tools/image/image.cpp index 49bd941ea..8befeb2d2 100644 --- a/tools/image/image.cpp +++ b/tools/image/image.cpp @@ -19,6 +19,9 @@ void printUsage(char const *programName) "\t%s join data/base/images/frontend src/frend.h\n" "\t\t--no-crush: Don't crush modified png files.\n" "\n" + "THIS PROGRAM IS NO LONGER USEFUL (except perhaps as part of converting\n" + "old mods).\n" + "\n" "The header file argument is optional. After splitting data/base/images/X,\n" "you may edit one or more of resulting data/base/images/X/*.png files, and\n" "then join. After splitting, you may also add files. If adding a file\n" From 7ed3f2291d207e2c8c062330c2a87b75e05e0cce Mon Sep 17 00:00:00 2001 From: Subsentient Date: Fri, 18 Jan 2013 19:13:58 -0700 Subject: [PATCH 2/2] Don't let other objects set text color of desync/quit/drop icons' player numbers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Same for font size. — Cyp) --- src/display3d.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/display3d.cpp b/src/display3d.cpp index eb4dfd717..9c361df13 100644 --- a/src/display3d.cpp +++ b/src/display3d.cpp @@ -564,9 +564,11 @@ static void NetworkDisplayImage(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset } players[c] = '\0'; + iV_SetFont(font_regular); width = iV_GetTextWidth(players) + 10; height = iV_GetTextHeight(players) + 10; + iV_SetTextColour(WZCOL_TEXT_BRIGHT); iV_DrawText(players, x - width, y + height); }