X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Ftexture.cc;h=3aebec3fbd94b5b81febaf1f8b67300295eb82d9;hp=b3c17feba46e50c1a81a97cc2aef210e54a9e7ba;hb=b30241a8a51be904b22459a1d0cc3322e0a505d9;hpb=21f74bf587d9b7a76bc1ee83db02cb8c243dc567 diff --git a/src/texture.cc b/src/texture.cc index b3c17fe..3aebec3 100644 --- a/src/texture.cc +++ b/src/texture.cc @@ -468,13 +468,13 @@ TextureSet::TextureSet() { } -Texture *TextureSet::get_texture(const char *name, TextureType type) const +Texture *TextureSet::get_texture(const char *name, TextureType type, const DataMap *dmap) const { char *fname; - int nsize = datamap_path_size(name); + int nsize = dmap ? dmap->path_size(name) : 0; if(nsize) { fname = (char*)alloca(nsize); - datamap_lookup(name, fname, nsize); + dmap->lookup(name, fname, nsize); } else { fname = (char*)name; }