From 6e9de0dc82ffcc9345abab85bdeb0126a25df711 Mon Sep 17 00:00:00 2001
From: nkorslund <nkorslund@ea6a568a-9f4f-0410-981a-c910a81bb256>
Date: Tue, 24 Mar 2009 12:57:55 +0000
Subject: [PATCH] - fixed cell name memory management bug in cpp_mygui.cpp -
 esm/esp reader: made ITEX record in MGEF optional

git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@94 ea6a568a-9f4f-0410-981a-c910a81bb256
---
 COMPILE-linux.txt      | 15 +++++++++++++++
 esm/loadmgef.d         |  2 +-
 ogre/cpp_interface.cpp |  1 -
 ogre/cpp_mygui.cpp     |  3 ++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/COMPILE-linux.txt b/COMPILE-linux.txt
index a4df02a74..0dba3bf66 100644
--- a/COMPILE-linux.txt
+++ b/COMPILE-linux.txt
@@ -58,6 +58,21 @@ try typing:
 
 sudo apt-get install libogre-dev libavcodec-dev libavformat-dev libois-dev build-essential g++ gdc
 
+On Arch Linux, get the following packages from AUR:
+ogre
+mygui-svn
+bullet-2.75
+openal
+ffmpeg
+ois
+dmd
+libphobos
+dsss
+
+(On Arch you also need to change the Bullet libraries to
+-llBulletDynamics -llBulletCollision -llLinearMath in dsss.conf, or
+similarily in the Makefile if you prefer building with make.)
+
 A note about OpenAL: The library found in most Linux distributions
 (0.0.8 SI) is outdated. Some distributions are now changing to OpenAL
 Soft, which has a less hardware-dependent implementation. If you
diff --git a/esm/loadmgef.d b/esm/loadmgef.d
index 11ffe1e31..e3a01b4ab 100644
--- a/esm/loadmgef.d
+++ b/esm/loadmgef.d
@@ -65,7 +65,7 @@ struct MagicEffect
   {with(esFile){
     readHNExact(&data, data.sizeof,"MEDT");
 
-    icon = getIcon();
+    icon = getOIcon();
     particle = getOTexture("PTEX");
 
     boltSound = getHNOPtr!(Sound)("BSND", sounds);
diff --git a/ogre/cpp_interface.cpp b/ogre/cpp_interface.cpp
index 33f30714f..e0a40ee96 100644
--- a/ogre/cpp_interface.cpp
+++ b/ogre/cpp_interface.cpp
@@ -420,7 +420,6 @@ extern "C" void ogre_createWater(float level)
            ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
            Plane(Vector3::UNIT_Z, level),
 	   150000,150000
-	   //,20,20,true,1,5,5,Vector3::UNIT_Z
 	   );
     Entity *ent = mSceneMgr->createEntity( "WaterEntity", "water" );
     root->createChildSceneNode()->attachObject(ent);
diff --git a/ogre/cpp_mygui.cpp b/ogre/cpp_mygui.cpp
index 25a5dfcfe..a0b1e9c8f 100644
--- a/ogre/cpp_mygui.cpp
+++ b/ogre/cpp_mygui.cpp
@@ -1,5 +1,6 @@
 // TODO: KILLME
-char *cellName;
+std::string cellName;
+
 extern "C" void gui_setCellName(char *str)
 {
   cellName = str;