1 files changed, 37 insertions, 28 deletions

diff --git a/src/T2DLL/T2EventItem.h b/src/T2DLL/T2EventItem.h
index e166c22..f4db346 100644
--- a/src/T2DLL/T2EventItem.h
+++ b/src/T2DLL/T2EventItem.h
@@ -1,46 +1,55 @@
 #pragma once
 #include "common.h"
 
-class T2EventItem {
+class AFX_EXT_CLASS T2EventItem {
 public:
-	T2EventItem(T2TowerEvent*, CResFile*, int);
-	T2EventItem(T2TowerEvent*, int, int, int, int, int, int);
-	T2EventItem(T2EventItem*, int);
+	T2EventItem(T2TowerEvent* inTowerEvent, CResFile* inResFile, int inSubID);
+	T2EventItem(T2TowerEvent* inTowerEvent, int inSubID, int inLevelBit, BOOL inExclusive, int inCycleDay, int inBeginTime, int inEndTime);
+	T2EventItem(T2EventItem* inItem, int inSubID);
 	virtual ~T2EventItem();
-	virtual void Init(T2TowerDoc*);
-	virtual int Start(T2TowerDoc*);
-	virtual int ReStart(T2TowerDoc*);
-	virtual void StopEvent(T2TowerDoc*);
+	virtual void Init(T2TowerDoc* inDoc);
+	virtual DWORD GetID() { return 0; }
+	int GetSubID() { return mSubID; }
+	virtual BOOL Start(T2TowerDoc* inDoc);
+	virtual int ReStart(T2TowerDoc* inDoc);
+	virtual int Exec(T2TowerDoc *inDoc) = 0;
+	virtual void StopEvent(T2TowerDoc* inDoc);
+	virtual void ViewModeChanged(T2TowerDoc* inDoc, VIEWMODE) {}
+	virtual DWORD OptionProc(DWORD, void*) { return 0; }
+	virtual BOOL IsBeginTime(unsigned int inTime);
+	virtual BOOL IsBeginDay(int inDay);
+	virtual void Write(T2Archive& inArchive);
+	virtual void Read(T2Archive& inArchive);
+	virtual BOOL IsXEvent() { return false; }
+
 	T2WorldDef* GetWorldDef();
 	T2TowerDoc* GetTowerDoc() const;
 	T2TowerEvent* GetTowerEvent();
 	int GetLevelBit();
-	int IsExclusive();
+	BOOL IsExclusive();
 	int GetCycleDay();
 	int GetBeginTime();
-	void SetBeginTime(int);
+	void SetBeginTime(int inTime);
 	int GetEndTime();
-	virtual int IsBeginTime(unsigned int);
-	virtual int IsBeginDay(int);
 	int GetStatus();
-	void SetStatus(int);
+	void SetStatus(int inStatus);
 	T2EventItem* GetOriginalDef();
-protected:
-	virtual unsigned int DoDialog(T2TowerDoc*, int, int, int, const char*);
-	virtual void DoAlert(T2TowerDoc*, CString&, int);
-public:
-	virtual void Write(T2Archive&);
-	virtual void Read(T2Archive&);
 
-	virtual unsigned long GetID() {}
-	int GetSubID() {}
-	virtual void ViewModeChanged(T2TowerDoc*, VIEWMODE) {}
-	virtual unsigned long OptionProc(unsigned long, void*) {}
-	virtual int IsXEvent() {}
+	int _4;
+	int mSubID;
+	T2TowerEvent *mTowerEvent;
+	int mStatus;
+	int mLevelBit;
+	BOOL mExclusive;
+	int mCycleDay;
+	int mBeginTime;
+	int mEndTime;
+	T2EventItem *mOriginalDef;
+	T2EventDialog *mEventDialog;
+
 protected:
-	virtual unsigned int DialogHook(T2EventDialog*, unsigned int, T2TowerDoc*) {}
+	virtual unsigned int DoDialog(T2TowerDoc* inDoc, int inDlgResID, int inAnimResID, int inAnimUnk, const char* inText);
+	virtual void DoAlert(T2TowerDoc* inDoc, CString& inText, int inSoundID);
+	virtual UINT DialogHook(T2EventDialog*, unsigned int inResult, T2TowerDoc* inDoc) { return inResult; }
 	virtual void SetupDialog(T2Dialog*) {}
-public:
-	T2EventItem(const T2EventItem&) {}
-	T2EventItem& operator=(const T2EventItem&) {}
 };