This commit is contained in:
Charles 2001-06-05 16:01:22 +00:00
parent 432cba9e4f
commit 5f940ad5bb
7 changed files with 42 additions and 3 deletions

View file

@ -119,6 +119,10 @@
#include "hazard\hcswitch.h"
#endif
#ifndef __HAZARD_HBROCK_H__
#include "hazard\hbrock.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -146,6 +150,7 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
NPC_ROCKSHARD_HAZARD,
NPC_INERT_HAZARD,
NPC_CONVEYOR_SWITCH_HAZARD,
NPC_BOUNCING_ROCK_HAZARD,
};
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -290,6 +295,12 @@ CNpcHazard *hazard;
break;
}
case NPC_BOUNCING_ROCK_HAZARD:
{
hazard = new ("bouncing rock hazard") CNpcBouncingRockHazard;
break;
}
default:
{
hazard = NULL;

View file

@ -61,6 +61,7 @@ public:
NPC_ROCKSHARD_HAZARD,
NPC_INERT_HAZARD,
NPC_CONVEYOR_SWITCH_HAZARD,
NPC_BOUNCING_ROCK_HAZARD,
NPC_HAZARD_TYPE_MAX,
};

View file

@ -71,6 +71,10 @@
#include "triggers\thazard.h"
#endif
#ifndef __TRIGGERS_THAZWALK_H__
#include "triggers\thazwalk.h"
#endif
#ifndef __TRIGGERS_TBGEYSER_H__
#include "triggers\tbgeyser.h"
#endif
@ -166,6 +170,10 @@ CTrigger *trigger;
trigger = (CHazardTrigger*)new("HazardTrigger") CHazardTrigger();
break;
case TRIGGER_HAZARD_WALK:
trigger = (CHazardWalkTrigger*)new("HazardWalkTrigger") CHazardWalkTrigger();
break;
default:
trigger=NULL;
}

View file

@ -43,6 +43,7 @@ enum TRIGGER_TYPE
// Code based triggers
TRIGGER_PLATFORM,
TRIGGER_HAZARD,
TRIGGER_HAZARD_WALK,
TRIGGER_MAX,
};