summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/char/char.c8
-rw-r--r--src/char_sql/char.c7
-rw-r--r--src/common/socket.c60
-rw-r--r--src/common/socket.h4
-rw-r--r--src/login/login.c7
-rw-r--r--src/login_sql/login.c6
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/map.c6
-rw-r--r--src/map/pc.c5
-rw-r--r--src/map/script.c2
11 files changed, 23 insertions, 85 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 81e434eb4..943f15c16 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/02/07
+ * Removed deprecated console code.
* Moved CHAT_SIZE back to map.h because log_atcommand uses it on sql
builds. (moved to clif.c in r9811) [FlavioJS]
2007/02/06
diff --git a/src/char/char.c b/src/char/char.c
index e9d371ba5..cb490e113 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -4439,10 +4439,10 @@ int do_init(int argc, char **argv) {
add_timer_interval(gettick() + autosave_interval, mmo_char_sync_timer, 0, 0, autosave_interval);
char_read_fame_list(); //Read fame lists.
-
- if(console) {
- set_defaultconsoleparse(parse_console);
- start_console();
+
+ if( console )
+ {
+ //##TODO invoke a CONSOLE_START plugin event
}
char_log("The char-server is ready (Server is listening on the port %d)." RETCODE, char_port);
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 00807a70a..93bc7554d 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -4319,10 +4319,9 @@ int do_init(int argc, char **argv){
if(char_gm_read)
read_gm_account();
-
- if ( console ) {
- set_defaultconsoleparse(parse_console);
- start_console();
+ if( console )
+ {
+ //##TODO invoke a CONSOLE_START plugin event
}
//Cleaning the tables for NULL entrys @ startup [Sirius]
diff --git a/src/common/socket.c b/src/common/socket.c
index e8c4f68ab..1dd85489d 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -86,8 +86,6 @@ struct socket_data *session[FD_SETSIZE];
static int null_parse(int fd);
static int (*default_func_parse)(int) = null_parse;
-static int null_console_parse(char *buf);
-static int (*default_console_parse)(char*) = null_console_parse;
#ifndef MINICORE
static int connect_check(unsigned int ip);
#else
@@ -344,38 +342,6 @@ int make_listen_port(int port)
return make_listen_bind(INADDR_ANY,port);
}
-// Console Reciever [Wizputer]
-int console_recieve(int i)
-{
- int n;
- char *buf;
-
- CREATE(buf, char, 64);
-
- n = read(0, buf , 64);
- if ( n < 0 )
- ShowError("Console input read error\n");
- else
- {
- ShowNotice ("Sorry, the console is currently non-functional.\n");
-// session[0]->func_console(buf);
- }
-
- aFree(buf);
- return 0;
-}
-
-void set_defaultconsoleparse(int (*defaultparse)(char*))
-{
- default_console_parse = defaultparse;
-}
-
-static int null_console_parse(char *buf)
-{
- ShowMessage("null_console_parse : %s\n",buf);
- return 0;
-}
-
// function parse table
// To-do: -- use dynamic arrays
// -- add a register_parse_func();
@@ -401,26 +367,6 @@ void func_parse_check (struct socket_data *sd)
sd->type = SESSION_RAW;
}
-// Console Input [Wizputer]
-int start_console(void)
-{
- //Until a better plan is came up with... can't be using session[0] anymore! [Skotlex]
- ShowNotice("The console is currently nonfunctional.\n");
- return 0;
-
- FD_SET(0,&readfds);
-
- if (!session[0]) { // dummy socket already uses fd 0
- CREATE(session[0], struct socket_data, 1);
- }
- memset(session[0],0,sizeof(*session[0]));
-
- session[0]->func_recv = console_recieve;
- session[0]->func_console = default_console_parse;
-
- return 0;
-}
-
int make_connection(long ip,int port)
{
struct sockaddr_in server_address;
@@ -1249,8 +1195,9 @@ void socket_init(void)
// initialise last send-receive tick
last_tick = time(0);
- // session[0] Was for the console (whatever that was?), but is now currently used for disconnected sessions of the map
- // server, and as such, should hold enough buffer (it is a vacuum so to speak) as it is never flushed. [Skotlex]
+ // session[0] is for disconnected sessions of the map server, and as such,
+ // should hold enough buffer (it is a vacuum so to speak) as it is never flushed. [Skotlex]
+ //##TODO "flush" this session periodically O.O [FlavioJS]
CREATE(session[0], struct socket_data, 1);
CREATE(session[0]->rdata, unsigned char, 2*rfifo_size);
CREATE(session[0]->wdata, unsigned char, 2*wfifo_size);
@@ -1272,7 +1219,6 @@ void socket_init(void)
int session_isValid(int fd)
{ //End of Exam has pointed out that fd==0 is actually an unconnected session! [Skotlex]
- //But this is not so true, it is used... for... something. The console uses it, would this not cause problems? [Skotlex]
return ( (fd>0) && (fd<FD_SETSIZE) && (NULL!=session[fd]) );
}
diff --git a/src/common/socket.h b/src/common/socket.h
index 43e433ab0..7cf0fcd91 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -121,7 +121,6 @@ struct socket_data{
int (*func_recv)(int);
int (*func_send)(int);
int (*func_parse)(int);
- int (*func_console)(char*);
void* session_data;
void* session_data2;
enum SessionType type;
@@ -168,10 +167,7 @@ extern void flush_fifo(int fd);
extern void flush_fifos(void);
extern void set_nonblocking(int fd, int yes);
-int start_console(void);
-
void set_defaultparse(int (*defaultparse)(int));
-void set_defaultconsoleparse(int (*defaultparse)(char*));
//Resolves the hostname and stores the string representation of the string in ip.
//Meant to simplify calls to gethostbyname without the need of all the
diff --git a/src/login/login.c b/src/login/login.c
index 66152e52f..d3ce7311b 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -4186,9 +4186,10 @@ int do_init(int argc, char **argv) {
add_timer_func_list(sync_ip_addresses, "sync_ip_addresses");
add_timer_interval(gettick() + ip_sync_interval, sync_ip_addresses, 0, 0, ip_sync_interval);
}
- if(console) {
- set_defaultconsoleparse(parse_console);
- start_console();
+
+ if( console )
+ {
+ //##TODO invoke a CONSOLE_START plugin event
}
new_reg_tick=gettick();
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 2959eb449..1c9a95e22 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -2393,9 +2393,9 @@ int do_init(int argc,char **argv){
add_timer_interval(gettick() + ip_sync_interval, sync_ip_addresses, 0, 0, ip_sync_interval);
}
- if (console) {
- set_defaultconsoleparse(parse_console);
- start_console();
+ if( console )
+ {
+ //##TODO invoke a CONSOLE_START plugin event
}
new_reg_tick=gettick();
diff --git a/src/map/clif.c b/src/map/clif.c
index 2f9039dd0..733bb7699 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4858,7 +4858,7 @@ int clif_displaymessage(const int fd, char* mes)
// invalid pointer?
nullpo_retr(-1, mes);
- //Console [Wizputer] //Scrapped, as these are shared by disconnected players =X [Skotlex]
+ //Scrapped, as these are shared by disconnected players =X [Skotlex]
if (fd == 0)
return 0;
else {
diff --git a/src/map/map.c b/src/map/map.c
index 3817700fb..5f6421a66 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3978,9 +3978,9 @@ int do_init(int argc, char *argv[]) {
//Done loading with the maps, no need for the grf module anymore.
grfio_final();
- if ( console ) {
- set_defaultconsoleparse(parse_console);
- start_console();
+ if( console )
+ {
+ //##TODO invoke a CONSOLE_START plugin event
}
if (battle_config.pk_mode == 1)
diff --git a/src/map/pc.c b/src/map/pc.c
index 82f85c1ca..a0741f10d 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -77,11 +77,6 @@ int pc_isGM(struct map_session_data *sd) {
if(sd->bl.type!=BL_PC )
return 0;
-
- //For console [Wizputer] //Unfortunately the console is "broken" because it shares fd 0 with disconnected players. [Skotlex]
-// if ( sd->fd == 0 )
-// return 99;
-
for(i = 0; i < GM_num; i++)
if (gm_account[i].account_id == sd->status.account_id)
return gm_account[i].level;
diff --git a/src/map/script.c b/src/map/script.c
index c1eec1a43..e93b9df20 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -250,7 +250,7 @@ enum {
MF_GUILDLOCK
};
-//Reports on the console the src of an script error.
+//Reports on the console the src of a script error.
static void report_src(struct script_state *st) {
struct block_list *bl;
if (!st->oid) return; //Can't report source.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-10 05:41:11 +0000