Fixed shit, once again.

This commit is contained in:
Marco Cawthorne 2017-11-13 23:39:04 -06:00
parent d86ddeff76
commit faa0ddf24a
7 changed files with 44 additions and 11 deletions

View file

@ -126,7 +126,6 @@ View_DrawViewModel
====================
*/
void View_DrawViewModel( void ) {
static float fLastTime;
static float fBob;
static float fLastWeapon;
@ -143,7 +142,7 @@ void View_DrawViewModel( void ) {
}
// Don't update when paused
if ( time != fLastTime ) {
if ( serverkey("pausestate") == "0" ) {
fBob = View_CalcBob();
if( getstatf( STAT_ACTIVEWEAPON ) < CS_WEAPON_COUNT ) {
@ -167,6 +166,7 @@ void View_DrawViewModel( void ) {
processmodelevents( eViewModel.modelindex, eViewModel.frame, fBaseTime, eViewModel.frame1time, View_ProcessEvent );
eViewModel.frame1time += frametime;
eViewModel.frame2time += frametime;
}
makevectors( getproperty( VF_ANGLES ) );
@ -189,9 +189,7 @@ void View_DrawViewModel( void ) {
if ( autocvar_cl_bobclassic == 1 ) {
eViewModel.angles_z = -fBob;
}
fLastTime = time;
// Only bother when zoomed out
if ( getstatf( STAT_VIEWZOOM ) == 255 ) {
// Update muzzleflash position and draw it

View file

@ -25,7 +25,7 @@
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\VGUITeamSelect.c" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\View.c" />
</category>
<category name="Server" expanded="yes">
<category name="Server" expanded="no">
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\AmbientSound.c" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Ammo.c" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\ArmouryEntity.c" />
@ -114,6 +114,13 @@
</project>
<workspace version="Crimson Editor 3.60">
<localfile path="C:\cygwin\home\User\FreeCS\Source\Server\Client.c" linenum="15" placement="2:3:-1:-1:-4:-23:22:22:904:454" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Client\HUD.c" linenum="12" placement="0:1:-1:-1:-4:-23:0:0:882:432" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\MenuMultiplayer.c" linenum="256" placement="2:3:-1:-1:-4:-23:22:22:908:458" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Init.c" linenum="20" placement="0:1:-1:-1:-4:-23:44:44:930:480" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Builtins.h" linenum="2487" placement="0:1:-1:-1:-4:-23:66:66:952:502" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Defs.h" linenum="66" placement="0:1:-1:-1:-4:-23:88:88:974:524" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Draw.c" linenum="64" placement="0:1:-1:-1:-4:-23:132:132:1018:568" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Objects.c" linenum="103" placement="0:1:-1:-1:-4:-23:154:154:1040:590" />
<localfile path="C:\cygwin\home\User\FreeCS\Source\Menu\Header.c" linenum="21" placement="0:1:-1:-1:-4:-23:176:176:1062:612" />
</workspace>

View file

@ -60,7 +60,7 @@ int iMapCount;
var float FONT_MENU;
#define MENU_COUNT 10
#define MENU_COUNT 11
enum {
MENU_MAIN,
MENU_CONFIGURATION,
@ -71,6 +71,7 @@ enum {
MENU_MULTIPLAYER,
MENU_MULTIPLAYER_CREATE,
MENU_MULTIPLAYER_OPTIONS,
MENU_MULTIPLAYER_IRC,
MENU_QUIT
};

View file

@ -28,6 +28,7 @@ fcsMenu fcsMain[ MENU_COUNT ] = {
{ Menu_Multiplayer, HEAD_MULTI },
{ Menu_Multiplayer_Create, HEAD_CREATEGAME },
{ Menu_Multiplayer_Create, HEAD_ADVOPTIONS },
{ Menu_Multiplayer_IRC, HEAD_ADVOPTIONS },
{ Menu_Quit, -1 }
};

View file

@ -123,6 +123,9 @@ void Menu_Multiplayer( void ) {
static void Multiplayer_ButtonDone( void ) {
iMenu = MENU_MAIN;
}
static void Multiplayer_ButtonIRC( void ) {
iMenu = MENU_MULTIPLAYER_IRC;
}
// Initialize it on the first run
if ( iSelectedServer == -1 ) {
@ -132,7 +135,7 @@ void Menu_Multiplayer( void ) {
sethostcachesort( gethostcacheindexforkey( "ping" ), FALSE );
refreshhostcache();
resorthostcache();
iSelectedServer = 0;
iSelectedServer = -2;
}
fldName = gethostcacheindexforkey("name");
@ -146,12 +149,15 @@ void Menu_Multiplayer( void ) {
iServersTotal = gethostcachevalue( SLIST_HOSTCACHEVIEWCOUNT );
Menu_SetClipArea( '32 148', '164 160' );
Menu_SetClipArea( '32 148', '164 192' );
Object_Button( '32 148', BTN_JOINGAME, Multiplayer_ButtonJoin, fButtonAlpha[0] );
Object_Button( '32 180', BTN_CREATE, Multiplayer_ButtonCreate, fButtonAlpha[1] );
Object_Button( '32 212', BTN_GAMEINFO, __NULL__, fButtonAlpha[2] );
Object_Button( '32 244', BTN_REFRESHLIST, Multiplayer_ButtonRefresh, fButtonAlpha[3] );
Object_Button( '32 276', BTN_DONE, Multiplayer_ButtonDone, fButtonAlpha[4] );
if ( checkcommand( "irc" ) ) {
Object_Button( '32 276', BTN_IRCCHAT, Multiplayer_ButtonIRC, fButtonAlpha[4] );
}
Object_Button( '32 308', BTN_DONE, Multiplayer_ButtonDone, fButtonAlpha[5] );
Menu_ResetClipArea();
Object_Frame( '196 140', '404 308' );
@ -234,4 +240,24 @@ void Menu_Multiplayer_Create( void ) {
vListPos_y += 10;
}
Menu_ResetClipArea();
}
void Menu_Multiplayer_IRC( void ) {
static int iIRCInit = FALSE;
static void IRC_ButtonDone( void ) {
iMenu = MENU_MULTIPLAYER;
}
if ( iIRCInit == FALSE ) {
print( "[IRC] Connecting to #freecs...\n" );
con_printf( "IRC", "/irc /connect irc.freenode.org #freecs\n" );
//con_getset( "IRC", "hidden", "1" );
iIRCInit = TRUE;
for (string s = ""; s; s = con_getset("", "next")) {con_printf(s, "SPAMMING EVERY CONSOLE HAR HAR HAR\n");}
}
con_draw( "IRC", vMenuOffset + '196 140', '404 308', 8 );
Object_Button( '32 308', BTN_DONE, IRC_ButtonDone, fButtonAlpha[0] );
}

Binary file not shown.

Binary file not shown.