about summary refs log tree commit diff
path: root/src/game/editor/ed_editor.hpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-06-12 10:51:48 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-06-12 10:51:48 +0000
commitf6c67c29cd10d41b877ee1319801edc01b625e72 (patch)
tree6ca26c44ac0218a57d078a6f72034f2924b44104 /src/game/editor/ed_editor.hpp
parent0d3b988c1aed8f6b91879a801253db81a251a532 (diff)
downloadzcatch-f6c67c29cd10d41b877ee1319801edc01b625e72.tar.gz
zcatch-f6c67c29cd10d41b877ee1319801edc01b625e72.zip
large commit with loads of clean up. more is comming
Diffstat (limited to 'src/game/editor/ed_editor.hpp')
-rw-r--r--src/game/editor/ed_editor.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/editor/ed_editor.hpp b/src/game/editor/ed_editor.hpp
index 23dbd382..62f8871a 100644
--- a/src/game/editor/ed_editor.hpp
+++ b/src/game/editor/ed_editor.hpp
@@ -217,10 +217,10 @@ public:
 	}
 };
 
-class IMAGE : public IMAGE_INFO
+class EDITOR_IMAGE : public IMAGE_INFO
 {
 public:
-	IMAGE()
+	EDITOR_IMAGE()
 	{
 		tex_id = -1;
 		name[0] = 0;
@@ -231,7 +231,7 @@ public:
 		format = 0;
 	}
 	
-	~IMAGE()
+	~EDITOR_IMAGE()
 	{
 		gfx_unload_texture(tex_id);
 	}
@@ -255,7 +255,7 @@ public:
 	}
 
 	array<LAYERGROUP*> groups;
-	array<IMAGE*> images;
+	array<EDITOR_IMAGE*> images;
 	array<ENVELOPE*> envelopes;
 	
 	class LAYER_GAME *game_layer;