diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game.cpp | 4 | ||||
| -rw-r--r-- | src/server.cpp | 28 | ||||
| -rw-r--r-- | src/tile.cpp | 2 |
3 files changed, 24 insertions, 10 deletions
diff --git a/src/game.cpp b/src/game.cpp index 6c75863c0..fc87deb29 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -256,9 +256,9 @@ void draw_hotbar(video::IVideoDriver *driver, gui::IGUIFont *font, /* Draw hearts */ + video::ITexture *heart_texture = tsrc->getTextureRaw("heart.png"); + if(heart_texture) { - video::ITexture *heart_texture = - driver->getTexture(getTexturePath("heart.png").c_str()); v2s32 p = pos + v2s32(0, -20); for(s32 i=0; i<halfheartcount/2; i++) { diff --git a/src/server.cpp b/src/server.cpp index ee5e301f1..9a7f1e972 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -997,13 +997,27 @@ Server::Server( // Export API scriptapi_export(m_lua, this); // Load and run scripts - std::string defaultscript = porting::path_data + DIR_DELIM - + "scripts" + DIR_DELIM + "default.lua"; - bool success = script_load(m_lua, defaultscript.c_str()); - if(!success){ - errorstream<<"Server: Failed to load and run " - <<defaultscript<<std::endl; - assert(0); + core::list<std::string> modspaths; + modspaths.push_back(porting::path_data + DIR_DELIM + "mods"); + for(core::list<std::string>::Iterator i = modspaths.begin(); + i != modspaths.end(); i++){ + std::string modspath = *i; + std::vector<fs::DirListNode> dirlist = fs::GetDirListing(modspath); + for(u32 j=0; j<dirlist.size(); j++){ + if(!dirlist[j].dir) + continue; + std::string modname = dirlist[j].name; + infostream<<"Server: Loading mod \""<<modname<<"\" script..." + <<std::endl; + std::string scriptpath = modspath + DIR_DELIM + modname + + DIR_DELIM + "init.lua"; + bool success = script_load(m_lua, scriptpath.c_str()); + if(!success){ + errorstream<<"Server: Failed to load and run " + <<scriptpath<<std::endl; + assert(0); + } + } } // Initialize Environment diff --git a/src/tile.cpp b/src/tile.cpp index c8fffffa7..eb3616f02 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -132,7 +132,7 @@ std::string getTexturePath(const std::string &filename) */ if(fullpath == "") { - std::string rel_path = std::string("textures")+DIR_DELIM+filename; + std::string rel_path = std::string("clienttextures")+DIR_DELIM+filename; std::string testpath = porting::path_data + DIR_DELIM + rel_path; // Check all filename extensions. Returns "" if not found. fullpath = getImagePath(testpath); |