OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed compilation for g_doom, g_heretic, g_hexen and g_strife folders

Browse source 
so that all files are included by a central one instead of compiling 
  each one separately. This speeds up the compilation process by 25%
  when doing a complete rebuild in Visual C.
- Cleaned up more header dependencies.

SVN r1226 (trunk)
This commit is contained in:
Christoph Oelckers 2008-09-15 14:11:05 +00:00
commit 760f70d3f1
171 changed files with 1667 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/g_hexen/a_fighteraxe.cpp
View file

@ -1,3 +1,4 @@
/*
#include "actor.h"
#include "gi.h"
#include "m_random.h"
@ -5,17 +6,16 @@
#include "d_player.h"
#include "a_action.h"
#include "p_local.h"
#include "p_enemy.h"
#include "a_action.h"
#include "p_pspr.h"
#include "gstrings.h"
#include "a_hexenglobal.h"
#include "p_effect.h"
#include "thingdef/thingdef.h"
*/
#define AXERANGE ((fixed_t)(2.25*MELEERANGE))
static FRandom pr_atk ("FAxeAtk");
static FRandom pr_axeatk ("FAxeAtk");
void A_FAxeCheckReady (AActor *actor);
void A_FAxeCheckUp (AActor *actor);
@ -203,8 +203,8 @@ DEFINE_ACTION_FUNCTION(AActor, A_FAxeAttack)
}
AActor *pmo=player->mo;
damage = 40+(pr_atk()&15);
damage += pr_atk()&7;
damage = 40+(pr_axeatk()&15);
damage += pr_axeatk()&7;
power = 0;
weapon = player->ReadyWeapon;
if (player->ReadyWeapon->Ammo1->Amount > 0)