X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/7fdd9c862564255232869d5343008bb06e303fb3..f71a53ab6e251712c26a11c0b373d41014f775d5:/gameserv/extern.h

diff --git a/gameserv/extern.h b/gameserv/extern.h
index ac189fd..43ae018 100644
--- a/gameserv/extern.h
+++ b/gameserv/extern.h
@@ -12,7 +12,6 @@
 #include <list>
 #include "player.h"
 #include "level.h"
-#include "list.h"
 #include "config.h"
 #include "options.h"
 #include "item.h"
@@ -97,15 +96,18 @@ E int maxidletime;
 E int idlecheckperiod;
 E int maxitems;
 E long maxforestfights;
+E unsigned int maxnicklen;
 
 /* config.cpp end */
 
-E List<aClient> players[U_TABLE_SIZE];
-E List<aClient> clients[U_TABLE_SIZE];
-E List<string> todaysnews;
+E list<Player*> players[U_TABLE_SIZE];
+E list<aClient*> clients[U_TABLE_SIZE];
+E list<string> todaysnews;
 
 /** tcpclient.cpp **/
 E void check_idles();
+E void clearClients();
+E void clearPlayers();
 
 /** List search functions **/
 E aClient *find(char *nick);
@@ -113,8 +115,7 @@ E aClient *find(const char *nick);
 E aClient *findbynick(char *nick);
 E aClient *findbynick(const char *nick);
 E aClient *findbyrealnick(char *realnick);
-E aClient *findplayer(const char *name);
-E aClient *findIRCplayer(const char *nick);
+E Player *findplayer(const char *name);
 #ifdef P10
 E aClient *findbyrealnick(char *realnick);
 #endif
@@ -126,15 +127,15 @@ E void notice(const char *source, const char *dest, const char *fmt, ...);
 E void raw(const char *fmt, ...);
 
 /** news.cpp **/
-E void addNews(List<string> &news, const char *fmt, ...);
+E void addNews(list<string> &news, const char *fmt, ...);
 E void do_news(char *u);
-E void clearNews(List<string> &news);
-E void loadNews(char *filename, List<string> &news);
-E void saveNews(char *filename, List<string> &news);
-E void showNews(char *nick, List<string> &news);
+E void clearNews(list<string> &news);
+E void loadNews(char *filename, list<string> &news);
+E void saveNews(char *filename, list<string> &news);
+E void showNews(char *nick, list<string> &news);
 
 /** gameserv.cpp **/
-
+E item *findItemByID(int id);
 E int hpbonus[LEVELS - 1];
 E int strbonus[LEVELS - 1];
 E int defbonus[LEVELS - 1];
@@ -162,6 +163,8 @@ E bool dragon_fight(aClient *user);
 E bool master_fight(char *u);
 E bool master_fight(aClient *user);
 
+E bool alphaNumeric(const char *str);
+
 #ifndef HAVE_STRTOK
 E char *strtok(char *str, const char *delim);
 #endif
@@ -219,7 +222,7 @@ E void see_mystic(char *u);
 
 E void logout(aClient *user); // log a user off the game
 E void showstats(const char *u, const char *nick);
-E void showinventory(aClient *from, aClient *to = NULL);
+E void showinventory(Player *from, aClient *to);
 /* Database saving stuff */
 
 E int save_gs_dbase();