* Merge unified-sdl to trunk
* Bump Q3_VERSION to 1.35
This commit is contained in:
parent
39abffeb3b
commit
672cfbf16f
188 changed files with 5071 additions and 41739 deletions
|
@ -431,10 +431,6 @@ void CG_ColorForHealth( vec4_t hcolor ) {
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// bk001205 - code below duplicated in q3_ui/ui-atoms.c
|
||||
// bk001205 - FIXME: does this belong in ui_shared.c?
|
||||
/*
|
||||
=================
|
||||
UI_DrawProportionalString2
|
||||
|
@ -594,7 +590,7 @@ UI_DrawBannerString
|
|||
static void UI_DrawBannerString2( int x, int y, const char* str, vec4_t color )
|
||||
{
|
||||
const char* s;
|
||||
unsigned char ch; // bk001204 : array subscript
|
||||
unsigned char ch;
|
||||
float ax;
|
||||
float ay;
|
||||
float aw;
|
||||
|
@ -704,7 +700,7 @@ int UI_ProportionalStringWidth( const char* str ) {
|
|||
static void UI_DrawProportionalString2( int x, int y, const char* str, vec4_t color, float sizeScale, qhandle_t charset )
|
||||
{
|
||||
const char* s;
|
||||
unsigned char ch; // bk001204 - unsigned
|
||||
unsigned char ch;
|
||||
float ax;
|
||||
float ay;
|
||||
float aw;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue