Remove test levels; fix some serious bug

acmepjz · Apr 25, 2011 · 679f456 · 679f456
1 parent 1af76f4
commit 679f456
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/data/level/levellist.txt b/data/level/levellist.txt
@@ -1,6 +1,3 @@
-leveledit.map
-leveledit2.map
-test2.map
 BabySteps.map
 ShadowBlocks.map
 LittleHelp.map

diff --git a/src/GUIObject.cpp b/src/GUIObject.cpp
@@ -17,6 +17,8 @@
 **
 ****************************************************************************/
 #include "GUIObject.h"
+#include <iostream>
+using namespace std;
 
 GUIObject *GUIObjectRoot=NULL;
 

diff --git a/src/GUIObject.h b/src/GUIObject.h
@@ -57,7 +57,8 @@ class GUIObject{
 		const char* Caption=NULL,int Value=0,
 		bool Enabled=true,bool Visible=true):
 		Left(Left),Top(Top),Width(Width),Height(Height),
-		Type(Type),Value(Value),EventCallback(NULL),State(0)
+		Type(Type),Value(Value),EventCallback(NULL),State(0),
+		Enabled(Enabled),Visible(Visible)
 	{
 		if(Caption) GUIObject::Caption=Caption;
 	}

diff --git a/src/Game.cpp b/src/Game.cpp
@@ -93,7 +93,7 @@ void Game::load_level(string FileName)
 		}else{
 			s=FileName;
 		}
-		if(!objSerializer.LoadNodeFromFile(FileName.c_str(),&obj,true)) return;
+		if(!objSerializer.LoadNodeFromFile(s.c_str(),&obj,true)) return;
 	}
 
 	Destroy();