Fix alpha for liquid nodes (#5494)

[oweals/minetest.git] / src / ban.h

diff --git a/src/ban.h b/src/ban.h
index 8132c3a38552002eab5bd3232e279d50dc969f25..e35bd0e10e2dc135f3967eceff9ea72dccb80063 100644 (file)
--- a/src/ban.h
+++ b/src/ban.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,11 +20,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef BAN_HEADER
 #define BAN_HEADER
 
+#include "util/string.h"
+#include "threading/thread.h"
+#include "threading/mutex.h"
+#include "exceptions.h"
 #include <map>
 #include <string>
-#include <jthread.h>
-#include <jmutex.h>
-#include "exceptions.h"
 
 class BanManager
 {
@@ -40,12 +41,12 @@ public:
        void add(const std::string &ip, const std::string &name);
        void remove(const std::string &ip_or_name);
        bool isModified();
+
 private:
-       JMutex m_mutex;
+       Mutex m_mutex;
        std::string m_banfilepath;
-       std::map<std::string, std::string> m_ips;
+       StringMap m_ips;
        bool m_modified;
-
 };
 
 #endif