From becab2d47951bf186d160f796dc97b040ac1cd85 Mon Sep 17 00:00:00 2001
From: janwas <jan@wildfiregames.com>
Date: Sat, 18 Oct 2008 17:58:04 +0000
Subject: [PATCH] fix: alpha map texture wasn't initialized, which caused crash
 if multiplayer -> host -> continue -> cancel thanks to anton for noticing and
 reporting the problem :)

also: fix hardcoded paths in rmgen to point to mods/public

This was SVN commit r6429.
---
 source/renderer/Renderer.cpp | 1 +
 source/tools/rmgen/map.cpp   | 2 +-
 source/tools/rmgen/rmgen.cpp | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/renderer/Renderer.cpp b/source/renderer/Renderer.cpp
index 9283b59b15..95361dbcc8 100644
--- a/source/renderer/Renderer.cpp
+++ b/source/renderer/Renderer.cpp
@@ -360,6 +360,7 @@ CRenderer::CRenderer()
 	for (size_t i=0;i<MaxTextureUnits;i++) {
 		m_ActiveTextures[i]=0;
 	}
+	m_hCompositeAlphaMap = 0;
 
 	AddLocalProperty(L"fancyWater", &m_Options.m_FancyWater, false);
 	AddLocalProperty(L"horizonHeight", &m->skyManager.m_HorizonHeight, false);
diff --git a/source/tools/rmgen/map.cpp b/source/tools/rmgen/map.cpp
index 9d58f77637..5879e93057 100644
--- a/source/tools/rmgen/map.cpp
+++ b/source/tools/rmgen/map.cpp
@@ -63,7 +63,7 @@ Map::Map(string fileName, int loadLevel)
 	u32 map_size;
 
 	//HACK, also in rmgen.cpp
-	const string SCENARIO_PATH = "../data/mods/official/maps/scenarios/";
+	const string SCENARIO_PATH = "../data/mods/public/maps/scenarios/";
 
 	std::string pmpFile = SCENARIO_PATH + fileName + ".pmp";
 	std::string xmlFile = SCENARIO_PATH + fileName + ".xml";
diff --git a/source/tools/rmgen/rmgen.cpp b/source/tools/rmgen/rmgen.cpp
index a33a1ab02b..840ee06c0e 100644
--- a/source/tools/rmgen/rmgen.cpp
+++ b/source/tools/rmgen/rmgen.cpp
@@ -107,9 +107,9 @@ void ExecuteFile(const string& fileName) {
 
 int main(int argc, char* argv[])
 {
-	const string LIBRARY_FILE = "../data/mods/official/maps/rmlibrary.js";
-	const string RMS_PATH = "../data/mods/official/maps/random/";
-	const string SCENARIO_PATH = "../data/mods/official/maps/scenarios/";
+	const string LIBRARY_FILE = "../data/mods/public/maps/rmlibrary.js";
+	const string RMS_PATH = "../data/mods/public/maps/random/";
+	const string SCENARIO_PATH = "../data/mods/public/maps/scenarios/";
 
 	clock_t start = clock();