zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-05-04 21:25:33 +00:00
parent 24523632c3
commit 6fd3ce3f25
6 changed files with 130 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
makefile.gaz
View file

@ -119,7 +119,11 @@ hazard_src := hazard \
hsaw \
hbarrel \
hboat \
hcsaw
hcsaw \
hmower \
hmasher \
hfan \
hspikes
fx_src := fx \

45
source/hazard/hazard.cpp
View file

@ -55,6 +55,23 @@
#include "hazard\hcsaw.h"
#endif
#ifndef __HAZARD_HMOWER_H__
#include "hazard\hmower.h"
#endif
#ifndef __HAZARD_HMASHER_H__
#include "hazard\hmasher.h"
#endif
#ifndef __HAZARD_HFAN_H__
#include "hazard\hfan.h"
#endif
#ifndef __HAZARD_HSPIKES_H__
#include "hazard\hspikes.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE_MAX] =
@ -65,6 +82,10 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
NPC_BARREL_HAZARD,
NPC_STATIC_HAZARD,
NPC_CIRCULAR_SAW_HAZARD,
NPC_MOWER_HAZARD,
NPC_MASHER_HAZARD,
NPC_FAN_HAZARD,
NPC_SPIKES_HAZARD,
};
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -113,6 +134,30 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
break;
}
case NPC_MOWER_HAZARD:
{
hazard = new ("mower hazard") CNpcMowerHazard;
break;
}
case NPC_MASHER_HAZARD:
{
hazard = new ("masher hazard") CNpcMasherHazard;
break;
}
case NPC_FAN_HAZARD:
{
hazard = new ("fan hazard") CNpcFanHazard;
break;
}
case NPC_SPIKES_HAZARD:
{
hazard = new ("spikes hazard") CNpcSpikesHazard;
break;
}
default:
{
hazard = NULL;

4
source/hazard/hazard.h
View file

@ -42,6 +42,10 @@ public:
NPC_BARREL_HAZARD,
NPC_STATIC_HAZARD,
NPC_CIRCULAR_SAW_HAZARD,
NPC_MOWER_HAZARD,
NPC_MASHER_HAZARD,
NPC_FAN_HAZARD,
NPC_SPIKES_HAZARD,
NPC_HAZARD_TYPE_MAX,
};

4
tools/Data/bin/MkLevel.ini
View file

@ -129,5 +129,9 @@ PumpkinPendulum=1
RollingRock=3
CircularSaw=5
Pylons=4
SpinningBlades=6
Masher=7
Fan=8
Spikes=9

40
tools/MapEdit/Hazard.ini
View file

@ -89,3 +89,43 @@ Collision=0
Health=0
AttackStrength=0
Respawn=2
[SpinningBlades]
Gfx=..\..\graphics\hazards\SPINNINGBLADES\spinningblades.gin
WayPoints=0
Speed=0
TurnRate=0
Collision=0
Health=0
AttackStrength=0
Respawn=2
[Masher]
Gfx=..\..\graphics\hazards\Masher\masher.gin
WayPoints=0
Speed=0
TurnRate=0
Collision=0
Health=0
AttackStrength=0
Respawn=2
[Fan]
Gfx=..\..\graphics\hazards\fan\fan.gin
WayPoints=0
Speed=0
TurnRate=0
Collision=0
Health=0
AttackStrength=0
Respawn=2
[Spikes]
Gfx=..\..\graphics\hazards\spikes\spikes.gin
WayPoints=1
Speed=0
TurnRate=0
Collision=0
Health=0
AttackStrength=0
Respawn=2

32
users/paul/spongebob project/spongebob project.dsp
View file

@ -809,6 +809,14 @@ SOURCE=..\..\..\source\hazard\hfalling.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hfan.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hfan.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hfirebal.cpp
# End Source File
# Begin Source File
@ -817,6 +825,22 @@ SOURCE=..\..\..\source\hazard\hfirebal.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hmasher.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hmasher.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hmower.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hmower.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hpendulm.cpp
# End Source File
# Begin Source File
@ -833,6 +857,14 @@ SOURCE=..\..\..\source\hazard\hsaw.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hspikes.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hspikes.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\hazard\hstatic.h
# End Source File
# End Group