Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed sounds problems

Browse source
This commit is contained in:
Ley0k 2017-02-19 21:10:06 +01:00
parent c40668600b
commit 55c1b367f1
3 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
code/qcommon/alias.c
View file

@ -459,7 +459,7 @@ qboolean Alias_ListAdd( AliasList_t *list, const char *alias, const char *name,
node->alias_name[ i ] = tolower( node->alias_name[ i ] );
}
strncpy( node->real_name, alias, sizeof( node->real_name ) );
strncpy( node->real_name, name, sizeof( node->real_name ) );
node->stop_flag = 0;
Alias_ListAddParms( node, parameters );
list->dirty = qtrue;
@ -519,7 +519,7 @@ void Alias_ListSort( AliasList_t *list )
prev = ptr;
}
if( smallprev = root )
if( smallprev == root )
{
root = smallprev->next;
}
@ -671,7 +671,7 @@ const char *Alias_ListFindRandom( AliasList_t *list, const char *alias, AliasLis
void Alias_ListFindRandomRange( AliasList_t *list, const char *alias, int *min_index, int *max_index, float *total_weight )
{
char convalias[ 40 ];
char convalias[ MAX_ALIASLIST_NAME_LENGTH ];
int index;
int l;
int r;
@ -711,10 +711,10 @@ void Alias_ListFindRandomRange( AliasList_t *list, const char *alias, int *min_i
{
int __res;
for( index = l; index >= 0; index-- )
do
{
__res = ( l + r ) >> 1;
diff = strncmp( convalias, list->sorted_list[ index ]->alias_name, length );
diff = strncmp( convalias, list->sorted_list[ __res ]->alias_name, length );
if( diff == 0 )
{
@ -728,17 +728,18 @@ void Alias_ListFindRandomRange( AliasList_t *list, const char *alias, int *min_i
{
l = __res - 1;
}
}
} while( l >= r );
if( l >= r )
{
numfound = 0;
*min_index = __res;
*max_index = __res;
ptr = &list->sorted_list[ __res ];
for( i = __res + 1; i >= 0; i-- )
for( i = __res; i >= 0; i-- )
{
ptr = &list->sorted_list[ i ];
if( strncmp( convalias, ( *ptr )->alias_name, length ) )
break;
@ -750,10 +751,12 @@ void Alias_ListFindRandomRange( AliasList_t *list, const char *alias, int *min_i
}
}
ptr = &list->sorted_list[ i ];
ptr = &list->sorted_list[ __res + 1 ];
for( i = 0; i < list->num_in_list; i++ )
{
ptr = &list->sorted_list[ __res + i + 1 ];
if( strncmp( convalias, ( *ptr )->alias_name, length ) )
break;
@ -761,7 +764,7 @@ void Alias_ListFindRandomRange( AliasList_t *list, const char *alias, int *min_i
{
foundlist[ numfound++ ] = *ptr;
totalfoundweight += ( *ptr )->weight;
*max_index = i;
*max_index = __res + i + 1;
}
}

2
code/qcommon/alias.h
View file

@ -47,7 +47,7 @@ const char *S_ChannelNumToName( int iChannel );
//
#define MAX_ALIAS_NAME_LENGTH 40
#define MAX_REAL_NAME_LENGTH 128
#define MAX_ALIASLIST_NAME_LENGTH 32
#define MAX_ALIASLIST_NAME_LENGTH 40
typedef struct AliasActorNode_s
{

10
code/server/sv_snapshot.c
View file

@ -567,7 +567,7 @@ to take to clear, based on the current rate
====================
*/
#define HEADER_RATE_BYTES 48 // include our header, IP header, and some overhead
static int SV_RateMsec( client_t *client, int messageSize ) {
static int SV_RateMsec( client_t *client, size_t messageSize ) {
int rate;
int rateMsec;
@ -585,7 +585,7 @@ static int SV_RateMsec( client_t *client, int messageSize ) {
}
}
rateMsec = ( messageSize + HEADER_RATE_BYTES ) * 1000 / rate * com_timescale->value;
rateMsec = ( int )( messageSize + HEADER_RATE_BYTES ) * 1000 / rate * com_timescale->value;
return rateMsec;
}
@ -677,6 +677,12 @@ void SV_SendClientSnapshot( client_t *client ) {
// and the playerState_t
SV_WriteSnapshotToClient( client, &msg );
// clear the sounds on the client, preventing them to be sent each at packet
SV_ClearSounds( client );
// clear center print, preventing it to be sent at each packet
client->centerprint[ 0 ] = 0;
// su44: write any pending MoHAA cg messages
SV_WriteCGMToClient( client, &msg );