source/platform/prbridge.cpp

@@ -83,13 +83,10 @@ void CNpcRisingBridgePlatform::setWaypoints( sThingPlatform *ThisPlatform )
 	newYPos = (u16) *PntList;
 	PntList++;
 
-	CPlatformTrigger *trigger = NULL;		// I hate having to do this just to keep the compiler quiet :/ (pkg)
+	CPlatformTrigger *trigger;
 
-
+//	trigger = new ("PlatformTrigger") CPlatformTrigger();
-	trigger = new ("PlatformTrigger") CPlatformTrigger();
+	trigger=(CPlatformTrigger*)CTrigger::Create(CTrigger::TRIGGER_PLATFORM);
-//	trigger=(CPlatformTrigger*)CTrigger::Create(CTrigger::TRIGGER_PLATFORM);
-	trigger->init();
-	trigger->setThingSubType(0);
 	trigger->setPositionAndSize( newXPos << 4, newYPos << 4, 100, 0 );
 	//trigger->setTargetBox(TriggerList->TargetPos.X<<4,TriggerList->TargetPos.Y<<4,TriggerList->TargetSize.X<<4,TriggerList->TargetSize.Y<<4);
 	trigger->setPlatform( this );

source/triggers/trigger.cpp

@@ -35,6 +35,10 @@
 #include "triggers\twater.h"
 #endif
 
+#ifndef	__TRIGGERS_TPLATFRM_H__
+#include "triggers\tplatfrm.h"
+#endif
+
 #ifndef __GAME_GAME_H__
 #include "game\game.h"
 #endif
@@ -76,6 +80,10 @@ CTrigger	*trigger;
 		case TRIGGER_OUTWATER:
 			trigger=(COutOfWaterTrigger*)new ("OutOfWaterTrigger") COutOfWaterTrigger();
 			break;
+
+		case TRIGGER_PLATFORM:
+			trigger = (CPlatformTrigger*)new ("PlatformTrigger") CPlatformTrigger();
+			break;
 		default:
 			trigger=NULL;
 	}

source/triggers/trigger.h

@@ -29,6 +29,9 @@ enum TRIGGER_TYPE
 	TRIGGER_CAMLOCK,
 	TRIGGER_INWATER,
 	TRIGGER_OUTWATER,
+
+// Code based triggers
+	TRIGGER_PLATFORM,
 	TRIGGER_MAX,
 	};