From c7a830bce88df87d3a91d60e67fece1e49cfb18f Mon Sep 17 00:00:00 2001 From: Mysteries Date: Sun, 19 May 2013 11:20:59 -0400 Subject: Little changes --- src/common/mapindex.h | 2 +- src/common/mmo.h | 63 ++++++++++++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 32 deletions(-) (limited to 'src/common') diff --git a/src/common/mapindex.h b/src/common/mapindex.h index d35d9899c..43953a8e0 100644 --- a/src/common/mapindex.h +++ b/src/common/mapindex.h @@ -7,7 +7,7 @@ #include "../common/db.h" -/* when a map index search fails, return results from what map? default:prontera */ +// When a map index search fails, return results from what map? default:prontera #define MAP_DEFAULT "prontera" #define MAP_DEFAULT_X 150 #define MAP_DEFAULT_Y 150 diff --git a/src/common/mmo.h b/src/common/mmo.h index d45dea212..172b27b15 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -51,13 +51,14 @@ #define PACKETVER 20120418 #endif -/// comment following line if your client is NOT ragexeRE (required because of conflicting packets in ragexe vs ragexeRE) +// Comment the following line if your client is NOT ragexeRE (required because of conflicting packets in ragexe vs ragexeRE). #define PACKETVER_RE -//Remove/Comment this line to disable sc_data saving. [Skotlex] +// Comment the following line to disable sc_data saving. [Skotlex] #define ENABLE_SC_SAVING -//Remove/Comment this line to disable server-side hot-key saving support [Skotlex] -//Note that newer clients no longer save hotkeys in the registry! + +// Comment the following like to disable server-side hot-key saving support. [Skotlex] +// Note that newer clients no longer save hotkeys in the registry! #define HOTKEY_SAVING #if PACKETVER < 20090603 @@ -84,10 +85,10 @@ #define MAX_FAME 1000000000 #define MAX_CART 100 #define MAX_SKILL 1477 -#define MAX_SKILL_ID 10015 //[Ind/Hercules] max used skill id -#define GLOBAL_REG_NUM 256 // max permanent character variables per char -#define ACCOUNT_REG_NUM 64 // max permanent local account variables per account -#define ACCOUNT_REG2_NUM 16 // max permanent global account variables per account +#define MAX_SKILL_ID 10015 // [Ind/Hercules] max used skill ID +#define GLOBAL_REG_NUM 256 // Max permanent character variables per char +#define ACCOUNT_REG_NUM 64 // Max permanent local account variables per account +#define ACCOUNT_REG2_NUM 16 // Max permanent global account variables per account //Should hold the max of GLOBAL/ACCOUNT/ACCOUNT2 (needed for some arrays that hold all three) #define MAX_REG_NUM 256 #define DEFAULT_WALK_SPEED 150 @@ -96,16 +97,16 @@ #define MAX_STORAGE 600 #define MAX_GUILD_STORAGE 600 #define MAX_PARTY 12 -#define MAX_GUILD 16+10*6 // increased max guild members +6 per 1 extension levels [Lupus] -#define MAX_GUILDPOSITION 20 // increased max guild positions to accomodate for all members [Valaris] (removed) [PoW] +#define MAX_GUILD 16+10*6 // Increased max guild members +6 per 1 extension levels [Lupus] +#define MAX_GUILDPOSITION 20 // Increased max guild positions to accomodate for all members [Valaris] (removed) [PoW] #define MAX_GUILDEXPULSION 32 #define MAX_GUILDALLIANCE 16 -#define MAX_GUILDSKILL 15 // increased max guild skills because of new skills [Sara-chan] +#define MAX_GUILDSKILL 15 // Increased max guild skills because of new skills [Sara-chan] #define MAX_GUILDLEVEL 50 -#define MAX_GUARDIANS 8 //Local max per castle. [Skotlex] -#define MAX_QUEST_DB 2400 //Max quests that the server will load -#define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest -#define MAX_START_ITEMS 32 //Max number of items allowed to be given to a char whenever it's created. [mkbu95] +#define MAX_GUARDIANS 8 // Local max per castle. [Skotlex] +#define MAX_QUEST_DB 2400 // Max quests that the server will load +#define MAX_QUEST_OBJECTIVES 3 // Max quest objectives for a quest +#define MAX_START_ITEMS 32 // Max number of items allowed to be given to a char whenever it's created. [mkbu95] // for produce #define MIN_ATTRIBUTE 0 @@ -124,43 +125,43 @@ #define NAME_LENGTH (23 + 1) //For item names, which tend to have much longer names. #define ITEM_NAME_LENGTH 50 -//For Map Names, which the client considers to be 16 in length including the .gat extension +//For Map Names, which the client considers to be 16 in length including the .gat extension. #define MAP_NAME_LENGTH (11 + 1) #define MAP_NAME_LENGTH_EXT (MAP_NAME_LENGTH + 4) #define MAX_FRIENDS 40 #define MAX_MEMOPOINTS 3 -//Size of the fame list arrays. +// Size of the fame list arrays. #define MAX_FAME_LIST 10 -//Limits to avoid ID collision with other game objects +// Limits to avoid ID collision with other game objects #define START_ACCOUNT_NUM 2000000 #define END_ACCOUNT_NUM 100000000 #define START_CHAR_NUM 150000 -//Guilds +// Guilds #define MAX_GUILDMES1 60 #define MAX_GUILDMES2 120 -//Base Homun skill. +// Base Homun skill. #define HM_SKILLBASE 8001 #define MAX_HOMUNSKILL 43 -#define MAX_HOMUNCULUS_CLASS 52 //[orn], Increased to 60 from 16 to allow new Homun-S. +#define MAX_HOMUNCULUS_CLASS 52 // [orn] Increased to 60 from 16 to allow new Homun-S. #define HM_CLASS_BASE 6001 #define HM_CLASS_MAX (HM_CLASS_BASE+MAX_HOMUNCULUS_CLASS-1) -//Mail System +// Mail System #define MAIL_MAX_INBOX 30 #define MAIL_TITLE_LENGTH 40 #define MAIL_BODY_LENGTH 200 -//Mercenary System +// Mercenary System #define MC_SKILLBASE 8201 #define MAX_MERCSKILL 40 #define MAX_MERCENARY_CLASS 61 -//Elemental System +// Elemental System #define MAX_ELEMENTALSKILL 42 #define EL_SKILLBASE 8401 #define MAX_ELESKILLTREE 3 @@ -186,7 +187,7 @@ enum item_types { }; -//Questlog system [Kevin] [Inkfish] +// Questlog system [Kevin] [Inkfish] typedef enum quest_state { Q_INACTIVE, Q_ACTIVE, Q_COMPLETE } quest_state; struct quest { @@ -200,7 +201,7 @@ struct item { int id; short nameid; short amount; - unsigned short equip; // location(s) where item is equipped (using enum equip_pos for bitmasking) + unsigned short equip; // Location(s) where item is equipped (using enum equip_pos for bitmasking). char identify; char refine; char attribute; @@ -220,8 +221,8 @@ enum e_skill_flag SKILL_FLAG_PERMANENT, SKILL_FLAG_TEMPORARY, SKILL_FLAG_PLAGIARIZED, - SKILL_FLAG_REPLACED_LV_0, // temporary skill overshadowing permanent skill of level 'N - SKILL_FLAG_REPLACED_LV_0', - SKILL_FLAG_PERM_GRANTED, // permanent, granted through someway e.g. script + SKILL_FLAG_REPLACED_LV_0, // Temporary skill overshadowing permanent skill of level 'N - SKILL_FLAG_REPLACED_LV_0', + SKILL_FLAG_PERM_GRANTED, // Permanent, granted through someway (e.g. script). //... }; @@ -234,7 +235,7 @@ enum e_mmo_charstatus_opt { struct s_skill { unsigned short id; unsigned char lv; - unsigned char flag; // see enum e_skill_flag + unsigned char flag; // See enum e_skill_flag }; struct global_reg { @@ -242,14 +243,14 @@ struct global_reg { char value[256]; }; -//Holds array of global registries, used by the char server and converter. +// Holds array of global registries, used by the char server and converter. struct accreg { int account_id, char_id; int reg_num; struct global_reg reg[MAX_REG_NUM]; }; -//For saving status changes across sessions. [Skotlex] +// For saving status changes across sessions. [Skotlex] struct status_change_data { unsigned short type; //SC_type long val1, val2, val3, val4, tick; //Remaining duration. -- cgit v1.2.3-70-g09d2