- opravy v kodu, ktory obsluhuje konfig

- oprava v screen_setting
- oprava v layer



git-svn-id: http://opensvn.csie.org/tuxanci_ng@123 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

4 files changed, 5 insertions, 6 deletions

diff --git a/src/modules/modAI.c b/src/modules/modAI.c
index d244aa3..61cb23f 100755
--- a/src/modules/modAI.c
+++ b/src/modules/modAI.c
@@ -242,7 +242,7 @@ int isConflict(int x, int y, int w, int h)
 	return 0;
 }
 
-void cmd(char *line)
+void cmdArena(char *line)
 {
 	if( strncmp(line, "ai", 2) == 0 )cmd_ai(line);
 }
diff --git a/src/modules/modPipe.c b/src/modules/modPipe.c
index 2ca2f17..b535404 100755
--- a/src/modules/modPipe.c
+++ b/src/modules/modPipe.c
@@ -441,7 +441,7 @@ int isConflict(int x, int y, int w, int h)
 	return isConflictWithObjectFromSpace(spacePipe, x, y, w, h);
 }
 
-void cmd(char *line)
+void cmdArena(char *line)
 {
 	if( strncmp(line, "pipe", 4) == 0 )cmd_teleport(line);
 }
diff --git a/src/modules/modTeleport.c b/src/modules/modTeleport.c
index 0bc4c61..72b3690 100755
--- a/src/modules/modTeleport.c
+++ b/src/modules/modTeleport.c
@@ -494,7 +494,7 @@ int isConflict(int x, int y, int w, int h)
 	return 0;
 }
 
-void cmd(char *line)
+void cmdArena(char *line)
 {
 	if( strncmp(line, "teleport", 8) == 0 )cmd_teleport(line);
 }
diff --git a/src/modules/modWall.c b/src/modules/modWall.c
index 7d36957..4544ea9 100755
--- a/src/modules/modWall.c
+++ b/src/modules/modWall.c
@@ -220,7 +220,7 @@ static void cmd_wall(char *line)
 
 	rel = 0;
 
-	if( export_fce->fce_getValue(line, "rel", str_rel, STR_NUM_SIZE) != 0 );
+	if( export_fce->fce_getValue(line, "rel", str_rel, STR_NUM_SIZE) != 0 )strcpy(str_rel, "0");
 	if( export_fce->fce_getValue(line, "x", str_x, STR_NUM_SIZE) != 0 )return;
 	if( export_fce->fce_getValue(line, "y", str_y, STR_NUM_SIZE) != 0 )return;
 	if( export_fce->fce_getValue(line, "w", str_w, STR_NUM_SIZE) != 0 )return;
@@ -230,7 +230,6 @@ static void cmd_wall(char *line)
 	if( export_fce->fce_getValue(line, "layer", str_layer, STR_NUM_SIZE) != 0 )return;
 	if( export_fce->fce_getValue(line, "image", str_image, STR_SIZE) != 0 )return;
 
-
 	rel = atoi(str_rel);
 	x  = atoi(str_x);
 	y  = atoi(str_y);
@@ -330,7 +329,7 @@ int isConflict(int x, int y, int w, int h)
 	return isConflictWithObjectFromSpace(spaceWall, x, y, w, h);
 }
 
-void cmd(char *line)
+void cmdArena(char *line)
 {
 	if( strncmp(line, "wall", 4) == 0 )cmd_wall(line);
 }