1 files changed, 27 insertions, 14 deletions
diff --git a/src/T2DLL/T2Terrorist.h b/src/T2DLL/T2Terrorist.h
index 1549258..87b5b51 100644
--- a/src/T2DLL/T2Terrorist.h
+++ b/src/T2DLL/T2Terrorist.h
@@ -1,24 +1,37 @@
 #pragma once
 #include "common.h"
+#include "T2EventItem.h"
 
-class T2Terrorist {
+enum {
+	kTerroristStatus0 = 0,
+	kTerroristStatus1 = 1,
+	kTerroristStatus2 = 2,
+	kTerroristStatus3 = 3,
+};
+
+class AFX_EXT_CLASS T2Terrorist : public T2EventItem {
 public:
-	T2Terrorist(T2TowerEvent*, CResFile*, int);
+	T2Terrorist(T2TowerEvent* inTowerEvent, CResFile* inResFile, int inSubID);
 	virtual ~T2Terrorist();
-	virtual int Start(T2TowerDoc*);
+	virtual BOOL Start(T2TowerDoc* inDoc);
+	virtual int Exec(T2TowerDoc* inDoc);
+	virtual void StopEvent(T2TowerDoc* inDoc);
+	virtual unsigned int DialogHook(T2EventDialog* inDialog, unsigned int inResult, T2TowerDoc* inDoc);
+	virtual DWORD GetID() { return 'TrEv'; }
+	BOOL IsBombHideRoom(unsigned int inTenantID) { return (mBombHideRoomID == inTenantID); }
+
 protected:
+	virtual void SetupDialog(T2Dialog* inDialog);
 	void SetupSound();
 	void DisposeSound();
-public:
-	virtual int Exec(T2TowerDoc*);
-	virtual void StopEvent(T2TowerDoc*);
-	virtual unsigned int DialogHook(T2EventDialog*, unsigned int, T2TowerDoc*);
-protected:
-	virtual void SetupDialog(T2Dialog*);
 
-public:
-	virtual unsigned long GetID() {}
-	int IsBombHideRoom(unsigned int) {}
-	T2Terrorist(const T2Terrorist&) {}
-	T2Terrorist& operator=(const T2Terrorist&) {}
+	int mRansomFee;
+	int mDeadline;
+	int mHigherRansomFee;
+	unsigned int mBombHideRoomID;
+	CPoint mBombHidePos;
+	unsigned int mLastMinute;
+	T2FireAttach *mAttach;
+	LArray *mSearcherL;
+	LArray *mSearcherR;
 };