- Moved START_ACCOUNT_NUM and END_ACCOUNT_NUM from login.h to mmo.h and changed clif_guess_PacketVer to use that.

- Made the script engine big-endian compatible. (i know it's pointless because of the move to eApp, but just couldn't resist :S)
- Commented out the remnants of ladmin packet parsing in map-server.
- Added a warning when a player has an invalid packet version (shouldn't happen)

PS- also added info on clif_guild_basicinfo packet fields, if anyone is interested

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9408 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 44 insertions, 46 deletions

diff --git a/src/login/login.h b/src/login/login.h
index 1581a068e..5a12902c7 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -1,46 +1,44 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL

-// For more information, see LICENCE in the main folder

-

-#ifndef _LOGIN_H_

-#define _LOGIN_H_

-

-#include "../common/mmo.h"

-

-#define MAX_SERVERS 30

-

-#define LOGIN_CONF_NAME "conf/login_athena.conf"

-#define LAN_CONF_NAME "conf/subnet_athena.conf"

-#define PASSWORDENC 3	// A definition is given when making an encryption password correspond.

-                     	// It is 1 at the time of passwordencrypt.

-                     	// It is made into 2 at the time of passwordencrypt2.

-                     	// When it is made 3, it corresponds to both.

-#define START_ACCOUNT_NUM 2000000

-#define END_ACCOUNT_NUM 100000000

-

-extern int login_port;

-struct mmo_account {

-	int version;	//Added for version check [Sirius]

-	char userid[NAME_LENGTH];

-	char passwd[NAME_LENGTH];

-	int passwdenc;

-

-	long account_id;

-	long login_id1;

-	long login_id2;

-	long char_id;

-	char lastlogin[24];

-	int sex;

-};

-

-struct mmo_char_server {

-	char name[21];

-	long ip;

-	short port;

-	int users;

-	int maintenance;

-	int new_;

-};

-

-extern struct mmo_char_server server[MAX_SERVERS];

-extern int server_fd[MAX_SERVERS];

-#endif

+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _LOGIN_H_
+#define _LOGIN_H_
+
+#include "../common/mmo.h"
+
+#define MAX_SERVERS 30
+
+#define LOGIN_CONF_NAME "conf/login_athena.conf"
+#define LAN_CONF_NAME "conf/subnet_athena.conf"
+#define PASSWORDENC 3	// A definition is given when making an encryption password correspond.
+                     	// It is 1 at the time of passwordencrypt.
+                     	// It is made into 2 at the time of passwordencrypt2.
+                     	// When it is made 3, it corresponds to both.
+
+extern int login_port;
+struct mmo_account {
+	int version;	//Added for version check [Sirius]
+	char userid[NAME_LENGTH];
+	char passwd[NAME_LENGTH];
+	int passwdenc;
+
+	long account_id;
+	long login_id1;
+	long login_id2;
+	long char_id;
+	char lastlogin[24];
+	int sex;
+};
+
+struct mmo_char_server {
+	char name[21];
+	long ip;
+	short port;
+	int users;
+	int maintenance;
+	int new_;
+};
+
+extern struct mmo_char_server server[MAX_SERVERS];
+extern int server_fd[MAX_SERVERS];
+#endif