This commit is contained in:
parent
162ae9635b
commit
28f7a7d186
@ -130,7 +130,8 @@ hazard_src := hazard \
|
||||
hfan \
|
||||
hspikes \
|
||||
hbwheel \
|
||||
hdbarrel
|
||||
hdbarrel \
|
||||
hbbarrel
|
||||
|
||||
fx_src := fx \
|
||||
fxjfish
|
||||
|
@ -79,6 +79,10 @@
|
||||
#include "hazard\hdbarrel.h"
|
||||
#endif
|
||||
|
||||
#ifndef __HAZARD_HBBARREL_H__
|
||||
#include "hazard\hbbarrel.h"
|
||||
#endif
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -96,6 +100,7 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
|
||||
NPC_SPIKES_HAZARD,
|
||||
NPC_BIG_WHEEL_HAZARD,
|
||||
NPC_DUAL_PLATFORM_BARREL_HAZARD,
|
||||
NPC_BOUNCING_BARREL_HAZARD,
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
@ -180,6 +185,12 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
|
||||
break;
|
||||
}
|
||||
|
||||
case NPC_BOUNCING_BARREL_HAZARD:
|
||||
{
|
||||
hazard = new ("bouncing barrel hazard") CNpcBouncingBarrelHazard;
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
{
|
||||
hazard = NULL;
|
||||
|
@ -48,6 +48,7 @@ public:
|
||||
NPC_SPIKES_HAZARD,
|
||||
NPC_BIG_WHEEL_HAZARD,
|
||||
NPC_DUAL_PLATFORM_BARREL_HAZARD,
|
||||
NPC_BOUNCING_BARREL_HAZARD,
|
||||
|
||||
NPC_HAZARD_TYPE_MAX,
|
||||
};
|
||||
|
@ -141,5 +141,6 @@ Spikes=9
|
||||
Wheel=10
|
||||
BarrelHazard=3
|
||||
DualPlatformBarrelHazard=11
|
||||
BouncingBarrel=12
|
||||
|
||||
|
||||
|
@ -159,3 +159,13 @@ Collision=0
|
||||
Health=0
|
||||
AttackStrength=0
|
||||
Respawn=2
|
||||
|
||||
[BouncingBarrel]
|
||||
Gfx=..\..\graphics\platforms\barrel\barrel.gin
|
||||
WayPoints=32
|
||||
Speed=0
|
||||
TurnRate=0
|
||||
Collision=0
|
||||
Health=0
|
||||
AttackStrength=0
|
||||
Respawn=2
|
||||
|
@ -785,6 +785,14 @@ SOURCE=..\..\..\source\hazard\hbarrel.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\hazard\hbbarrel.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\hazard\hbbarrel.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\hazard\hboat.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
Loading…
Reference in New Issue
Block a user