Merge branch 'master' into gonesolong

Conflicts:
	src/CMakeLists.txt
	src/actor.h
	src/g_heretic/a_hereticmisc.cpp
	src/g_heretic/a_hereticweaps.cpp
	src/g_heretic/a_ironlich.cpp
	src/info.h
	src/namedef.h
	src/p_buildmap.cpp
	src/p_enemy.cpp
	src/p_map.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	zdoom.vcproj

src/p_pspr.cpp

@@ -208,6 +208,9 @@ void P_BringUpWeapon (player_t *player)
 	player->psprites[ps_weapon].sy = player->cheats & CF_INSTANTWEAPSWITCH
 		? WEAPONTOP : WEAPONBOTTOM;
 	P_SetPsprite (player, ps_weapon, newstate);
+	// make sure that the previous weapon's flash state is terminated.
+	// When coming here from a weapon drop it may still be active.
+	P_SetPsprite(player, ps_flash, NULL);
 }