From 2846687448471de71b5ed2b949f4d36548156324 Mon Sep 17 00:00:00 2001 From: Andrey Nazarov Date: Sat, 21 Dec 2024 19:35:19 +0300 Subject: [PATCH] Rename CHAR_WIDTH to CONCHAR_WIDTH. Prevents conflict with limits.h when compiling in C23 mode. Also rename CHAR_HEIGHT. (cherry picked from commit d07f8c97267e692fb7290a30f47a4ee139a3d0b6) --- inc/client/client.h | 4 +-- src/client/cgame.c | 10 +++---- src/client/cgame_classic.c | 34 +++++++++++----------- src/client/console.c | 48 +++++++++++++++---------------- src/client/screen.c | 44 ++++++++++++++-------------- src/client/ui/demos.c | 24 ++++++++-------- src/client/ui/menu.c | 52 ++++++++++++++++----------------- src/client/ui/playerconfig.c | 4 +-- src/client/ui/servers.c | 56 ++++++++++++++++++------------------ src/client/ui/ui.c | 8 +++--- src/client/ui/ui.h | 8 +++--- src/common/field.c | 2 +- src/refresh/draw.c | 8 +++--- src/server/mvd/game.c | 2 +- 14 files changed, 152 insertions(+), 152 deletions(-) diff --git a/inc/client/client.h b/inc/client/client.h index 92aa382a0..fa69b4eee 100644 --- a/inc/client/client.h +++ b/inc/client/client.h @@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common/net/net.h" #include "common/utils.h" -#define CHAR_WIDTH 8 -#define CHAR_HEIGHT 8 +#define CONCHAR_WIDTH 8 +#define CONCHAR_HEIGHT 8 // only begin attenuating sound volumes when outside the FULLVOLUME range #define SOUND_FULLVOLUME 80 diff --git a/src/client/cgame.c b/src/client/cgame.c index 00e7e486b..cd8d100e1 100644 --- a/src/client/cgame.c +++ b/src/client/cgame.c @@ -232,7 +232,7 @@ static void CG_SCR_SetAltTypeface(bool enabled) static float CG_SCR_FontLineHeight(int scale) { if (!scr.kfont.pic) - return CHAR_HEIGHT * scale; + return CONCHAR_HEIGHT * scale; return scr.kfont.line_height; } @@ -244,7 +244,7 @@ static cg_vec2_t CG_SCR_MeasureFontString(const char *str, int scale) int x, y = CG_SCR_FontLineHeight(scale); if (!scr.kfont.pic) - x = strlen(str) * CHAR_WIDTH * scale; + x = strlen(str) * CONCHAR_WIDTH * scale; else { x = 0; @@ -277,8 +277,8 @@ static void CG_SCR_DrawFontString(const char *str, int x, int y, int scale, cons // FIXME: can contain line breaks if (!scr.kfont.pic) { while (*str) { - R_DrawStretchChar(draw_x, y, CHAR_WIDTH * scale, CHAR_HEIGHT * scale, draw_flags, *str++, draw_color, scr.font_pic); - draw_x += CHAR_WIDTH * scale; + R_DrawStretchChar(draw_x, y, CONCHAR_WIDTH * scale, CONCHAR_HEIGHT * scale, draw_flags, *str++, draw_color, scr.font_pic); + draw_x += CONCHAR_WIDTH * scale; } } else { while (*str) { @@ -328,7 +328,7 @@ static int32_t CG_SCR_DrawBind(int32_t isplit, const char *binding, const char * else Q_snprintf(str, sizeof(str), "[%s] %s", key, CG_Localize(purpose, NULL, 0)); CG_SCR_DrawFontString(str, x, y, scale, &rgba_white, false, CENTER); - return CHAR_HEIGHT; + return CONCHAR_HEIGHT; } static bool CG_CL_InAutoDemoLoop(void) diff --git a/src/client/cgame_classic.c b/src/client/cgame_classic.c index d34ce2f1e..af4530789 100644 --- a/src/client/cgame_classic.c +++ b/src/client/cgame_classic.c @@ -31,8 +31,8 @@ with this program; if not, write to the Free Software Foundation, Inc., /* Some definitions copied from client.h * This file is deliberately not included to make sure only functions from * the cgame_import struct are used */ -#define CHAR_WIDTH 8 -#define CHAR_HEIGHT 8 +#define CONCHAR_WIDTH 8 +#define CONCHAR_HEIGHT 8 #define UI_LEFT BIT(0) #define UI_RIGHT BIT(1) @@ -100,7 +100,7 @@ static void CG_DrawString(int x, int y, int flags, size_t maxlen, const char *s, while (maxlen-- && *s) { byte c = *s++; cgix.DrawCharEx(x, y, flags, c, color); - x += CHAR_WIDTH; + x += CONCHAR_WIDTH; } } @@ -118,9 +118,9 @@ static void CG_DrawStringEx(int x, int y, int flags, size_t maxlen, const char * } if ((flags & UI_CENTER) == UI_CENTER) { - x -= len * CHAR_WIDTH / 2; + x -= len * CONCHAR_WIDTH / 2; } else if (flags & UI_RIGHT) { - x -= len * CHAR_WIDTH; + x -= len * CONCHAR_WIDTH; } CG_DrawString(x, y, flags, maxlen, s, color); @@ -149,7 +149,7 @@ static void CG_DrawStringMulti(int x, int y, int flags, size_t maxlen, const cha } CG_DrawStringEx(x, y, flags, len, s, color); - y += CHAR_HEIGHT; + y += CONCHAR_HEIGHT; s = p + 1; } } @@ -340,13 +340,13 @@ static void layout_client(vrect_t hud_vrect, const char **s, const player_state_ time = atoi(token); HUD_DrawAltString(x + 32, y, cgi.CL_GetClientName(value)); - HUD_DrawString(x + 32, y + CHAR_HEIGHT, "Score: "); + HUD_DrawString(x + 32, y + CONCHAR_HEIGHT, "Score: "); Q_snprintf(buffer, sizeof(buffer), "%i", score); - HUD_DrawAltString(x + 32 + 7 * CHAR_WIDTH, y + CHAR_HEIGHT, buffer); + HUD_DrawAltString(x + 32 + 7 * CONCHAR_WIDTH, y + CONCHAR_HEIGHT, buffer); Q_snprintf(buffer, sizeof(buffer), "Ping: %i", ping); - HUD_DrawString(x + 32, y + 2 * CHAR_HEIGHT, buffer); + HUD_DrawString(x + 32, y + 2 * CONCHAR_HEIGHT, buffer); Q_snprintf(buffer, sizeof(buffer), "Time: %i", time); - HUD_DrawString(x + 32, y + 3 * CHAR_HEIGHT, buffer); + HUD_DrawString(x + 32, y + 3 * CONCHAR_HEIGHT, buffer); DrawPic(x, y, cgi.CL_GetClientPic(value)); } @@ -523,7 +523,7 @@ static void SCR_DrawHealthBar(vrect_t hud_vrect, int x, int y, int value) int bar_width = hud_vrect.width / 3; float percent = (value - 1) / 254.0f; int w = bar_width * percent + 0.5f; - int h = CHAR_HEIGHT / 2; + int h = CONCHAR_HEIGHT / 2; x -= bar_width / 2; cgi.SCR_DrawColorPic(x, y, w, h, "_white", &rgba_fg); @@ -721,8 +721,8 @@ static void SCR_ExecuteLayoutString(vrect_t hud_vrect, const char *s, int32_t pl } HUD_DrawCenterString(x + 320 / 2, y, cgi.get_configstring(index)); - SCR_DrawHealthBar(hud_vrect, x + 320 / 2, y + CHAR_HEIGHT + 4, value & 0xff); - SCR_DrawHealthBar(hud_vrect, x + 320 / 2, y + CHAR_HEIGHT + 12, (value >> 8) & 0xff); + SCR_DrawHealthBar(hud_vrect, x + 320 / 2, y + CONCHAR_HEIGHT + 4, value & 0xff); + SCR_DrawHealthBar(hud_vrect, x + 320 / 2, y + CONCHAR_HEIGHT + 12, (value >> 8) & 0xff); continue; } } @@ -802,10 +802,10 @@ static void SCR_DrawInventory(vrect_t hud_vrect, const cg_server_data_t *data, c x += 24; HUD_DrawString(x, y, "hotkey ### item"); - y += CHAR_HEIGHT; + y += CONCHAR_HEIGHT; HUD_DrawString(x, y, "------ --- ----"); - y += CHAR_HEIGHT; + y += CONCHAR_HEIGHT; for (i = top; i < num && i < top + DISPLAY_ITEMS; i++) { item = index[i]; @@ -822,11 +822,11 @@ static void SCR_DrawInventory(vrect_t hud_vrect, const cg_server_data_t *data, c } else { // draw a blinky cursor by the selected item HUD_DrawString(x, y, string); if ((cgi.CL_ClientRealTime() >> 8) & 1) { - cgi.SCR_DrawChar(x - CHAR_WIDTH, y, 1, 15, false); + cgi.SCR_DrawChar(x - CONCHAR_WIDTH, y, 1, 15, false); } } - y += CHAR_HEIGHT; + y += CONCHAR_HEIGHT; } } diff --git a/src/client/console.c b/src/client/console.c index f59425c49..0203a1f20 100644 --- a/src/client/console.c +++ b/src/client/console.c @@ -372,7 +372,7 @@ void Con_CheckResize(void) con.vidWidth = Q_rint(r_config.width * con.scale); con.vidHeight = Q_rint(r_config.height * con.scale); - con.linewidth = Q_clip(con.vidWidth / CHAR_WIDTH - 2, 0, CON_LINEWIDTH); + con.linewidth = Q_clip(con.vidWidth / CONCHAR_WIDTH - 2, 0, CON_LINEWIDTH); con.prompt.inputLine.visibleChars = con.linewidth; con.prompt.widthInChars = con.linewidth; con.chatPrompt.inputLine.visibleChars = con.linewidth; @@ -693,7 +693,7 @@ static int Con_DrawLine(int v, int row, float alpha, bool notify) const consoleLine_t *line = &con.text[row & CON_TOTALLINES_MASK]; const char *s = line->text; int flags = 0; - int x = CHAR_WIDTH; + int x = CONCHAR_WIDTH; int w = con.linewidth; color_t color; @@ -724,7 +724,7 @@ static int Con_DrawLine(int v, int row, float alpha, bool notify) return R_DrawString(x, v, flags, w, s, color, con.charsetImage); } -#define CON_PRESTEP (CHAR_HEIGHT * 3 + CHAR_HEIGHT / 4) +#define CON_PRESTEP (CONCHAR_HEIGHT * 3 + CONCHAR_HEIGHT / 4) /* ================ @@ -775,7 +775,7 @@ static void Con_DrawNotify(void) Con_DrawLine(v, i, alpha, true); - v += CHAR_HEIGHT; + v += CONCHAR_HEIGHT; } if (cls.key_dest & KEY_MESSAGE) { @@ -787,10 +787,10 @@ static void Con_DrawNotify(void) skip = 5; } - R_DrawString(CHAR_WIDTH, v, 0, MAX_STRING_CHARS, text, + R_DrawString(CONCHAR_WIDTH, v, 0, MAX_STRING_CHARS, text, COLOR_WHITE, con.charsetImage); con.chatPrompt.inputLine.visibleChars = con.linewidth - skip + 1; - IF_Draw(&con.chatPrompt.inputLine, skip * CHAR_WIDTH, v, + IF_Draw(&con.chatPrompt.inputLine, skip * CONCHAR_WIDTH, v, UI_DRAWCURSOR, con.charsetImage); } } @@ -836,15 +836,15 @@ static void Con_DrawSolidConsole(void) // draw the text y = vislines - CON_PRESTEP; - rows = y / CHAR_HEIGHT + 1; // rows of text to draw + rows = y / CONCHAR_HEIGHT + 1; // rows of text to draw // draw arrows to show the buffer is backscrolled if (con.display != con.current) { for (i = 1; i < con.linewidth / 2; i += 4) { - R_DrawChar(i * CHAR_WIDTH, y, 0, '^', COLOR_SETA_U8(COLOR_RED, color.a), con.charsetImage); + R_DrawChar(i * CONCHAR_WIDTH, y, 0, '^', COLOR_SETA_U8(COLOR_RED, color.a), con.charsetImage); } - y -= CHAR_HEIGHT; + y -= CONCHAR_HEIGHT; rows--; } @@ -862,7 +862,7 @@ static void Con_DrawSolidConsole(void) widths[i] = x; } - y -= CHAR_HEIGHT; + y -= CONCHAR_HEIGHT; row--; } @@ -909,8 +909,8 @@ static void Con_DrawSolidConsole(void) Q_strlcat(buffer, suf, sizeof(buffer)); // draw it - y = vislines - CON_PRESTEP + CHAR_HEIGHT * 2; - R_DrawString(CHAR_WIDTH, y, 0, con.linewidth, buffer, COLOR_WHITE, con.charsetImage); + y = vislines - CON_PRESTEP + CONCHAR_HEIGHT * 2; + R_DrawString(CONCHAR_WIDTH, y, 0, con.linewidth, buffer, COLOR_WHITE, con.charsetImage); } else if (cls.state == ca_loading) { // draw loading state switch (con.loadstate) { @@ -938,48 +938,48 @@ static void Con_DrawSolidConsole(void) Q_snprintf(buffer, sizeof(buffer), "Loading %s...", text); // draw it - y = vislines - CON_PRESTEP + CHAR_HEIGHT * 2; - R_DrawString(CHAR_WIDTH, y, 0, con.linewidth, buffer, COLOR_WHITE, con.charsetImage); + y = vislines - CON_PRESTEP + CONCHAR_HEIGHT * 2; + R_DrawString(CONCHAR_WIDTH, y, 0, con.linewidth, buffer, COLOR_WHITE, con.charsetImage); } } // draw the input prompt, user text, and cursor if desired x = 0; if (cls.key_dest & KEY_CONSOLE) { - y = vislines - CON_PRESTEP + CHAR_HEIGHT; + y = vislines - CON_PRESTEP + CONCHAR_HEIGHT; // draw command prompt i = con.mode == CON_REMOTE ? '#' : 17; - R_DrawChar(CHAR_WIDTH, y, 0, i, COLOR_YELLOW, con.charsetImage); + R_DrawChar(CONCHAR_WIDTH, y, 0, i, COLOR_YELLOW, con.charsetImage); // draw input line - x = IF_Draw(&con.prompt.inputLine, 2 * CHAR_WIDTH, y, + x = IF_Draw(&con.prompt.inputLine, 2 * CONCHAR_WIDTH, y, UI_DRAWCURSOR, con.charsetImage); } #define APP_VERSION APPLICATION " " VERSION -#define VER_WIDTH ((int)(sizeof(APP_VERSION) + 1) * CHAR_WIDTH) +#define VER_WIDTH ((int)(sizeof(APP_VERSION) + 1) * CONCHAR_WIDTH) - y = vislines - CON_PRESTEP + CHAR_HEIGHT; + y = vislines - CON_PRESTEP + CONCHAR_HEIGHT; row = 0; // shift version upwards to prevent overdraw if (x > con.vidWidth - VER_WIDTH) { - y -= CHAR_HEIGHT; + y -= CONCHAR_HEIGHT; row++; } // draw clock if (con_clock->integer) { - x = Com_Time_m(buffer, sizeof(buffer)) * CHAR_WIDTH; - if (widths[row] + x + CHAR_WIDTH <= con.vidWidth) { - R_DrawString(con.vidWidth - CHAR_WIDTH - x, y - CHAR_HEIGHT, + x = Com_Time_m(buffer, sizeof(buffer)) * CONCHAR_WIDTH; + if (widths[row] + x + CONCHAR_WIDTH <= con.vidWidth) { + R_DrawString(con.vidWidth - CONCHAR_WIDTH - x, y - CONCHAR_HEIGHT, UI_RIGHT, MAX_STRING_CHARS, buffer, COLOR_CYAN, con.charsetImage); } } // draw version if (!row || widths[0] + VER_WIDTH <= con.vidWidth) { - SCR_DrawStringEx(con.vidWidth - CHAR_WIDTH, y, UI_RIGHT, + SCR_DrawStringEx(con.vidWidth - CONCHAR_WIDTH, y, UI_RIGHT, MAX_STRING_CHARS, APP_VERSION, COLOR_CYAN, con.charsetImage); } } diff --git a/src/client/screen.c b/src/client/screen.c index 9890cdf91..c51b4fe7b 100644 --- a/src/client/screen.c +++ b/src/client/screen.c @@ -123,9 +123,9 @@ int SCR_DrawStringEx(int x, int y, int flags, size_t maxlen, } if ((flags & UI_CENTER) == UI_CENTER) { - x -= len * CHAR_WIDTH / 2; + x -= len * CONCHAR_WIDTH / 2; } else if (flags & UI_RIGHT) { - x -= len * CHAR_WIDTH; + x -= len * CONCHAR_WIDTH; } return R_DrawString(x, y, flags, maxlen, s, color, font); @@ -158,7 +158,7 @@ void SCR_DrawStringMulti(int x, int y, int flags, size_t maxlen, last_y = y; maxlen -= len; - y += CHAR_HEIGHT; + y += CONCHAR_HEIGHT; s = p + 1; } @@ -385,7 +385,7 @@ static void draw_progress_bar(float progress, bool paused, int framenum) size_t len; w = Q_rint(scr.hud_width * progress); - h = Q_rint(CHAR_HEIGHT / scr.hud_scale); + h = Q_rint(CONCHAR_HEIGHT / scr.hud_scale); scr.hud_height -= h; @@ -398,7 +398,7 @@ static void draw_progress_bar(float progress, bool paused, int framenum) h = Q_rint(scr.hud_height * scr.hud_scale); len = Q_scnprintf(buffer, sizeof(buffer), "%.f%%", progress * 100); - x = (w - len * CHAR_WIDTH) / 2; + x = (w - len * CONCHAR_WIDTH) / 2; R_DrawString(x, h, 0, MAX_STRING_CHARS, buffer, COLOR_WHITE, scr.font_pic); if (scr_demobar->integer > 1) { @@ -777,7 +777,7 @@ static void SCR_DrawObjects(color_t base_color) x += scr.hud_width + 1; } if (y < 0) { - y += scr.hud_height - CHAR_HEIGHT + 1; + y += scr.hud_height - CONCHAR_HEIGHT + 1; } color_t color = base_color; @@ -860,10 +860,10 @@ static void SCR_DrawChatHUD(color_t base_color) } if (y < 0) { - y += scr.hud_height - CHAR_HEIGHT + 1; - step = -CHAR_HEIGHT; + y += scr.hud_height - CONCHAR_HEIGHT + 1; + step = -CONCHAR_HEIGHT; } else { - step = CHAR_HEIGHT; + step = CONCHAR_HEIGHT; } lines = scr_chathud_lines->integer; @@ -908,13 +908,13 @@ static void SCR_DrawTurtle(color_t base_color) if (!cl.frameflags) return; - x = CHAR_WIDTH; - y = scr.hud_height - 11 * CHAR_HEIGHT; + x = CONCHAR_WIDTH; + y = scr.hud_height - 11 * CONCHAR_HEIGHT; #define DF(f) \ if (cl.frameflags & FF_##f) { \ SCR_DrawString(x, y, UI_ALTCOLOR, base_color, #f); \ - y += CHAR_HEIGHT; \ + y += CONCHAR_HEIGHT; \ } if (scr_showturtle->integer > 1) { @@ -948,8 +948,8 @@ static void SCR_DrawDebugStats(void) if (j > MAX_STATS) j = MAX_STATS; - x = CHAR_WIDTH; - y = (scr.hud_height - j * CHAR_HEIGHT) / 2; + x = CONCHAR_WIDTH; + y = (scr.hud_height - j * CONCHAR_HEIGHT) / 2; for (i = 0; i < j; i++) { Q_snprintf(buffer, sizeof(buffer), "%2d: %d", i, cl.frame.ps.stats[i]); color_t color = COLOR_WHITE; @@ -957,7 +957,7 @@ static void SCR_DrawDebugStats(void) color = COLOR_RED; } R_DrawString(x, y, 0, MAX_STRING_CHARS, buffer, color, scr.font_pic); - y += CHAR_HEIGHT; + y += CONCHAR_HEIGHT; } } @@ -977,21 +977,21 @@ static void SCR_DrawDebugPmove(void) if (!scr_showpmove->integer) return; - x = CHAR_WIDTH; - y = (scr.hud_height - 2 * CHAR_HEIGHT) / 2; + x = CONCHAR_WIDTH; + y = (scr.hud_height - 2 * CONCHAR_HEIGHT) / 2; i = cl.frame.ps.pmove.pm_type; if (i > PM_FREEZE) i = PM_FREEZE; R_DrawString(x, y, 0, MAX_STRING_CHARS, types[i], COLOR_WHITE, scr.font_pic); - y += CHAR_HEIGHT; + y += CONCHAR_HEIGHT; j = cl.frame.ps.pmove.pm_flags; for (i = 0; i < 8; i++) { if (j & (1 << i)) { x = R_DrawString(x, y, 0, MAX_STRING_CHARS, flags[i], COLOR_WHITE, scr.font_pic); - x += CHAR_WIDTH; + x += CONCHAR_WIDTH; } } } @@ -1359,13 +1359,13 @@ void SCR_StatTableSize(int key_width, int value_width) void SCR_StatKeyValue(const char *key, const char *value) { int c = (stat_state.key_id & 1) ? 24 : 0; - R_DrawFill32(stat_state.x, stat_state.y, CHAR_WIDTH * (stat_state.key_width + stat_state.value_width) + (STAT_MARGIN * 2), CHAR_HEIGHT + (STAT_MARGIN * 2), COLOR_RGBA(c, c, c, 127)); + R_DrawFill32(stat_state.x, stat_state.y, CONCHAR_WIDTH * (stat_state.key_width + stat_state.value_width) + (STAT_MARGIN * 2), CONCHAR_HEIGHT + (STAT_MARGIN * 2), COLOR_RGBA(c, c, c, 127)); SCR_DrawString(stat_state.x + STAT_MARGIN, stat_state.y + STAT_MARGIN, UI_DROPSHADOW, COLOR_WHITE, key); - stat_state.x += CHAR_WIDTH * stat_state.key_width; + stat_state.x += CONCHAR_WIDTH * stat_state.key_width; SCR_DrawString(stat_state.x + STAT_MARGIN, stat_state.y + STAT_MARGIN, UI_DROPSHADOW, COLOR_WHITE, value); stat_state.x = 24; - stat_state.y += CHAR_HEIGHT + (STAT_MARGIN * 2); + stat_state.y += CONCHAR_HEIGHT + (STAT_MARGIN * 2); stat_state.key_id++; } diff --git a/src/client/ui/demos.c b/src/client/ui/demos.c index ac92f7577..c2a6fa266 100644 --- a/src/client/ui/demos.c +++ b/src/client/ui/demos.c @@ -539,26 +539,26 @@ static void Size(menuFrameWork_t *self) int w1, w2; m_demos.list.generic.x = 0; - m_demos.list.generic.y = CHAR_HEIGHT; + m_demos.list.generic.y = CONCHAR_HEIGHT; m_demos.list.generic.width = 0; - m_demos.list.generic.height = uis.height - CHAR_HEIGHT * 2 - 1; + m_demos.list.generic.height = uis.height - CONCHAR_HEIGHT * 2 - 1; w1 = 17 + m_demos.widest_map + m_demos.widest_pov; - w2 = uis.width - w1 * CHAR_WIDTH - MLIST_PADDING * 4 - MLIST_SCROLLBAR_WIDTH; - if (w2 > 8 * CHAR_WIDTH) { + w2 = uis.width - w1 * CONCHAR_WIDTH - MLIST_PADDING * 4 - MLIST_SCROLLBAR_WIDTH; + if (w2 > 8 * CONCHAR_WIDTH) { // everything fits m_demos.list.columns[0].width = w2; - m_demos.list.columns[1].width = 12 * CHAR_WIDTH + MLIST_PADDING; - m_demos.list.columns[2].width = 5 * CHAR_WIDTH + MLIST_PADDING; - m_demos.list.columns[3].width = m_demos.widest_map * CHAR_WIDTH + MLIST_PADDING; - m_demos.list.columns[4].width = m_demos.widest_pov * CHAR_WIDTH + MLIST_PADDING; + m_demos.list.columns[1].width = 12 * CONCHAR_WIDTH + MLIST_PADDING; + m_demos.list.columns[2].width = 5 * CONCHAR_WIDTH + MLIST_PADDING; + m_demos.list.columns[3].width = m_demos.widest_map * CONCHAR_WIDTH + MLIST_PADDING; + m_demos.list.columns[4].width = m_demos.widest_pov * CONCHAR_WIDTH + MLIST_PADDING; m_demos.list.numcolumns = COL_MAX; } else { // map and pov don't fit - w2 = uis.width - 17 * CHAR_WIDTH - MLIST_PADDING * 2 - MLIST_SCROLLBAR_WIDTH; + w2 = uis.width - 17 * CONCHAR_WIDTH - MLIST_PADDING * 2 - MLIST_SCROLLBAR_WIDTH; m_demos.list.columns[0].width = w2; - m_demos.list.columns[1].width = 12 * CHAR_WIDTH + MLIST_PADDING; - m_demos.list.columns[2].width = 5 * CHAR_WIDTH + MLIST_PADDING; + m_demos.list.columns[1].width = 12 * CONCHAR_WIDTH + MLIST_PADDING; + m_demos.list.columns[2].width = 5 * CONCHAR_WIDTH + MLIST_PADDING; m_demos.list.columns[3].width = 0; m_demos.list.columns[4].width = 0; m_demos.list.numcolumns = COL_MAX - 2; @@ -579,7 +579,7 @@ static void Draw(menuFrameWork_t *self) { Menu_Draw(self); if (uis.width >= 640) { - UI_DrawString(uis.width, uis.height - CHAR_HEIGHT, + UI_DrawString(uis.width, uis.height - CONCHAR_HEIGHT, UI_RIGHT, COLOR_WHITE, m_demos.status); } } diff --git a/src/client/ui/menu.c b/src/client/ui/menu.c index c40a79d0a..505763b19 100644 --- a/src/client/ui/menu.c +++ b/src/client/ui/menu.c @@ -74,7 +74,7 @@ static void Action_Draw(menuAction_t *a) } else { flags |= UI_ALTCOLOR; if ((uis.realtime >> 8) & 1) { - UI_DrawChar(a->generic.x - strlen(a->generic.name) * CHAR_WIDTH / 2 - CHAR_WIDTH, a->generic.y, flags, color, 13); + UI_DrawChar(a->generic.x - strlen(a->generic.name) * CONCHAR_WIDTH / 2 - CONCHAR_WIDTH, a->generic.y, flags, color, 13); } } } @@ -210,7 +210,7 @@ static void Keybind_Init(menuKeybind_t *k) len = 3; } - k->generic.rect.width += (RCOLUMN_OFFSET - LCOLUMN_OFFSET) + len * CHAR_WIDTH; + k->generic.rect.width += (RCOLUMN_OFFSET - LCOLUMN_OFFSET) + len * CONCHAR_WIDTH; } /* @@ -391,7 +391,7 @@ Field_Init */ static void Field_Init(menuField_t *f) { - int w = f->width * CHAR_WIDTH; + int w = f->width * CONCHAR_WIDTH; f->generic.uiFlags &= ~(UI_LEFT | UI_RIGHT); @@ -405,7 +405,7 @@ static void Field_Init(menuField_t *f) f->generic.rect.x = f->generic.x - w / 2; f->generic.rect.y = f->generic.y; f->generic.rect.width = w; - f->generic.rect.height = CHAR_HEIGHT; + f->generic.rect.height = CONCHAR_HEIGHT; } } @@ -430,13 +430,13 @@ static void Field_Draw(menuField_t *f) f->generic.uiFlags | UI_RIGHT | UI_ALTCOLOR, color, f->generic.name); R_DrawFill32(f->generic.x + RCOLUMN_OFFSET, f->generic.y - 1, - f->field.visibleChars * CHAR_WIDTH, CHAR_HEIGHT + 2, color); + f->field.visibleChars * CONCHAR_WIDTH, CONCHAR_HEIGHT + 2, color); IF_Draw(&f->field, f->generic.x + RCOLUMN_OFFSET, f->generic.y, flags, uis.fontHandle); } else { R_DrawFill32(f->generic.rect.x, f->generic.rect.y - 1, - f->generic.rect.width, CHAR_HEIGHT + 2, color); + f->generic.rect.width, CONCHAR_HEIGHT + 2, color); IF_Draw(&f->field, f->generic.rect.x, f->generic.rect.y, flags, uis.fontHandle); @@ -560,7 +560,7 @@ void SpinControl_Init(menuSpinControl_t *s) } s->generic.rect.width += (RCOLUMN_OFFSET - LCOLUMN_OFFSET) + - maxLength * CHAR_WIDTH; + maxLength * CONCHAR_WIDTH; } /* @@ -1459,7 +1459,7 @@ static void MenuList_DrawString(int x, int y, int flags, rc.left = x; rc.right = x + column->width - 1; rc.top = y + 1; - rc.bottom = y + CHAR_HEIGHT + 1; + rc.bottom = y + CONCHAR_HEIGHT + 1; if ((column->uiFlags & UI_CENTER) == UI_CENTER) { x += column->width / 2 - 1; @@ -1672,14 +1672,14 @@ static void Slider_Free(menuSlider_t *s) static void Slider_Init(menuSlider_t *s) { - int len = strlen(s->generic.name) * CHAR_WIDTH; + int len = strlen(s->generic.name) * CONCHAR_WIDTH; s->generic.rect.x = s->generic.x + LCOLUMN_OFFSET - len; s->generic.rect.y = s->generic.y; s->generic.rect.width = (RCOLUMN_OFFSET - LCOLUMN_OFFSET) + - len + (SLIDER_RANGE + 2) * CHAR_WIDTH; - s->generic.rect.height = CHAR_HEIGHT; + len + (SLIDER_RANGE + 2) * CONCHAR_WIDTH; + s->generic.rect.height = CONCHAR_HEIGHT; } static menuSound_t Slider_Click(menuSlider_t *s) @@ -1690,31 +1690,31 @@ static menuSound_t Slider_Click(menuSlider_t *s) pos = Q_clipf((s->curvalue - s->minvalue) / (s->maxvalue - s->minvalue), 0, 1); - x = CHAR_WIDTH + (SLIDER_RANGE - 1) * CHAR_WIDTH * pos; + x = CONCHAR_WIDTH + (SLIDER_RANGE - 1) * CONCHAR_WIDTH * pos; // click left of thumb rect.x = s->generic.x + RCOLUMN_OFFSET; rect.y = s->generic.y; rect.width = x; - rect.height = CHAR_HEIGHT; + rect.height = CONCHAR_HEIGHT; if (UI_CursorInRect(&rect)) return Slider_DoSlide(s, -1); // click on thumb rect.x = s->generic.x + RCOLUMN_OFFSET + x; rect.y = s->generic.y; - rect.width = CHAR_WIDTH; - rect.height = CHAR_HEIGHT; + rect.width = CONCHAR_WIDTH; + rect.height = CONCHAR_HEIGHT; if (UI_CursorInRect(&rect)) { uis.mouseTracker = &s->generic; return QMS_SILENT; } // click right of thumb - rect.x = s->generic.x + RCOLUMN_OFFSET + x + CHAR_WIDTH; + rect.x = s->generic.x + RCOLUMN_OFFSET + x + CONCHAR_WIDTH; rect.y = s->generic.y; - rect.width = (SLIDER_RANGE + 1) * CHAR_WIDTH - x; - rect.height = CHAR_HEIGHT; + rect.width = (SLIDER_RANGE + 1) * CONCHAR_WIDTH - x; + rect.height = CONCHAR_HEIGHT; if (UI_CursorInRect(&rect)) return Slider_DoSlide(s, 1); @@ -1729,7 +1729,7 @@ static menuSound_t Slider_MouseMove(menuSlider_t *s) if (uis.mouseTracker != &s->generic) return QMS_NOTHANDLED; - pos = (uis.mouseCoords[0] - (s->generic.x + RCOLUMN_OFFSET + CHAR_WIDTH)) * (1.0f / (SLIDER_RANGE * CHAR_WIDTH)); + pos = (uis.mouseCoords[0] - (s->generic.x + RCOLUMN_OFFSET + CONCHAR_WIDTH)) * (1.0f / (SLIDER_RANGE * CONCHAR_WIDTH)); value = Q_clipf(pos, 0, 1) * (s->maxvalue - s->minvalue); steps = Q_rint(value / s->step); @@ -1803,13 +1803,13 @@ static void Slider_Draw(menuSlider_t *s) UI_DrawChar(s->generic.x + RCOLUMN_OFFSET, s->generic.y, flags | UI_LEFT, color, 128); for (i = 0; i < SLIDER_RANGE; i++) - UI_DrawChar(RCOLUMN_OFFSET + s->generic.x + i * CHAR_WIDTH + CHAR_WIDTH, s->generic.y, flags | UI_LEFT, color, 129); + UI_DrawChar(RCOLUMN_OFFSET + s->generic.x + i * CONCHAR_WIDTH + CONCHAR_WIDTH, s->generic.y, flags | UI_LEFT, color, 129); - UI_DrawChar(RCOLUMN_OFFSET + s->generic.x + i * CHAR_WIDTH + CHAR_WIDTH, s->generic.y, flags | UI_LEFT, color, 130); + UI_DrawChar(RCOLUMN_OFFSET + s->generic.x + i * CONCHAR_WIDTH + CONCHAR_WIDTH, s->generic.y, flags | UI_LEFT, color, 130); pos = Q_clipf((s->curvalue - s->minvalue) / (s->maxvalue - s->minvalue), 0, 1); - UI_DrawChar(CHAR_WIDTH + RCOLUMN_OFFSET + s->generic.x + (SLIDER_RANGE - 1) * CHAR_WIDTH * pos, s->generic.y, flags | UI_LEFT, color, 131); + UI_DrawChar(CONCHAR_WIDTH + RCOLUMN_OFFSET + s->generic.x + (SLIDER_RANGE - 1) * CONCHAR_WIDTH * pos, s->generic.y, flags | UI_LEFT, color, 131); } /* @@ -2250,7 +2250,7 @@ menuSound_t Menu_AdjustCursor(menuFrameWork_t *m, int dir) static void Menu_DrawStatus(menuFrameWork_t *menu) { - int linewidth = uis.width / CHAR_WIDTH; + int linewidth = uis.width / CONCHAR_WIDTH; int x, y, l, count; char *txt, *p; int lens[8]; @@ -2284,11 +2284,11 @@ static void Menu_DrawStatus(menuFrameWork_t *menu) lens[count++] = x; - R_DrawFill8(0, menu->y2 - count * CHAR_HEIGHT, uis.width, count * CHAR_HEIGHT, 4); + R_DrawFill8(0, menu->y2 - count * CONCHAR_HEIGHT, uis.width, count * CONCHAR_HEIGHT, 4); for (l = 0; l < count; l++) { - x = (uis.width - lens[l] * CHAR_WIDTH) / 2; - y = menu->y2 - (count - l) * CHAR_HEIGHT; + x = (uis.width - lens[l] * CONCHAR_WIDTH) / 2; + y = menu->y2 - (count - l) * CONCHAR_HEIGHT; R_DrawString(x, y, 0, lens[l], ptrs[l], COLOR_WHITE, uis.fontHandle); } } diff --git a/src/client/ui/playerconfig.c b/src/client/ui/playerconfig.c index fd081ce71..ec122e8f3 100644 --- a/src/client/ui/playerconfig.c +++ b/src/client/ui/playerconfig.c @@ -151,7 +151,7 @@ static void Size(menuFrameWork_t *self) m_player.refdef.width, m_player.refdef.height); if (uis.width < 800 && uis.width >= 640) { - x -= CHAR_WIDTH * 10; + x -= CONCHAR_WIDTH * 10; } if (m_player.menu.banner) { @@ -162,7 +162,7 @@ static void Size(menuFrameWork_t *self) } if (uis.width < 640) { - x -= CHAR_WIDTH * 10; + x -= CONCHAR_WIDTH * 10; m_player.hand.generic.name = "hand"; } else { m_player.hand.generic.name = "handedness"; diff --git a/src/client/ui/servers.c b/src/client/ui/servers.c index b284a51b9..c3345c6fe 100644 --- a/src/client/ui/servers.c +++ b/src/client/ui/servers.c @@ -899,52 +899,52 @@ static void SizeCompact(void) // server list // m_servers.list.generic.x = 0; - m_servers.list.generic.y = CHAR_HEIGHT; - m_servers.list.generic.height = uis.height / 2 - CHAR_HEIGHT; + m_servers.list.generic.y = CONCHAR_HEIGHT; + m_servers.list.generic.height = uis.height / 2 - CONCHAR_HEIGHT; - m_servers.list.columns[0].width = w - 10 * CHAR_WIDTH - MLIST_PADDING * 2; + m_servers.list.columns[0].width = w - 10 * CONCHAR_WIDTH - MLIST_PADDING * 2; m_servers.list.columns[1].width = 0; m_servers.list.columns[2].width = 0; - m_servers.list.columns[3].width = 7 * CHAR_WIDTH + MLIST_PADDING; - m_servers.list.columns[4].width = 3 * CHAR_WIDTH + MLIST_PADDING; + m_servers.list.columns[3].width = 7 * CONCHAR_WIDTH + MLIST_PADDING; + m_servers.list.columns[4].width = 3 * CONCHAR_WIDTH + MLIST_PADDING; // // player list // m_servers.players.generic.x = 0; m_servers.players.generic.y = uis.height / 2 + 1; - m_servers.players.generic.height = (uis.height + 1) / 2 - CHAR_HEIGHT - 2; + m_servers.players.generic.height = (uis.height + 1) / 2 - CONCHAR_HEIGHT - 2; - m_servers.players.columns[0].width = 3 * CHAR_WIDTH + MLIST_PADDING; - m_servers.players.columns[1].width = 3 * CHAR_WIDTH + MLIST_PADDING; - m_servers.players.columns[2].width = w - 6 * CHAR_WIDTH - MLIST_PADDING * 2; + m_servers.players.columns[0].width = 3 * CONCHAR_WIDTH + MLIST_PADDING; + m_servers.players.columns[1].width = 3 * CONCHAR_WIDTH + MLIST_PADDING; + m_servers.players.columns[2].width = w - 6 * CONCHAR_WIDTH - MLIST_PADDING * 2; m_servers.players.mlFlags |= MLF_SCROLLBAR; } static void SizeFull(void) { - int w = uis.width - MLIST_SCROLLBAR_WIDTH - 21 * CHAR_WIDTH - MLIST_PADDING * 3; + int w = uis.width - MLIST_SCROLLBAR_WIDTH - 21 * CONCHAR_WIDTH - MLIST_PADDING * 3; // // server list // m_servers.list.generic.x = 0; - m_servers.list.generic.y = CHAR_HEIGHT; - m_servers.list.generic.height = uis.height / 2 - CHAR_HEIGHT; + m_servers.list.generic.y = CONCHAR_HEIGHT; + m_servers.list.generic.height = uis.height / 2 - CONCHAR_HEIGHT; - m_servers.list.columns[0].width = w - 26 * CHAR_WIDTH - MLIST_PADDING * 4; - m_servers.list.columns[1].width = 8 * CHAR_WIDTH + MLIST_PADDING; - m_servers.list.columns[2].width = 8 * CHAR_WIDTH + MLIST_PADDING; - m_servers.list.columns[3].width = 7 * CHAR_WIDTH + MLIST_PADDING; - m_servers.list.columns[4].width = 3 * CHAR_WIDTH + MLIST_PADDING; + m_servers.list.columns[0].width = w - 26 * CONCHAR_WIDTH - MLIST_PADDING * 4; + m_servers.list.columns[1].width = 8 * CONCHAR_WIDTH + MLIST_PADDING; + m_servers.list.columns[2].width = 8 * CONCHAR_WIDTH + MLIST_PADDING; + m_servers.list.columns[3].width = 7 * CONCHAR_WIDTH + MLIST_PADDING; + m_servers.list.columns[4].width = 3 * CONCHAR_WIDTH + MLIST_PADDING; // // server info // m_servers.info.generic.x = 0; m_servers.info.generic.y = uis.height / 2 + 1; - m_servers.info.generic.height = (uis.height + 1) / 2 - CHAR_HEIGHT - 2; + m_servers.info.generic.height = (uis.height + 1) / 2 - CONCHAR_HEIGHT - 2; m_servers.info.columns[0].width = w / 3; m_servers.info.columns[1].width = w - w / 3; @@ -953,12 +953,12 @@ static void SizeFull(void) // player list // m_servers.players.generic.x = w + MLIST_SCROLLBAR_WIDTH; - m_servers.players.generic.y = CHAR_HEIGHT; - m_servers.players.generic.height = uis.height - CHAR_HEIGHT * 2 - 1; + m_servers.players.generic.y = CONCHAR_HEIGHT; + m_servers.players.generic.height = uis.height - CONCHAR_HEIGHT * 2 - 1; - m_servers.players.columns[0].width = 3 * CHAR_WIDTH + MLIST_PADDING; - m_servers.players.columns[1].width = 3 * CHAR_WIDTH + MLIST_PADDING; - m_servers.players.columns[2].width = 15 * CHAR_WIDTH + MLIST_PADDING; + m_servers.players.columns[0].width = 3 * CONCHAR_WIDTH + MLIST_PADDING; + m_servers.players.columns[1].width = 3 * CONCHAR_WIDTH + MLIST_PADDING; + m_servers.players.columns[2].width = 15 * CONCHAR_WIDTH + MLIST_PADDING; m_servers.players.mlFlags &= ~MLF_SCROLLBAR; } @@ -1017,22 +1017,22 @@ static void DrawStatus(void) else w = uis.width; - R_DrawFill8(0, uis.height - CHAR_HEIGHT, w, CHAR_HEIGHT, 4); - R_DrawFill8(w, uis.height - CHAR_HEIGHT, uis.width - w, CHAR_HEIGHT, 0); + R_DrawFill8(0, uis.height - CONCHAR_HEIGHT, w, CONCHAR_HEIGHT, 4); + R_DrawFill8(w, uis.height - CONCHAR_HEIGHT, uis.width - w, CONCHAR_HEIGHT, 0); if (m_servers.status_c) - UI_DrawString(uis.width / 2, uis.height - CHAR_HEIGHT, UI_CENTER, COLOR_WHITE, m_servers.status_c); + UI_DrawString(uis.width / 2, uis.height - CONCHAR_HEIGHT, UI_CENTER, COLOR_WHITE, m_servers.status_c); if (uis.width < 800) return; if (m_servers.list.numItems) - UI_DrawString(uis.width, uis.height - CHAR_HEIGHT, UI_RIGHT, COLOR_WHITE, m_servers.status_r); + UI_DrawString(uis.width, uis.height - CONCHAR_HEIGHT, UI_RIGHT, COLOR_WHITE, m_servers.status_r); if (m_servers.list.numItems && m_servers.list.curvalue >= 0) { serverslot_t *slot = m_servers.list.items[m_servers.list.curvalue]; if (slot->status > SLOT_PENDING) { - UI_DrawString(0, uis.height - CHAR_HEIGHT, UI_LEFT, COLOR_WHITE, slot->hostname); + UI_DrawString(0, uis.height - CONCHAR_HEIGHT, UI_LEFT, COLOR_WHITE, slot->hostname); } } } diff --git a/src/client/ui/ui.c b/src/client/ui/ui.c index 06e9dfda4..3de92685f 100644 --- a/src/client/ui/ui.c +++ b/src/client/ui/ui.c @@ -306,9 +306,9 @@ bool UI_CursorInRect(const vrect_t *rect) void UI_DrawString(int x, int y, int flags, color_t color, const char *string) { if ((flags & UI_CENTER) == UI_CENTER) { - x -= strlen(string) * CHAR_WIDTH / 2; + x -= strlen(string) * CONCHAR_WIDTH / 2; } else if (flags & UI_RIGHT) { - x -= strlen(string) * CHAR_WIDTH; + x -= strlen(string) * CONCHAR_WIDTH; } R_DrawString(x, y, flags, MAX_STRING_CHARS, string, COLOR_SETA_U8(color, 255), uis.fontHandle); @@ -322,8 +322,8 @@ void UI_DrawChar(int x, int y, int flags, color_t color, int ch) void UI_StringDimensions(vrect_t *rc, int flags, const char *string) { - rc->height = CHAR_HEIGHT; - rc->width = CHAR_WIDTH * strlen(string); + rc->height = CONCHAR_HEIGHT; + rc->width = CONCHAR_WIDTH * strlen(string); if ((flags & UI_CENTER) == UI_CENTER) { rc->x -= rc->width / 2; diff --git a/src/client/ui/ui.h b/src/client/ui/ui.h index b7d074175..6eb7049be 100644 --- a/src/client/ui/ui.h +++ b/src/client/ui/ui.h @@ -80,12 +80,12 @@ typedef enum { QMS_BEEP } menuSound_t; -#define RCOLUMN_OFFSET (CHAR_WIDTH * 2) +#define RCOLUMN_OFFSET (CONCHAR_WIDTH * 2) #define LCOLUMN_OFFSET -RCOLUMN_OFFSET #define GENERIC_SPACING(x) ((x) + (x) / 4) -#define MENU_SPACING GENERIC_SPACING(CHAR_HEIGHT) +#define MENU_SPACING GENERIC_SPACING(CONCHAR_HEIGHT) #define DOUBLE_CLICK_DELAY 300 @@ -174,9 +174,9 @@ typedef struct { #define MAX_COLUMNS 8 -#define MLIST_SPACING GENERIC_SPACING(CHAR_HEIGHT) +#define MLIST_SPACING GENERIC_SPACING(CONCHAR_HEIGHT) #define MLIST_BORDER_WIDTH 1 -#define MLIST_SCROLLBAR_WIDTH GENERIC_SPACING(CHAR_WIDTH) +#define MLIST_SCROLLBAR_WIDTH GENERIC_SPACING(CONCHAR_WIDTH) #define MLIST_PRESTEP 3 #define MLIST_PADDING (MLIST_PRESTEP*2) diff --git a/src/common/field.c b/src/common/field.c index 9beb02405..5d65f56be 100644 --- a/src/common/field.c +++ b/src/common/field.c @@ -278,7 +278,7 @@ int IF_Draw(const inputField_t *field, int x, int y, int flags, qhandle_t font) // draw blinking cursor if (flags & UI_DRAWCURSOR && com_localTime & BIT(8)) { - R_DrawChar(x + cursorPos * CHAR_WIDTH, y, flags, + R_DrawChar(x + cursorPos * CONCHAR_WIDTH, y, flags, Key_GetOverstrikeMode() ? 11 : '_', COLOR_WHITE, font); } diff --git a/src/refresh/draw.c b/src/refresh/draw.c index c49c00f10..14ec6bee7 100644 --- a/src/refresh/draw.c +++ b/src/refresh/draw.c @@ -429,7 +429,7 @@ void R_DrawChar(int x, int y, int flags, int c, color_t color, qhandle_t font) if (gl_fontshadow->integer > 0) flags |= UI_DROPSHADOW; - draw_char(x, y, CHAR_WIDTH, CHAR_HEIGHT, flags, c & 255, color, IMG_ForHandle(font)); + draw_char(x, y, CONCHAR_WIDTH, CONCHAR_HEIGHT, flags, c & 255, color, IMG_ForHandle(font)); } void R_DrawStretchChar(int x, int y, int w, int h, int flags, int c, color_t color, qhandle_t font) @@ -450,13 +450,13 @@ int R_DrawString(int x, int y, int flags, size_t maxlen, const char *s, color_t byte c = *s++; if ((flags & UI_MULTILINE) && c == '\n') { - y += CHAR_HEIGHT + (1.0 / draw.scale); + y += CONCHAR_HEIGHT + (1.0 / draw.scale); x = sx; continue; } - draw_char(x, y, CHAR_WIDTH, CHAR_HEIGHT, flags, c, color, image); - x += CHAR_WIDTH; + draw_char(x, y, CONCHAR_WIDTH, CONCHAR_HEIGHT, flags, c, color, image); + x += CONCHAR_WIDTH; } return x; diff --git a/src/server/mvd/game.c b/src/server/mvd/game.c index a2172163d..de2a2b4a3 100644 --- a/src/server/mvd/game.c +++ b/src/server/mvd/game.c @@ -53,7 +53,7 @@ LAYOUTS // clients per screen page #define PAGE_CLIENTS 16 -#define VER_OFS (272 - (int)(sizeof(VERSION) - 1) * CHAR_WIDTH) +#define VER_OFS (272 - (int)(sizeof(VERSION) - 1) * CONCHAR_WIDTH) static void MVD_LayoutClients(mvd_client_t *client) {