Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-05-05 21:04:00 +00:00
parent 162ae9635b
commit 28f7a7d186
6 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile.gaz
View File

@ -130,7 +130,8 @@ hazard_src := hazard \
hfan \ hfan \
hspikes \ hspikes \
hbwheel \ hbwheel \
hdbarrel hdbarrel \
hbbarrel
fx_src := fx \ fx_src := fx \
fxjfish fxjfish

11
source/hazard/hazard.cpp
View File

@ -79,6 +79,10 @@
#include "hazard\hdbarrel.h" #include "hazard\hdbarrel.h"
#endif #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_SPIKES_HAZARD,
NPC_BIG_WHEEL_HAZARD, NPC_BIG_WHEEL_HAZARD,
NPC_DUAL_PLATFORM_BARREL_HAZARD, NPC_DUAL_PLATFORM_BARREL_HAZARD,
NPC_BOUNCING_BARREL_HAZARD,
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -180,6 +185,12 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
break; break;
} }
case NPC_BOUNCING_BARREL_HAZARD:
{
hazard = new ("bouncing barrel hazard") CNpcBouncingBarrelHazard;
break;
}
default: default:
{ {
hazard = NULL; hazard = NULL;

1
source/hazard/hazard.h
View File

@ -48,6 +48,7 @@ public:
NPC_SPIKES_HAZARD, NPC_SPIKES_HAZARD,
NPC_BIG_WHEEL_HAZARD, NPC_BIG_WHEEL_HAZARD,
NPC_DUAL_PLATFORM_BARREL_HAZARD, NPC_DUAL_PLATFORM_BARREL_HAZARD,
NPC_BOUNCING_BARREL_HAZARD,
NPC_HAZARD_TYPE_MAX, NPC_HAZARD_TYPE_MAX,
}; };

1
tools/Data/bin/MkLevel.ini
View File

@ -141,5 +141,6 @@ Spikes=9
Wheel=10 Wheel=10
BarrelHazard=3 BarrelHazard=3
DualPlatformBarrelHazard=11 DualPlatformBarrelHazard=11
BouncingBarrel=12

10
tools/MapEdit/Hazard.ini
View File

@ -159,3 +159,13 @@ Collision=0
Health=0 Health=0
AttackStrength=0 AttackStrength=0
Respawn=2 Respawn=2
[BouncingBarrel]
Gfx=..\..\graphics\platforms\barrel\barrel.gin
WayPoints=32
Speed=0
TurnRate=0
Collision=0
Health=0
AttackStrength=0
Respawn=2

8
users/paul/spongebob project/spongebob project.dsp
View File

@ -785,6 +785,14 @@ SOURCE=..\..\..\source\hazard\hbarrel.h
# End Source File # End Source File
# Begin 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 SOURCE=..\..\..\source\hazard\hboat.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File