Upstream update

codemp/cgame/cg_players.c

@@ -10607,7 +10607,7 @@ void CG_Player( centity_t *cent ) {
 
  CG_VehicleEffects(cent);
 
- if (cgs.jcinfo2& JAPRO_CINFO2_WTTRIBES) { //play wind sound if we are going fast. idk how to scale the volume so we are scaling the position of the speaker away from us (above us) to achieve that result
+ if (cg.predictedPlayerState.stats[STAT_MOVEMENTSTYLE] == MV_TRIBES) { //play wind sound if we are going fast. idk how to scale the volume so we are scaling the position of the speaker away from us (above us) to achieve that result
  const float speed2 = VectorLengthSquared(cg.predictedPlayerState.velocity);
  const float max_vol_speed = 3000*3000;
  const float min_vol_speed = 500*500;

codemp/game/g_cmds.c

@@ -6691,7 +6691,7 @@ static void Cmd_MovementStyle_f(gentity_t *ent)
  return;
 
  if (trap->Argc() != 2) {
- trap->SendServerCommand( ent-g_entities, "print \"Usage: /move <siege, jka, qw, cpm, ocpm, q3, pjk, wsw, rjq3, rjcpm, swoop, jetpack, speed, sp, slick, botcpm, coop, ocpm, or tribes>.\n\"" );
+ trap->SendServerCommand( ent-g_entities, "print \"Usage: /move <siege, jka, qw, cpm, q3, pjk, wsw, rjq3, rjcpm, swoop, jetpack, speed, sp, slick, botcpm, coop, ocpm, tribes, or surf>.\n\"" );
  return;
  }
 

codemp/game/g_items.c

@@ -2270,7 +2270,7 @@ int Pickup_Ammo (gentity_t *ent, gentity_t *other)
  other->client->ps.ammo[AMMO_THERMAL] = 2;
  other->client->ps.ammo[AMMO_TRIPMINE] = 2;
 
- if (other->health < other->client->ps.stats[STAT_MAX_HEALTH]) {
+ if (other->health > 0 && other->health < other->client->ps.stats[STAT_MAX_HEALTH]) {
  other->client->passiveHealthDebReduce = level.time; //Passif regen
  if (other->client->pers.tribesClass == 1) {
  other->health += 250;

shared/rd-rend2/tr_animation.cpp

@@ -136,7 +136,7 @@ R_MDRComputeFogNum
 */
 
 int R_MDRComputeFogNum( mdrHeader_t *header, trRefEntity_t *ent ) {
- int i, j;
+ int i;
  float frameRadius;
  fog_t *fog;
  mdrFrame_t *mdrFrame;
@@ -154,6 +154,7 @@ int R_MDRComputeFogNum( mdrHeader_t *header, trRefEntity_t *ent ) {
  VectorAdd( ent->e.origin, mdrFrame->localOrigin, localOrigin );
  frameRadius = mdrFrame->radius;
 #ifndef REND2_SP
+ int j;
  for (i = 1; i < tr.world->numfogs; i++) {
  fog = &tr.world->fogs[i];
  for (j = 0; j < 3; j++) {

shared/rd-rend2/tr_backend.cpp

@@ -2147,7 +2147,7 @@ static void RB_RenderMainPass( drawSurf_t *drawSurfs, int numDrawSurfs )
 
  if (r_drawSun->integer)
  {
- RB_DrawSun(0.1, tr.sunShader);
+ RB_DrawSun(0.1f, tr.sunShader);
  }
 
  if (r_drawSunRays->integer)
@@ -2161,7 +2161,7 @@ static void RB_RenderMainPass( drawSurf_t *drawSurfs, int numDrawSurfs )
  tr.sunFlareQueryActive[tr.sunFlareQueryIndex] = qtrue;
  qglBeginQuery(GL_SAMPLES_PASSED, tr.sunFlareQuery[tr.sunFlareQueryIndex]);
 
- RB_DrawSun(0.3, tr.sunFlareShader);
+ RB_DrawSun(0.3f, tr.sunFlareShader);
 
  qglEndQuery(GL_SAMPLES_PASSED);
 

shared/rd-rend2/tr_cache.cpp

@@ -185,6 +185,7 @@ void CModelCacheManager::DumpNonPure( void )
  int iInPak = ri.FS_FileIsInPAK( it->path, &iChecksum );
 #else
  int iInPak = ri.FS_FileIsInPAK(it->path);
+ iChecksum = it->iPAKChecksum;
 #endif
 
  if( iInPak == -1 || iChecksum != it->iPAKChecksum )

shared/rd-rend2/tr_ghoul2.cpp

@@ -925,7 +925,7 @@ R_AComputeFogNum
 */
 static int R_GComputeFogNum( trRefEntity_t *ent ) {
 
- int i, j;
+ int i;
  float frameRadius;
  fog_t *fog;
  vec3_t localOrigin;
@@ -937,6 +937,7 @@ static int R_GComputeFogNum( trRefEntity_t *ent ) {
  VectorCopy(ent->e.origin, localOrigin);
  frameRadius = ent->e.radius;
 #ifndef REND2_SP
+ int j;
  for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
  fog = &tr.world->fogs[i];
  for ( j = 0 ; j < 3 ; j++ ) {

shared/rd-rend2/tr_main.cpp

@@ -1654,7 +1654,7 @@ See if a sprite is inside a fog volume
 =================
 */
 int R_SpriteFogNum( trRefEntity_t *ent ) {
- int i, j;
+ int i;
  float frameRadius;
  fog_t *fog;
  vec3_t localOrigin;
@@ -1666,6 +1666,7 @@ int R_SpriteFogNum( trRefEntity_t *ent ) {
  VectorCopy(ent->e.origin, localOrigin);
  frameRadius = ent->e.radius;
 #ifndef REND2_SP
+ int j;
  for (i = 1; i < tr.world->numfogs; i++) {
  fog = &tr.world->fogs[i];
  for (j = 0; j < 3; j++) {

shared/rd-rend2/tr_mesh.cpp

@@ -168,7 +168,6 @@ RE_GetModelBounds
 void RE_GetModelBounds(refEntity_t *refEnt, vec3_t bounds1, vec3_t bounds2)
 {
  mdvFrame_t *frame;
- //md3Header_t *header;
  model_t *model;
 
  assert(refEnt);
@@ -269,7 +268,7 @@ R_ComputeFogNum
 =================
 */
 int R_ComputeFogNum( mdvModel_t *model, trRefEntity_t *ent ) {
- int i, j;
+ int i;
  float frameRadius;
  fog_t *fog;
  mdvFrame_t *mdvFrame;
@@ -284,6 +283,7 @@ int R_ComputeFogNum( mdvModel_t *model, trRefEntity_t *ent ) {
  VectorAdd( ent->e.origin, mdvFrame->localOrigin, localOrigin );
  frameRadius = mdvFrame->radius;
 #ifndef REND2_SP
+ int j;
  for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
  fog = &tr.world->fogs[i];
  for ( j = 0 ; j < 3 ; j++ ) {