LAB: Renamed mouse.* to eventman.*

engines/lab/engine.cpp

@@ -36,7 +36,6 @@
 #include "lab/intro.h"
 #include "lab/parsefun.h"
 #include "lab/interface.h"
-#include "lab/mouse.h"
 #include "lab/resource.h"
 
 namespace Lab {

engines/lab/eventman.cpp

@@ -30,7 +30,6 @@
 
 #include "lab/lab.h"
 #include "lab/image.h"
-#include "lab/mouse.h"
 #include "lab/interface.h"
 
 namespace Lab {

engines/lab/eventman.h

@@ -28,10 +28,8 @@
  *
  */
 
-#include "common/events.h"
+#ifndef LAB_EVENTMAN_H
-
+#define LAB_EVENTMAN_H
-#ifndef LAB_MOUSE_H
-#define LAB_MOUSE_H
 
 namespace Lab {
 
@@ -80,4 +78,4 @@ public:
 
 } // End of namespace Lab
 
-#endif /* LAB_MOUSE_H */
+#endif /* LAB_EVENTMAN_H */

engines/lab/graphics.cpp

@@ -34,7 +34,6 @@
 #include "lab/image.h"
 #include "lab/labfun.h"
 #include "lab/parsefun.h"
-#include "lab/mouse.h"
 #include "lab/text.h"
 #include "lab/resource.h"
 

engines/lab/interface.cpp

@@ -32,7 +32,6 @@
 #include "lab/labfun.h"
 #include "lab/image.h"
 #include "lab/interface.h"
-#include "lab/mouse.h"
 #include "common/util.h"
 
 namespace Lab {

engines/lab/lab.h

@@ -37,7 +37,7 @@
 #include "engines/engine.h"
 #include "lab/labfun.h"
 #include "lab/interface.h"
-#include "lab/mouse.h"
+#include "lab/eventman.h"
 #include "lab/music.h"
 #include "lab/resource.h"
 #include "lab/anim.h"

engines/lab/labfile.cpp

@@ -30,7 +30,6 @@
 
 #include "lab/lab.h"
 #include "lab/labfun.h"
-#include "lab/mouse.h"
 #include "common/file.h"
 
 namespace Lab {

engines/lab/map.cpp

@@ -33,7 +33,6 @@
 #include "lab/anim.h"
 #include "lab/image.h"
 #include "lab/text.h"
-#include "lab/mouse.h"
 #include "lab/parsefun.h"
 #include "lab/parsetypes.h"
 #include "lab/resource.h"

engines/lab/module.mk

@@ -5,6 +5,7 @@ MODULE_OBJS := \
 	anim.o \
 	detection.o \
 	engine.o \
+	eventman.o \
 	graphics.o \
 	image.o \
 	interface.o \
@@ -13,7 +14,6 @@ MODULE_OBJS := \
 	labfile.o \
 	labsets.o \
 	map.o \
-	mouse.o \
 	music.o \
 	processroom.o \
 	resource.o \

engines/lab/music.cpp

@@ -31,7 +31,6 @@
 #include "audio/mixer.h"
 
 #include "lab/labfun.h"
-#include "lab/mouse.h"
 #include "lab/music.h"
 #include "lab/lab.h"
 

engines/lab/special.cpp

@@ -40,7 +40,6 @@
 #include "lab/interface.h"
 #include "lab/anim.h"
 #include "lab/text.h"
-#include "lab/mouse.h"
 #include "lab/parsetypes.h"
 #include "lab/resource.h"
 

engines/lab/vga.cpp

@@ -33,7 +33,6 @@
 
 #include "lab/lab.h"
 #include "lab/image.h"
-#include "lab/mouse.h"
 
 namespace Lab {