From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 18 Aug 2009 09:24:15 +0000 Subject: astyle cleanup, corrects not loading of material textures --- src/core/func.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/core/func.cc') diff --git a/src/core/func.cc b/src/core/func.cc index 42c46c8..be5aca3 100644 --- a/src/core/func.cc +++ b/src/core/func.cc @@ -66,8 +66,8 @@ Func *Func::add(const char *name, TargetFuncPtr targetfunctionptr) void Func::remove(const char *name) { std::map::iterator it = func_registry.find(std::string(name)); - if (it != func_registry.end()) { - delete (*it).second; + if (it != func_registry.end()) { + delete(*it).second; func_registry.erase(it); //con_debug << "Function '" << name << "' unregistered." << std::endl; } @@ -76,11 +76,11 @@ void Func::remove(const char *name) void Func::remove(const std::string &name) { std::map::iterator it = func_registry.find(name); - if (it != func_registry.end()) { - delete (*it).second; - func_registry.erase(it); + if (it != func_registry.end()) { + delete(*it).second; + func_registry.erase(it); //con_debug << "Function '" << name << "' unregistered." << std::endl; - } + } } @@ -104,7 +104,7 @@ void Func::list() typeindicator += 'G'; else typeindicator += ' '; - if (((*it).second->flags() & Shared) == Shared) + if (((*it).second->flags() & Shared) == Shared) typeindicator += 'S'; else typeindicator += ' '; @@ -150,12 +150,12 @@ void Func::exec(std::string const &args) FuncPtr function = (FuncPtr) func_ptr; function(args); } - + void Func::exec(Player *player, std::string const &args) { if (!(flags() & Game)) return; - + GameFuncPtr gamefunction = (GameFuncPtr) func_ptr; gamefunction(player, args); } -- cgit v1.2.3