fiddlerwoaroof/crawl - Change Y5GWVQ5SM7DJEAPFOBPMMJH4D3NXBB2MPONSJUMG3KIQMBVGEE6AC

Lua map markers can now be generated in C code from

map_lua_marker::parse_marker() by prefixing the Lua string with "lua_mapless:" rather than "lua:".

Fog machines can be created and placed from within C code via place_fog_machine().

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2843 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on November 12, 2007

Y5GWVQ5SM7DJEAPFOBPMMJH4D3NXBB2MPONSJUMG3KIQMBVGEE6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mapmark.h at line 90 [5.10602]

B:BD[4.6136] → [4.6136:6202]

    map_lua_marker(const std::string &s, const std::string &ctx);

[4.6136]

[4.6202]

    map_lua_marker(const std::string &s, const std::string &ctx,
                   bool mapdef_marker = true);

Replacement in crawl-ref/source/mapmark.cc at line 164 [5.13502]

B:BD[5.16979] → [4.7004:7078]

map_lua_marker::map_lua_marker(const std::string &s, const std::string &)

[5.16979]

[4.7078]

map_lua_marker::map_lua_marker(const std::string &s, const std::string &,
                               bool mapdef_marker)

Replacement in crawl-ref/source/mapmark.cc at line 169 [5.13502]

B:BD[4.7180] → [4.7180:7437]

    if (dlua.loadstring(("return " + s).c_str(), "lua_marker"))
        mprf(MSGCH_WARN, "lua_marker load error: %s", dlua.error.c_str());
    if (!dlua.callfn("dgn_run_map", 1, 1))
        mprf(MSGCH_WARN, "lua_marker exec error: %s", dlua.error.c_str());

[4.7180]

[4.7437]

    if (mapdef_marker)
    {
        if (dlua.loadstring(("return " + s).c_str(), "lua_marker"))
            mprf(MSGCH_WARN, "lua_marker load error: %s", dlua.error.c_str());
        if (!dlua.callfn("dgn_run_map", 1, 1))
            mprf(MSGCH_WARN, "lua_marker exec error: %s", dlua.error.c_str());
    }
    else
    {
        if (dlua.execstring(("return " + s).c_str(), "lua_marker_mapless", 1))
            mprf(MSGCH_WARN, "lua_marker_mapless exec error: %s",
                 dlua.error.c_str());
    }

Replacement in crawl-ref/source/mapmark.cc at line 382 [5.13502]

B:BD[5.20519] → [4.11720:11749]

    if (s.find("lua:") != 0)

[5.20519]

[5.20550]

    std::string raw           = s;
    bool        mapdef_marker = true;
    if (s.find("lua:") == 0)
        strip_tag(raw, "lua:", true);
    else if (s.find("lua_mapless:") == 0)
    {
        strip_tag(raw, "lua_mapless:", true);
        mapdef_marker = false;
    }
    else

Replacement in crawl-ref/source/mapmark.cc at line 394 [5.13502]
B:BD[5.20573] → [5.20573:20598]
B:BD[5.20598] → [6.4230:4264]
∅:D[6.4264] → [4.11778:11835]
B:BD[4.11778] → [4.11778:11835]
```
    std::string raw = s;
    strip_tag(raw, "lua:", true);
    map_lua_marker *mark = new map_lua_marker(raw, ctx);
```
[5.20573]
[4.11835]
```
    map_lua_marker *mark = new map_lua_marker(raw, ctx, mapdef_marker);
```

Insertion in crawl-ref/source/dat/clua/lm_fog.lua at line 164 [2.10377]

[2.16214]


function fog_machine_geyser(cloud_type, size, power)
  return FogMachine:new {
    cloud_type = cloud_type, pow_max = power, size = size,
    delay_min = power , delay_max = power * 2
  }
end
function fog_machine_spread(cloud_type, size, power)
  return FogMachine:new {
    cloud_type = cloud_type, pow_max = power, spread_rate = size,
    size = 1, delay_min = 5, delay_max = 15
  }
end
function fog_machine_brownian(cloud_type, size, power)
  return FogMachine:new {
    cloud_type = cloud_type, size = 1, pow_max = power,
    walk_dist = size, delay_min = 1, delay_max = power / size
  }
end

Insertion in crawl-ref/source/cloud.h at line 17 [8.4095213]

[7.6980]

enum fog_machine_type
{
    FM_GEYSER,
    FM_SPREAD,
    FM_BROWNIAN,
    NUM_FOG_MACHINE_TYPES
};

Insertion in crawl-ref/source/cloud.h at line 40 [8.4095213]

[9.3321]

[8.4095676]

void place_fog_machine(fog_machine_type fm_type, cloud_type cl_type,
                       int x, int y, int size, int power);

Insertion in crawl-ref/source/cloud.cc at line 19 [8.4095717]
[8.4096041]
[8.4096041]
```
#include "mapmark.h"
#include "misc.h"
```

Insertion in crawl-ref/source/cloud.cc at line 308 [8.4095717]

[7.7752]

[3.910]

}
void place_fog_machine(fog_machine_type fm_type, cloud_type cl_type,
                       int x, int y, int size, int power)
{
    const char* fog_types[] = {
        "geyser",
        "spread",
        "brownian"
    };
    try
    {
        char buf [160];
        sprintf(buf, "lua_mapless:fog_machine_%s(\"%s\", %d, %d)",
                fog_types[fm_type], cloud_name(cl_type).c_str(),
                size, power);
        map_marker *mark = map_lua_marker::parse_marker(buf, "");
        if (mark == NULL)
        {
            mprf(MSGCH_DIAGNOSTICS, "Unable to parse fog machine from '%s'",
                 buf);
            return;
        }
        mark->pos = coord_def(x, y);
        env.markers.add(mark);
    }
    catch (const std::string &err)
    {
        mprf(MSGCH_DIAGNOSTICS, "Error while making fog machine: %s",
             err.c_str());
    }

Insertion in crawl-ref/source/cloud.cc at line 345 [8.4095717]
[3.913]
[3.913]