diff --git a/docs/rh-log.txt b/docs/rh-log.txt index bd38a2da3e..2bfcf19558 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,5 @@ October 4, 2009 (Changes by Graf Zahl) +- Deleted a_magewand.cpp because it only contained unused code. - Fixed: The conversation code tried to get the player's tag instead of the NPC's he is talking to when it had no given name. diff --git a/src/g_hexen/a_hexenmisc.cpp b/src/g_hexen/a_hexenmisc.cpp index ff6b56202a..387e9fcc65 100644 --- a/src/g_hexen/a_hexenmisc.cpp +++ b/src/g_hexen/a_hexenmisc.cpp @@ -44,7 +44,6 @@ #include "a_magecone.cpp" #include "a_magelightning.cpp" #include "a_magestaff.cpp" -#include "a_magewand.cpp" #include "a_pig.cpp" #include "a_serpent.cpp" #include "a_spike.cpp" diff --git a/src/g_hexen/a_magewand.cpp b/src/g_hexen/a_magewand.cpp deleted file mode 100644 index 0a28fc7b3c..0000000000 --- a/src/g_hexen/a_magewand.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -#include "actor.h" -#include "gi.h" -#include "m_random.h" -#include "s_sound.h" -#include "d_player.h" -#include "a_action.h" -#include "p_local.h" -#include "a_action.h" -#include "p_pspr.h" -#include "gstrings.h" -#include "a_hexenglobal.h" -#include "thingdef/thingdef.h" -*/ - -static FRandom pr_smoke ("MWandSmoke"); - -void A_MWandAttack (AActor *actor); - -//============================================================================ -// -// A_MWandAttack -// -//============================================================================ - -DEFINE_ACTION_FUNCTION(AActor, A_MWandAttack) -{ - AActor *mo; - - mo = P_SpawnPlayerMissile (self, PClass::FindClass("MageWandMissile")); - S_Sound (self, CHAN_WEAPON, "MageWandFire", 1, ATTN_NORM); -} diff --git a/zdoom.vcproj b/zdoom.vcproj index 71cd5eaf09..2a33a2c6bf 100644 --- a/zdoom.vcproj +++ b/zdoom.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -1860,14 +1868,6 @@ Outputs="$(IntDir)/$(InputName).obj" /> - - - @@ -2057,14 +2057,6 @@ Outputs="$(IntDir)\$(InputName).obj" /> - - - @@ -2075,6 +2067,14 @@ Outputs="$(IntDir)\$(InputName).obj" /> + + + - - - - - - - - - - - - - - - - - + + + - - - @@ -5387,6 +5343,14 @@ AdditionalIncludeDirectories="src\win32;$(NoInherit)" /> + + + @@ -5665,7 +5629,7 @@ />