1 files changed, 78 insertions, 19 deletions

diff --git a/src/common.h b/src/common.h
index 779d46f..958f0bb 100644
--- a/src/common.h
+++ b/src/common.h
@@ -32,6 +32,7 @@ class CFilePluginList;
 class CLink;
 class CObjectQueue;
 class CPluginInfo;
+class CPluginInfoArray;
 class CProgramPlugin;
 class CResFile;
 class CResourcePlugin;
@@ -215,23 +216,79 @@ enum CURSORTYPE {
 };
 
 enum MOUSEEVENT {
-	MouseEvent_0
+	MouseEvent_0, // mouse down
+    MouseEvent_1, // mouse move
+    MouseEvent_2 // mouse up
 };
 
 enum OPTIONEVENTTYPE {
-	OptionEventType_0, // idle - no data
-    OptionEventType_1,
-    OptionEventType_2,
-    OptionEventType_3,
-    OptionEventType_4,
-    OptionEventType_5,
-    OptionEventType_6,
+    // Dispatched on each idle.
+    // Data: none
+    // Return value: ignored
+	kIdleOptionEvent,
+
+    // Dispatched when the left mouse button is pressed in the tower view.
+    // Data: CPoint* (in QD coordinates)
+    // Return value: FALSE will cancel normal processing
+    kLButtonDownOptionEvent,
+
+    // Dispatched when the right mouse button is pressed in the tower view.
+    // Data: CPoint* (in QD coordinates)
+    // Return value: FALSE will cancel normal processing
+    kRButtonDownOptionEvent,
+
+    // Dispatched when the left mouse button is released in the tower view.
+    // Data: CPoint* (in QD coordinates)
+    // Return value: FALSE will cancel normal processing
+    kLButtonUpOptionEvent,
+
+    // Dispatched when the right mouse button is released in the tower view.
+    // Data: CPoint* (in QD coordinates)
+    // Return value: ignored
+    kRButtonUpOptionEvent,
+
+    // Dispatched when the mouse is moved within the tower view.
+    // Data: POINT* (in QD coordinates)
+    // Return value: FALSE will cancel normal processing
+    kMouseMoveOptionEvent,
+
+    // Dispatched when plugins are about to be selected.
+    // Data: None
+    // Return value: ignored
+    kSelectPluginsOptionEvent,
+
     OptionEventType_7,
     OptionEventType_8,
-    OptionEventType_9,
-    OptionEventType_10,
-    OptionEventType_11, // start of GetInterviewWords
-    OptionEventType_12, // end of GetInterviewWords
+
+    // Dispatched when the tower has just been drawn to the buffer.
+    // Data: None
+    // Return value: ignored
+    kTowerDrawFinishedOptionEvent,
+
+    // Dispatched when the tower is about to be drawn to the main view.
+    // Data: CDC*
+    // Return value: FALSE will cancel normal drawing
+    kTowerPreDrawOptionEvent,
+
+    // Dispatched when interview words are about to be generated for a person.
+    // Data: OptionEvent11Data*
+    // Return value: FALSE will cancel the normal word selection process
+    kPreInterviewWordsOptionEvent,
+
+    // Dispatched when interview words have been generated for a person.
+    // Data: OptionEvent11Data*
+    // Return value: ignored
+    kPostInterviewWordsOptionEvent,
+
+    // Dispatched when all the option plugins have been loaded.
+    // Data: none
+    // Return value: ignored
+    kInitOptionEvent,
+
+    // Dispatched right before the tower is unloaded.
+    // Data: none
+    // Return value: ignored
+    kDestroyOptionEvent,
 };
 
 struct OptionEvent11Data {
@@ -254,8 +311,10 @@ enum PROCCODE {
 };
 
 enum ROOFANDFLOOR {
+    RoofAndFloor_None = 0,
 	RoofAndFloor_Roof = 1,
-	RoofAndFloor_Floor = 2
+	RoofAndFloor_Floor = 2,
+    RoofAndFloor_Both = 3,
 };
 
 enum SIDEOBJPATTERN {
@@ -264,12 +323,12 @@ enum SIDEOBJPATTERN {
 };
 
 enum VIEWMODE {
-	ViewMode_0,
-    ViewMode_1,
-    ViewMode_2,
-    ViewMode_3,
-    ViewMode_4,
-    ViewMode_5,
+	kInView, // InView
+    kOutView, // OutView
+    kEvalView, // Eval
+    kPriceView, // Price
+    kMaintView, // Maint
+    kTransView, // Trans
     ViewMode_6,
 };