Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfixes'

master
automerge 2013-01-21 08:00:27 +01:00 committed by cybersphinx
parent 699d1f4d49 7ed3f2291d
commit f9ad00be24
4 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/display3d.cpp
View File

@ -547,9 +547,11 @@ static void NetworkDisplayImage(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset
} }
players[c] = '\0'; players[c] = '\0';
iV_SetFont(font_regular);
width = iV_GetTextWidth(players) + 10; width = iV_GetTextWidth(players) + 10;
height = iV_GetTextHeight(players) + 10; height = iV_GetTextHeight(players) + 10;
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
iV_DrawText(players, x - width, y + height); iV_DrawText(players, x - width, y + height);
} }

26
src/frend.h
View File

@ -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__ #ifndef __INCLUDED_SRC_FREND_H__
#define __INCLUDED_SRC_FREND_H__ #define __INCLUDED_SRC_FREND_H__

1
src/intfac.h
View File

@ -20,6 +20,7 @@
* @file intfac.h * @file intfac.h
* *
* interface enums * interface enums
* List corresponding to the files in data/base/images/intfac.img
*/ */

3
tools/image/image.cpp
View File

@ -19,6 +19,9 @@ void printUsage(char const *programName)
"\t%s join data/base/images/frontend src/frend.h\n" "\t%s join data/base/images/frontend src/frend.h\n"
"\t\t--no-crush: Don't crush modified png files.\n" "\t\t--no-crush: Don't crush modified png files.\n"
"\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" "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" "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" "then join. After splitting, you may also add files. If adding a file\n"