diff --git a/common/const.h b/common/const.h index 3708371b..abbf1adf 100644 --- a/common/const.h +++ b/common/const.h @@ -783,4 +783,13 @@ typedef struct int hitgroup; // 0 == generic, non zero is specific body part } trace_t; + +//----------------------------------- +// modif de Julien +// electro - rocket + +#define ELECTRO_DISK_SPEED 512 +#define ELECTRO_DISK_MAX 300 + + #endif//CONST_H diff --git a/game_shared/voice_status.cpp b/game_shared/voice_status.cpp index cbc81e81..f6e3c170 100644 --- a/game_shared/voice_status.cpp +++ b/game_shared/voice_status.cpp @@ -1,4 +1,4 @@ -//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============ +//========= Copyright // // Purpose: // @@ -26,7 +26,9 @@ #include "VGUI_TextImage.h" #include "vgui_loadtga.h" #include "vgui_helpers.h" -#include "vgui_mousecode.h" +//#include "vgui_mousecode.h" +#include "../vgui_support/vgui-dev/include/VGUI_MouseCode.h" + using namespace vgui; @@ -83,7 +85,7 @@ void ForEachBannedPlayer( char id[16] ) id[12], id[13], id[14], id[15] ); - strupr( str ); + /*strupr( str );*/ //modif de Julien - don't freaking CARE!!! gEngfuncs.pfnConsolePrint(str); } @@ -703,7 +705,7 @@ void CVoiceStatus::RepositionLabels() // Setup the background label to fit everything in. int border = 2; int bgWide = textWide + iconWide + border * 3; - int bgTall = max( textTall, iconTall ) + border * 2; + int bgTall = Q_max( textTall, iconTall ) + border * 2; //modif de Julien - fix that! pLabel->m_pBackground->setBounds( ScreenWidth - bgWide - 8, y, bgWide, bgTall ); // Put the text at the left.