diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-01-07 19:39:27 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-01-07 19:39:27 +0200 |
| commit | 6b6c2d37ea1f9075c4fbf0d7e2d52e527e1f86aa (patch) | |
| tree | 16ab23387dc95d0f42e6519e500d4024e2a2f826 /src/mapnode.cpp | |
| parent | dc414091e736badc6fd2faa6a2583639a3458818 (diff) | |
| download | minetest-6b6c2d37ea1f9075c4fbf0d7e2d52e527e1f86aa.tar.gz minetest-6b6c2d37ea1f9075c4fbf0d7e2d52e527e1f86aa.tar.bz2 minetest-6b6c2d37ea1f9075c4fbf0d7e2d52e527e1f86aa.zip | |
Added a more flexible path system (and fixed some minor stuff)
Diffstat (limited to 'src/mapnode.cpp')
| -rw-r--r-- | src/mapnode.cpp | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/src/mapnode.cpp b/src/mapnode.cpp index 3dae653ed..f9997ddbe 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -19,6 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapnode.h" #include "tile.h" +#include "porting.h" +#include <string> /* Face directions: @@ -46,20 +48,33 @@ u16 g_content_tiles[USEFUL_CONTENT_COUNT][6] = {TILE_WOOD,TILE_WOOD,TILE_WOOD,TILE_WOOD,TILE_WOOD,TILE_WOOD}, }; -const char * g_content_inventory_textures[USEFUL_CONTENT_COUNT] = +std::string g_content_inventory_texture_strings[USEFUL_CONTENT_COUNT]; +// Pointers to c_str()s of the above +const char * g_content_inventory_texture_paths[USEFUL_CONTENT_COUNT] = {0}; + +const char * g_content_inventory_texture_paths_base[USEFUL_CONTENT_COUNT] = { - "../data/stone.png", - "../data/grass.png", - "../data/water.png", - "../data/torch_on_floor.png", - "../data/tree_top.png", - "../data/leaves.png", - "../data/grass_footsteps.png", - "../data/mese.png", - "../data/mud.png", - "../data/water.png", - "../data/cloud.png", - "../data/coalstone.png", - "../data/wood.png", + "stone.png", + "grass.png", + "water.png", + "torch_on_floor.png", + "tree_top.png", + "leaves.png", + "grass_footsteps.png", + "mese.png", + "mud.png", + "water.png", + "cloud.png", + "coalstone.png", + "wood.png", }; +void init_content_inventory_texture_paths() +{ + for(u16 i=0; i<USEFUL_CONTENT_COUNT; i++) + { + g_content_inventory_texture_strings[i] = porting::getDataPath(g_content_inventory_texture_paths_base[i]); + g_content_inventory_texture_paths[i] = g_content_inventory_texture_strings[i].c_str(); + } +} + |