This commit is contained in:
Charles 2001-05-24 15:18:25 +00:00
parent 27cd9601d2
commit 457f41308e
6 changed files with 35 additions and 3 deletions

View File

@ -147,7 +147,8 @@ hazard_src := hazard \
hflytrap \
hrweight \
hrwheel \
hpswitch
hpswitch \
hrckshrd
fx_src := fx \
fxbaseanim \

View File

@ -107,6 +107,10 @@
#include "hazard\hpswitch.h"
#endif
#ifndef __HAZARD_HRCKSHRD_H__
#include "hazard\hrckshrd.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -131,6 +135,7 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
NPC_RISING_WEIGHT_HAZARD,
NPC_RISING_WEIGHT_WHEEL_HAZARD,
NPC_PRESSURE_SWITCH_HAZARD,
NPC_ROCKSHARD_HAZARD,
};
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -257,6 +262,12 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
break;
}
case NPC_ROCKSHARD_HAZARD:
{
hazard = new ("rock shard hazard") CNpcRockShardHazard;
break;
}
default:
{
hazard = NULL;

View File

@ -55,6 +55,7 @@ public:
NPC_RISING_WEIGHT_HAZARD,
NPC_RISING_WEIGHT_WHEEL_HAZARD,
NPC_PRESSURE_SWITCH_HAZARD,
NPC_ROCKSHARD_HAZARD,
NPC_HAZARD_TYPE_MAX,
};

View File

@ -134,7 +134,7 @@ Ch1L1_Plat2=1
################################################
# Hazards
[Hazard]
RockShard=0
RockShard=19
HeartPendulum=1
Tugboat=2
Acorn=0
@ -155,4 +155,5 @@ BouncingRock=12
FlyTrap=15
RisingWeight=16
RisingWeightWheel=17
PressureSwitch=18
PressureSwitch=18
SingleSpike=19

View File

@ -229,3 +229,13 @@ Collision=0
Health=0
AttackStrength=0
Respawn=2
[SingleSpike]
Gfx=..\..\graphics\hazards\rockshard_pc\pc_single_spike.gin
WayPoints=0
Speed=0
TurnRate=0
Collision=0
Health=0
AttackStrength=0
Respawn=1

View File

@ -929,6 +929,14 @@ SOURCE=..\..\..\source\hazard\hpswitch.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hrckshrd.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hrckshrd.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hrrock.cpp
# End Source File
# Begin Source File