CGE: This ends the first renaming pass. Also move some functions to CGEEngine

1 files changed, 13 insertions, 13 deletions

diff --git a/engines/cge/general.h b/engines/cge/general.h
index 63b94d3872..95660ad4df 100644
--- a/engines/cge/general.h
+++ b/engines/cge/general.h
@@ -109,41 +109,41 @@ public:
 };
 
 
-class EMS;
+class Ems;
 
 
-class EMM {
-	friend class EMS;
+class Emm {
+	friend class Ems;
 	bool test();
 
 	long _top;
 	long _lim;
-	EMS *_list;
+	Ems *_list;
 	int _han;
 	static void *_frame;
 public:
-	EMM(long size = 0);
-	~EMM();
-	EMS *alloc(uint16 siz);
+	Emm(long size = 0);
+	~Emm();
+	Ems *alloc(uint16 siz);
 	void release();
 };
 
 
-class EMS {
-	friend class EMM;
-	EMM *_emm;
+class Ems {
+	friend class Emm;
+	Emm *_emm;
 	long _ptr;
 	uint16 _size;
-	EMS *_next;
+	Ems *_next;
 public:
-	EMS();
+	Ems();
 	void *operator & () const;
 	uint16 size(void);
 };
 
 
 template <class T>
-void Swap(T &A, T &B) {
+void swap(T &A, T &B) {
 	T a = A;
 	A = B;
 	B = a;