mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 14:51:51 +00:00
- Removed some unused constant definitions from sc_man.cpp.
- Fixed: A_FireBlasterPL2 played the weapon sound with the missile as origin instead of the shooting player. SVN r1053 (trunk)
This commit is contained in:
parent
0fc5a541b3
commit
82dbebc3f1
3 changed files with 8 additions and 17 deletions
|
@ -1,4 +1,7 @@
|
|||
June 28, 2008 (Changes by Graf Zahl)
|
||||
- Removed some unused constant definitions from sc_man.cpp.
|
||||
- Fixed: A_FireBlasterPL2 played the weapon sound with the missile as origin
|
||||
instead of the shooting player.
|
||||
- Fixed: Dead players didn't get the MF_CORPSE flag set.
|
||||
- Fixed: The internal definition of Floor_LowerToNearest had incorrect parameter
|
||||
settings.
|
||||
|
|
|
@ -1987,7 +1987,6 @@ void A_FireBlasterPL1 (AActor *actor)
|
|||
|
||||
void A_FireBlasterPL2 (AActor *actor)
|
||||
{
|
||||
AActor *mo;
|
||||
player_t *player;
|
||||
|
||||
if (NULL == (player = actor->player))
|
||||
|
@ -2001,8 +2000,9 @@ void A_FireBlasterPL2 (AActor *actor)
|
|||
if (!weapon->DepleteAmmo (weapon->bAltFire))
|
||||
return;
|
||||
}
|
||||
mo = P_SpawnPlayerMissile (actor, RUNTIME_CLASS(ABlasterFX1));
|
||||
S_Sound (mo, CHAN_WEAPON, "weapons/blastershoot", 1, ATTN_NORM);
|
||||
P_SpawnPlayerMissile (actor, RUNTIME_CLASS(ABlasterFX1));
|
||||
S_Sound (actor, CHAN_WEAPON, "weapons/blastershoot", 1, ATTN_NORM);
|
||||
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
|
|
@ -24,17 +24,6 @@
|
|||
|
||||
// MACROS ------------------------------------------------------------------
|
||||
|
||||
#define ASCII_COMMENT (';')
|
||||
#define CPP_COMMENT ('/')
|
||||
#define C_COMMENT ('*')
|
||||
#define ASCII_QUOTE ('"')
|
||||
#define LUMP_SCRIPT 1
|
||||
#define FILE_ZONE_SCRIPT 2
|
||||
|
||||
#define NORMAL_STOPCHARS "{}|="
|
||||
#define CMODE_STOPCHARS "`~!@#$%^&*(){}[]/=\?+|;:<>,."
|
||||
#define CMODE_STOPCHARS_NODECIMAL "`~!@#$%^&*(){}[]/=\?+|;:<>,"
|
||||
|
||||
// TYPES -------------------------------------------------------------------
|
||||
|
||||
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
|
||||
|
@ -176,8 +165,7 @@ void FScanner::Open (const char *name)
|
|||
//
|
||||
// FScanner :: OpenFile
|
||||
//
|
||||
// Loads a script (from a file). Uses the new/delete memory allocator for
|
||||
// memory allocation and de-allocation.
|
||||
// Loads a script from a file. Uses new/delete for memory allocation.
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
|
@ -215,7 +203,7 @@ void FScanner::OpenMem (const char *name, char *buffer, int size)
|
|||
//
|
||||
// FScanner :: OpenLumpNum
|
||||
//
|
||||
// Loads a script (from the WAD files).
|
||||
// Loads a script from the lump directory
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
|
|
Loading…
Reference in a new issue