This commit is contained in:
Charles 2001-05-22 22:01:43 +00:00
parent ab7f46a43a
commit ee7900960a
6 changed files with 33 additions and 1 deletions

View file

@ -138,7 +138,8 @@ hazard_src := hazard \
hbwheel \ hbwheel \
hdbarrel \ hdbarrel \
hbbarrel \ hbbarrel \
hrrock hrrock \
hflytrap
fx_src := fx \ fx_src := fx \
fxtrail \ fxtrail \

View file

@ -91,6 +91,10 @@
#include "hazard\hrrock.h" #include "hazard\hrrock.h"
#endif #endif
#ifndef __HAZARD_HFLYTRAP_H__
#include "hazard\hflytrap.h"
#endif
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -111,6 +115,7 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
NPC_BOUNCING_BARREL_HAZARD, NPC_BOUNCING_BARREL_HAZARD,
NPC_FIREBALL_HAZARD, NPC_FIREBALL_HAZARD,
NPC_ROLLING_ROCK_HAZARD, NPC_ROLLING_ROCK_HAZARD,
NPC_FLY_TRAP_HAZARD,
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -213,6 +218,12 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
break; break;
} }
case NPC_FLY_TRAP_HAZARD:
{
hazard = new ("fly trap hazard") CNpcFlyTrapHazard;
break;
}
default: default:
{ {
hazard = NULL; hazard = NULL;

View file

@ -51,6 +51,7 @@ public:
NPC_BOUNCING_BARREL_HAZARD, NPC_BOUNCING_BARREL_HAZARD,
NPC_FIREBALL_HAZARD, NPC_FIREBALL_HAZARD,
NPC_ROLLING_ROCK_HAZARD, NPC_ROLLING_ROCK_HAZARD,
NPC_FLY_TRAP_HAZARD,
NPC_HAZARD_TYPE_MAX, NPC_HAZARD_TYPE_MAX,
}; };

View file

@ -147,5 +147,6 @@ DualPlatformBarrelHazard=11
BouncingBarrel=12 BouncingBarrel=12
Fireball=13 Fireball=13
BouncingRock=12 BouncingRock=12
FlyTrap=15

View file

@ -189,3 +189,13 @@ Collision=0
Health=0 Health=0
AttackStrength=0 AttackStrength=0
Respawn=2 Respawn=2
[FlyTrap]
Gfx=..\..\graphics\hazards\FlyTrap\FlyTrap.gin
WayPoints=0
Speed=0
TurnRate=0
Collision=0
Health=0
AttackStrength=0
Respawn=2

View file

@ -885,6 +885,14 @@ SOURCE=..\..\..\source\hazard\hfirebal.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\..\source\hazard\hflytrap.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hflytrap.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hmasher.cpp SOURCE=..\..\..\source\hazard\hmasher.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File