1 files changed, 29 insertions, 20 deletions

diff --git a/src/T2DLL/T2XEvent.h b/src/T2DLL/T2XEvent.h
index f3788a1..e556aaa 100644
--- a/src/T2DLL/T2XEvent.h
+++ b/src/T2DLL/T2XEvent.h
@@ -1,28 +1,37 @@
 #pragma once
 #include "common.h"
+#include "LArray.h"
+#include "T2EventItem.h"
 
-class T2XEvent {
+class AFX_EXT_CLASS T2XEvent : public T2EventItem {
 public:
-	T2XEvent(T2TowerEvent*, CResFile*, unsigned long, int);
-	T2XEvent(T2XEvent*, int);
+	T2XEvent(T2TowerEvent* inTowerEvent, CResFile* inResFile, DWORD inID, int inSubID);
+	T2XEvent(T2XEvent* inXEvent, int inSubID);
 	virtual ~T2XEvent();
-	virtual void Init(CResFile*);
-	virtual unsigned long GetID();
-	virtual int Start(T2TowerDoc*);
-	virtual int Exec(T2TowerDoc*);
-	virtual void StopEvent(T2TowerDoc*);
-	virtual int IsBeginTime(unsigned int);
-	virtual int IsBeginTime(T2TowerDoc*, unsigned int);
-	virtual int IsBeginDay(int);
-	virtual int IsBeginDay(T2TowerDoc*, int);
-	virtual void Write(T2Archive&);
-	virtual void Read(T2Archive&);
+	virtual DWORD GetID();
+	virtual void Init(CResFile* inResFile);
+	virtual BOOL IsBeginTime(unsigned int inTime);
+	virtual BOOL IsBeginDay(int inDay);
+	virtual BOOL Start(T2TowerDoc* inDoc);
+	virtual int Exec(T2TowerDoc* inDoc);
+	virtual void StopEvent(T2TowerDoc* inDoc);
+	virtual void Write(T2Archive& inArchive);
+	virtual void Read(T2Archive& inArchive);
+	virtual BOOL IsXEvent() { return true; }
+	virtual unsigned int DialogHook(T2EventDialog* inDialog, unsigned int inResult, T2TowerDoc* inDoc);
+	virtual BOOL IsBeginTime(T2TowerDoc* inDoc, unsigned int inTime);
+	virtual BOOL IsBeginDay(T2TowerDoc* inDoc, int inDay);
+
 	unsigned int GetRefCon();
-	void SetRefCon(unsigned int);
-	void SetDialogItems(int, int, int* const, int, CString&);
-	virtual unsigned int DialogHook(T2EventDialog*, unsigned int, T2TowerDoc*);
+	void SetRefCon(unsigned int inRefCon);
+	void SetDialogItems(int inItem1, int inItem2, int* const inItemArray, int inItem4, CString& inText);
 
-	virtual int IsXEvent() {}
-	T2XEvent(const T2XEvent&) {}
-	T2XEvent& operator=(const T2XEvent&) {}
+protected:
+	DWORD mID;
+	unsigned int mRefCon;
+	int mDlgItem1;
+	int mDlgItem2;
+	LArray mDlgItemArray;
+	int mDlgItem4;
+	CString mDlgText;
 };