From 5030d5701b99037312d4754252500308b05b4424 Mon Sep 17 00:00:00 2001 From: tma Date: Thu, 23 Aug 2007 15:22:35 +0000 Subject: * (bug 3324) Incorrect use of sizeof (beast ) * (bug 2946) Console scrolling broken (identified by misantropia) + Field_VariableSizeDraw contained a hack to ensure the cursor was always visible. Unfortunately this interfered with scrolling long lines. Move the hack to a different place + Removed commented code in the same function + Reworked Field_KeyDownEvent to use a switch( ... ) and set edit->scroll in every case, thereby avoiding scrolling issues when "Home" or "End" are pressed git-svn-id: svn://svn.icculus.org/quake3/trunk@1130 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/q3_ui/ui_servers2.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'code/q3_ui') diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c index f7e7237..877fa00 100644 --- a/code/q3_ui/ui_servers2.c +++ b/code/q3_ui/ui_servers2.c @@ -568,34 +568,37 @@ static void ArenaServers_Remove( void ) // find address in master list for (i=0; iadrstr)) - break; - - // delete address from master list - if (i <= g_arenaservers.numfavoriteaddresses-1) { - if (i < g_arenaservers.numfavoriteaddresses-1) + if (!Q_stricmp(g_arenaservers.favoriteaddresses[i],servernodeptr->adrstr)) { - // shift items up - memcpy( &g_arenaservers.favoriteaddresses[i], &g_arenaservers.favoriteaddresses[i+1], (g_arenaservers.numfavoriteaddresses - i - 1)*sizeof(MAX_ADDRESSLENGTH)); + // delete address from master list + if (i < g_arenaservers.numfavoriteaddresses-1) + { + // shift items up + memcpy( &g_arenaservers.favoriteaddresses[i], &g_arenaservers.favoriteaddresses[i+1], (g_arenaservers.numfavoriteaddresses - i - 1)* MAX_ADDRESSLENGTH ); + } + g_arenaservers.numfavoriteaddresses--; + memset( &g_arenaservers.favoriteaddresses[g_arenaservers.numfavoriteaddresses], 0, MAX_ADDRESSLENGTH ); + break; } - g_arenaservers.numfavoriteaddresses--; } // find address in server list for (i=0; i