From df11c5da2c6e91a2c079308d62110995352d76f5 Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Tue, 9 Apr 2013 01:08:02 -0700
Subject: MapEditor improvements

---
 includes/mapclass.php | 3 +++
 includes/maps.php     | 1 +
 2 files changed, 4 insertions(+)

(limited to 'includes')

diff --git a/includes/mapclass.php b/includes/mapclass.php
index 24b9108..c4d95e9 100644
--- a/includes/mapclass.php
+++ b/includes/mapclass.php
@@ -295,6 +295,9 @@ class map {
 		
 		$oldNames['r'] = 'r';
 		$oldNames['r2'] = 'R';
+		
+		$oldNames['q'] = 'q';
+		$oldNames['p'] = 'p';
 	
 		for( $i = 0; $i < $this->height; $i++) {
 			for( $j = 0; $j < $this->width; $j++) {
diff --git a/includes/maps.php b/includes/maps.php
index 1af64a2..ec338d7 100644
--- a/includes/maps.php
+++ b/includes/maps.php
@@ -355,6 +355,7 @@ function GenerateMap($rows, $cols, $rockchance, $numBlocks = -1, $cp = -1, $tp =
 	if ($tp == -1)
 		$tp = rand(0, 2);
 	$tp = $tp * 2; //Requires an out-teleport.
+	if ($rockchance < 2) $rockchance = 2;
 
 	//== Possibility of inf loop here, if the map is too small.
 	do {
-- 
cgit v1.2.3