From 5c3ca621f75587173bab3d946aee81dd2d36f495 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Fri, 22 Jun 2007 17:46:50 +0000
Subject: Pokemod validation, paths made to default

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@20 6ecfd1a5-f3ed-3746-8530-beee90d26b22
---
 pokemod/Map.cpp | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'pokemod/Map.cpp')

diff --git a/pokemod/Map.cpp b/pokemod/Map.cpp
index 20db2d5d..7e4eead6 100644
--- a/pokemod/Map.cpp
+++ b/pokemod/Map.cpp
@@ -23,20 +23,20 @@
 
 #include "Map.h"
 
-extern PokeGen::PokeMod::Pokemod curPokeMod;
-
-PokeGen::PokeMod::Map::Map(const unsigned _id) :
+PokeGen::PokeMod::Map::Map(const Pokemod *par, const unsigned _id) :
       name(""),
       flyWarp(UINT_MAX),
       type(UINT_MAX)
 {
    LogCtor("Map", id);
    id = _id;
+   pokemod = par;
 }
 
-PokeGen::PokeMod::Map::Map(Ini &ini, const unsigned _id)
+PokeGen::PokeMod::Map::Map(const Pokemod *par, Ini &ini, const unsigned _id)
 {
    LogCtorIni("Map", id);
+   pokemod = par;
    ImportIni(ini, _id);
    if (id == UINT_MAX)
       LogIdError("Map");
@@ -218,7 +218,7 @@ void PokeGen::PokeMod::Map::Validate()
    {
       for (unsigned j = 0; j < GetHeight(); ++j)
       {
-         if (!curPokeMod.GetTile(tiles[i][j]))
+         if (!pokemod->GetTile(tiles[i][j]))
          {
             LogVarNotValid("Map", id, String("tiles[%u][%u]", i, j), name);
             isValid = false;
@@ -419,7 +419,7 @@ void PokeGen::PokeMod::Map::Validate(const wxListBox &output)
    {
       for (unsigned j = 0; j < GetHeight(); ++j)
       {
-         if (!curPokeMod.GetTile(tiles[i][j]))
+         if (!pokemod->GetTile(tiles[i][j]))
          {
             LogVarNotValid("Map", id, String("tiles[%u][%u]", i, j), name);
             output.Append(ConsoleLogVarNotValid("Map", id, String("tiles[%u][%u]", i, j), name));
@@ -449,7 +449,7 @@ void PokeGen::PokeMod::Map::ImportIni(Ini &ini, const unsigned _id)
    ini.GetValue("type", type);
    ini.GetValue("width", i, 0);
    ini.GetValue("height", j, 0);
-   tiles.resize(i, j, Frac(1, 1));
+   tiles.Resize(i, j, Frac(1, 1));
    for (unsigned i = 0; i < GetWidth(); ++i)
    {
       for (unsigned j = 0; j < GetHeight(); ++j)
@@ -558,10 +558,16 @@ PokeGen::PokeMod::String PokeGen::PokeMod::Map::GetTypeString() const
 
 void PokeGen::PokeMod::Map::SetTile(unsigned x, unsigned y, unsigned _id)
 {
-   if (curPokeMod.GetTile(_id))
+   if (pokemod->GetTile(_id))
       tiles[x][y] = _id;
 }
 
+void PokeGen::PokeMod::Map::SetTile(unsigned x, unsigned y, const String &n)
+{
+   if (const Tile *t = pokemod->GetTile(n))
+      tiles[x][y] = t->GetId();
+}
+
 void PokeGen::PokeMod::Map::InsertColumn(unsigned x)
 {
    tiles.InsertCol(x, 0);
@@ -645,7 +651,7 @@ void PokeGen::PokeMod::Map::NewMapEffect(Ini *const ini)
       if (!GetMapEffect(i))
          break;
    }
-   MapEffect newMapEffect(i);
+   MapEffect newMapEffect(pokemod, i);
    if (ini)
       newMapEffect.ImportIni(*ini);
    LogSubmoduleNew("Map", id, "effect", i, name);
@@ -718,7 +724,7 @@ void PokeGen::PokeMod::Map::NewMapTrainer(Ini *const ini)
       if (!GetMapTrainer(i))
          break;
    }
-   MapTrainer newMapTrainer(i);
+   MapTrainer newMapTrainer(pokemod, i);
    if (ini)
       newMapTrainer.ImportIni(*ini);
    LogSubmoduleNew("Map", id, "trainer", i, name);
@@ -791,7 +797,7 @@ void PokeGen::PokeMod::Map::NewMapWarp(Ini *const ini)
       if (!GetMapWarp(i))
          break;
    }
-   MapWarp newMapWarp(i);
+   MapWarp newMapWarp(pokemod, i);
    if (ini)
       newMapWarp.ImportIni(*ini);
    LogSubmoduleNew("Map", id, "warp", i, name);
@@ -852,7 +858,7 @@ void PokeGen::PokeMod::Map::NewMapWildList(Ini *const ini)
       if (!GetMapWildList(i))
          break;
    }
-   MapWildList newMapWildList(i);
+   MapWildList newMapWildList(pokemod, i);
    if (ini)
       newMapWildList.ImportIni(*ini);
    LogSubmoduleNew("Map", id, "wild list", i, name);
-- 
cgit