Merge branch 'master' of https://github.com/rheit/zdoom

src/p_3dfloors.cpp

@@ -294,8 +294,9 @@ static int P_Set3DFloor(line_t * line, int param, int param2, int alpha)
 			FTextureID tex = line->sidedef[0]->GetTexture(side_t::top);
 			if (!tex.Exists() && alpha<255)
 			{
-				alpha=clamp(-tex.GetIndex(), 0, 255);
+				alpha = -tex.GetIndex();
 			}
+			alpha = clamp(alpha, 0, 255);
 			if (alpha==0) flags&=~(FF_RENDERALL|FF_BOTHPLANES|FF_ALLSIDES);
 			else if (alpha!=255) flags|=FF_TRANSLUCENT;
 										 

src/p_acs.cpp

@@ -6807,7 +6807,18 @@ scriptwait:
 			break;
 
 		case PCD_PRINTBINARY:
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6)))
+#define HAS_DIAGNOSTIC_PRAGMA
+#endif
+#ifdef HAS_DIAGNOSTIC_PRAGMA
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat="
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+#endif
 			work.AppendFormat ("%B", STACK(1));
+#ifdef HAS_DIAGNOSTIC_PRAGMA
+#pragma GCC diagnostic pop
+#endif
 			--sp;
 			break;
 

src/p_setup.cpp

@@ -3754,7 +3754,9 @@ void P_SetupLevel (char *lumpname, int position)
 		}
 		else
 		{
+			times[0].Clock();
 			P_ParseTextMap(map, missingtex);
+			times[0].Unclock();
 		}
 
 		times[6].Clock();

src/p_user.cpp

@@ -2473,9 +2473,10 @@ void P_PlayerThink (player_t *player)
 				if ( player->cheats & CF_HIGHJUMP )	jumpvelz *= 2;
 
 				player->mo->velz += jumpvelz;
-				S_Sound (player->mo, CHAN_BODY, "*jump", 1, ATTN_NORM);
 				player->mo->flags2 &= ~MF2_ONMOBJ;
 				player->jumpTics = -1;
+				if (!(player->cheats & CF_PREDICTING))
+					S_Sound(player->mo, CHAN_BODY, "*jump", 1, ATTN_NORM);
 			}
 		}
 
@@ -2502,7 +2503,7 @@ void P_PlayerThink (player_t *player)
 				{
 					player->mo->flags2 |= MF2_FLY;
 					player->mo->flags |= MF_NOGRAVITY;
-					if (player->mo->velz <= -39*FRACUNIT)
+					if ((player->mo->velz <= -39 * FRACUNIT) && !(player->cheats & CF_PREDICTING))
 					{ // Stop falling scream
 						S_StopSound (player->mo, CHAN_VOICE);
 					}

src/sdl/i_main.cpp

@@ -258,6 +258,11 @@ int main (int argc, char **argv)
 	unprotect_rtext();
 #endif
 
+	// Set LC_NUMERIC environment variable in case some library decides to
+	// clear the setlocale call at least this will be correct.
+	// Note that the LANG environment variable is overridden by LC_*
+	setenv ("LC_NUMERIC", "C", 1);
+
 #ifndef NO_GTK
 	GtkAvailable = gtk_init_check (&argc, &argv);
 #endif