summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt6
-rw-r--r--src/char/char.c343
-rw-r--r--src/char_sql/char.c182
-rw-r--r--src/common/mmo.h83
-rw-r--r--src/map/chrif.c2
-rw-r--r--src/map/map.h83
6 files changed, 361 insertions, 338 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0aa6a5480..41cb86d22 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,12 @@ 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.
2006/05/31
+ * Moved the JOB_* defines from map.h to mmo.h, update char.c to use them.
+ [Skotlex]
+ * Added function char_read_fame_list for famelist reading. Invoked it on
+ init, and made it be sent automatically to connecting map servers.
+ [Skotlex]
+ * Some cleaning of the fame-list reading code. [Skotlex]
* Some cleaning of the fame-update code, fixed a logic bug which made the
ranking list fail to display the correct ranker names. [Skotlex]
* Removed typedef bool from socket.h and included cbasetypes.c instead.
diff --git a/src/char/char.c b/src/char/char.c
index cd2ba683b..6b25561a1 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -571,26 +571,26 @@ int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct global_reg *reg
//Temporal fix until all chars are reverted from peco-flying-class to
//normal classes. [Skotlex]
switch (p->class_) {
- case 13: //Job_Knight2
- p->class_ = 7;
+ case JOB_KNIGHT2: //Job_Knight2
+ p->class_ = JOB_KNIGHT;
break;
- case 21: //Job_Crusader2
- p->class_ = 14;
+ case JOB_CRUSADER2: //Job_Crusader2
+ p->class_ = JOB_CRUSADER;
break;
- case 4014: //Job_Lord_Knight2
- p->class_ = 4008;
+ case JOB_LORD_KNIGHT2: //Job_Lord_Knight2
+ p->class_ = JOB_LORD_KNIGHT;
break;
- case 4022: //Job_Paladin2
- p->class_ = 4015;
+ case JOB_PALADIN2: //Job_Paladin2
+ p->class_ = JOB_PALADIN;
break;
- case 4036: //Job_Baby_Knight2
- p->class_ = 4030;
+ case JOB_BABY_KNIGHT2: //Job_Baby_Knight2
+ p->class_ = JOB_BABY_KNIGHT;
break;
- case 4044: //Job_Baby_Crusader2
- p->class_ = 4037;
+ case JOB_BABY_CRUSADER2: //Job_Baby_Crusader2
+ p->class_ = JOB_BABY_CRUSADER;
break;
- case 4048: //Job_Star_Gladiator2
- p->class_ = 4047;
+ case JOB_STAR_GLADIATOR2: //Job_Star_Gladiator2
+ p->class_ = JOB_STAR_GLADIATOR;
break;
}
p->base_level = tmp_int[4];
@@ -1182,75 +1182,82 @@ int make_new_char(int fd, unsigned char *dat) {
//----------------------------------------------------
char * job_name(int class_) {
switch (class_) {
- case 0: return "Novice";
- case 1: return "Swordsman";
- case 2: return "Mage";
- case 3: return "Archer";
- case 4: return "Acolyte";
- case 5: return "Merchant";
- case 6: return "Thief";
- case 7: return "Knight";
- case 8: return "Priest";
- case 9: return "Wizard";
- case 10: return "Blacksmith";
- case 11: return "Hunter";
- case 12: return "Assassin";
- case 13: return "Knight 2";
- case 14: return "Crusader";
- case 15: return "Monk";
- case 16: return "Sage";
- case 17: return "Rogue";
- case 18: return "Alchemist";
- case 19: return "Bard";
- case 20: return "Dancer";
- case 21: return "Crusader 2";
- case 22: return "Wedding";
- case 23: return "Super Novice";
- case 4001: return "Novice High";
- case 4002: return "Swordsman High";
- case 4003: return "Mage High";
- case 4004: return "Archer High";
- case 4005: return "Acolyte High";
- case 4006: return "Merchant High";
- case 4007: return "Thief High";
- case 4008: return "Lord Knight";
- case 4009: return "High Priest";
- case 4010: return "High Wizard";
- case 4011: return "Whitesmith";
- case 4012: return "Sniper";
- case 4013: return "Assassin Cross";
- case 4014: return "Peko Knight";
- case 4015: return "Paladin";
- case 4016: return "Champion";
- case 4017: return "Professor";
- case 4018: return "Stalker";
- case 4019: return "Creator";
- case 4020: return "Clown";
- case 4021: return "Gypsy";
- case 4022: return "Peko Paladin";
- case 4023: return "Baby Novice";
- case 4024: return "Baby Swordsman";
- case 4025: return "Baby Mage";
- case 4026: return "Baby Archer";
- case 4027: return "Baby Acolyte";
- case 4028: return "Baby Merchant";
- case 4029: return "Baby Thief";
- case 4030: return "Baby Knight";
- case 4031: return "Baby Priest";
- case 4032: return "Baby Wizard";
- case 4033: return "Baby Blacksmith";
- case 4034: return "Baby Hunter";
- case 4035: return "Baby Assassin";
- case 4036: return "Baby Peco Knight";
- case 4037: return "Baby Crusader";
- case 4038: return "Baby Monk";
- case 4039: return "Baby Sage";
- case 4040: return "Baby Rogue";
- case 4041: return "Baby Alchemist";
- case 4042: return "Baby Bard";
- case 4043: return "Baby Dancer";
- case 4044: return "Baby Peco Crusader";
- case 4045: return "Super Baby";
+ case JOB_NOVICE: return "Novice";
+ case JOB_SWORDMAN: return "Swordsman";
+ case JOB_MAGE: return "Mage";
+ case JOB_ARCHER: return "Archer";
+ case JOB_ACOLYTE: return "Acolyte";
+ case JOB_MERCHANT: return "Merchant";
+ case JOB_THIEF: return "Thief";
+ case JOB_KNIGHT: return "Knight";
+ case JOB_PRIEST: return "Priest";
+ case JOB_WIZARD: return "Wizard";
+ case JOB_BLACKSMITH: return "Blacksmith";
+ case JOB_HUNTER: return "Hunter";
+ case JOB_ASSASSIN: return "Assassin";
+ case JOB_KNIGHT2: return "Peco-Knight";
+ case JOB_CRUSADER: return "Crusader";
+ case JOB_MONK: return "Monk";
+ case JOB_SAGE: return "Sage";
+ case JOB_ROGUE: return "Rogue";
+ case JOB_ALCHEMIST: return "Alchemist";
+ case JOB_BARD: return "Bard";
+ case JOB_DANCER: return "Dancer";
+ case JOB_CRUSADER2: return "Peco-Crusader";
+ case JOB_WEDDING: return "Wedding";
+ case JOB_SUPER_NOVICE: return "Super Novice";
+ case JOB_GUNSLINGER: return "Gunslinger";
+ case JOB_NINJA: return "Ninja";
+ case JOB_XMAS: return "Christmas";
+ case JOB_NOVICE_HIGH: return "Novice High";
+ case JOB_SWORDMAN_HIGH: return "Swordsman High";
+ case JOB_MAGE_HIGH: return "Mage High";
+ case JOB_ARCHER_HIGH: return "Archer High";
+ case JOB_ACOLYTE_HIGH: return "Acolyte High";
+ case JOB_MERCHANT_HIGH: return "Merchant High";
+ case JOB_THIEF_HIGH: return "Thief High";
+ case JOB_LORD_KNIGHT: return "Lord Knight";
+ case JOB_HIGH_PRIEST: return "High Priest";
+ case JOB_HIGH_WIZARD: return "High Wizard";
+ case JOB_WHITESMITH: return "Whitesmith";
+ case JOB_SNIPER: return "Sniper";
+ case JOB_ASSASSIN_CROSS: return "Assassin Cross";
+ case JOB_LORD_KNIGHT2: return "Peko Knight";
+ case JOB_PALADIN: return "Paladin";
+ case JOB_CHAMPION: return "Champion";
+ case JOB_PROFESSOR: return "Professor";
+ case JOB_STALKER: return "Stalker";
+ case JOB_CREATOR: return "Creator";
+ case JOB_CLOWN: return "Clown";
+ case JOB_GYPSY: return "Gypsy";
+ case JOB_PALADIN2: return "Peko Paladin";
+ case JOB_BABY: return "Baby Novice";
+ case JOB_BABY_SWORDMAN: return "Baby Swordsman";
+ case JOB_BABY_MAGE: return "Baby Mage";
+ case JOB_BABY_ARCHER: return "Baby Archer";
+ case JOB_BABY_ACOLYTE: return "Baby Acolyte";
+ case JOB_BABY_MERCHANT: return "Baby Merchant";
+ case JOB_BABY_THIEF: return "Baby Thief";
+ case JOB_BABY_KNIGHT: return "Baby Knight";
+ case JOB_BABY_PRIEST: return "Baby Priest";
+ case JOB_BABY_WIZARD: return "Baby Wizard";
+ case JOB_BABY_BLACKSMITH: return "Baby Blacksmith";
+ case JOB_BABY_HUNTER: return "Baby Hunter";
+ case JOB_BABY_ASSASSIN: return "Baby Assassin";
+ case JOB_BABY_KNIGHT2: return "Baby Peco Knight";
+ case JOB_BABY_CRUSADER: return "Baby Crusader";
+ case JOB_BABY_MONK: return "Baby Monk";
+ case JOB_BABY_SAGE: return "Baby Sage";
+ case JOB_BABY_ROGUE: return "Baby Rogue";
+ case JOB_BABY_ALCHEMIST: return "Baby Alchemist";
+ case JOB_BABY_BARD: return "Baby Bard";
+ case JOB_BABY_DANCER: return "Baby Dancer";
+ case JOB_BABY_CRUSADER2: return "Baby Peco Crusader";
+ case JOB_SUPER_BABY: return "Super Baby";
+ case JOB_TAEKWON: return "Taekwon";
+ case JOB_STAR_GLADIATOR: return "Star Gladiator";
+ case JOB_STAR_GLADIATOR2: return "Flying Star Gladiator";
+ case JOB_SOUL_LINKER: return "Soul Linker";
}
return "Unknown Job";
}
@@ -1958,16 +1965,16 @@ int parse_tologin(int fd) {
if (char_dat[i].status.account_id == acc) {
int jobclass = char_dat[i].status.class_;
char_dat[i].status.sex = sex;
- if (jobclass == 19 || jobclass == 20 ||
- jobclass == 4020 || jobclass == 4021 ||
- jobclass == 4042 || jobclass == 4043) {
+ if (jobclass == JOB_BARD || jobclass == JOB_DANCER ||
+ jobclass == JOB_CLOWN || jobclass == JOB_GYPSY ||
+ jobclass == JOB_BABY_BARD || jobclass == JOB_BABY_DANCER) {
// job modification
- if (jobclass == 19 || jobclass == 20) {
- char_dat[i].status.class_ = (sex) ? 19 : 20;
- } else if (jobclass == 4020 || jobclass == 4021) {
- char_dat[i].status.class_ = (sex) ? 4020 : 4021;
- } else if (jobclass == 4042 || jobclass == 4043) {
- char_dat[i].status.class_ = (sex) ? 4042 : 4043;
+ if (jobclass == JOB_BARD || jobclass == JOB_DANCER) {
+ char_dat[i].status.class_ = (sex) ? JOB_BARD : JOB_DANCER;
+ } else if (jobclass == JOB_CLOWN || jobclass == JOB_GYPSY) {
+ char_dat[i].status.class_ = (sex) ? JOB_CLOWN : JOB_GYPSY;
+ } else if (jobclass == JOB_BABY_BARD || jobclass == JOB_BABY_DANCER) {
+ char_dat[i].status.class_ = (sex) ? JOB_BABY_BARD : JOB_BABY_DANCER;
}
// remove specifical skills of classes 19, 4020 and 4042
for(j = 315; j <= 322; j++) {
@@ -2368,6 +2375,75 @@ int char_account_reg_reply(int fd,int account_id,int char_id) {
return 0;
}
+void char_read_fame_list()
+{
+ int i, j, k;
+ struct fame_list fame_item;
+ CREATE_BUFFER(id, int, char_num);
+
+ for(i = 0; i < char_num; i++) {
+ id[i] = i;
+ for(j = 0; j < i; j++) {
+ if (char_dat[i].status.fame > char_dat[id[j]].status.fame) {
+ for(k = i; k > j; k--)
+ id[k] = id[k-1];
+ id[j] = i; // id[i]
+ break;
+ }
+ }
+ }
+
+ // Empty ranking lists
+ memset(smith_fame_list, 0, sizeof(smith_fame_list));
+ memset(chemist_fame_list, 0, sizeof(chemist_fame_list));
+ memset(taekwon_fame_list, 0, sizeof(taekwon_fame_list));
+ // Build Blacksmith ranking list
+ for (i = 0, j = 0; i < char_num && j < fame_list_size_smith; i++) {
+ if (char_dat[id[i]].status.fame && (
+ char_dat[id[i]].status.class_ == JOB_BLACKSMITH ||
+ char_dat[id[i]].status.class_ == JOB_WHITESMITH ||
+ char_dat[id[i]].status.class_ == JOB_BABY_BLACKSMITH))
+ {
+ fame_item.id = char_dat[id[i]].status.char_id;
+ fame_item.fame = char_dat[id[i]].status.fame;
+ strncpy(fame_item.name, char_dat[id[i]].status.name, NAME_LENGTH);
+
+ memcpy(&smith_fame_list[j],&fame_item,sizeof(struct fame_list));
+ j++;
+ }
+ }
+ // Build Alchemist ranking list
+ for (i = 0, j = 0; i < char_num && j < fame_list_size_chemist; i++) {
+ if (char_dat[id[i]].status.fame && (
+ char_dat[id[i]].status.class_ == JOB_ALCHEMIST ||
+ char_dat[id[i]].status.class_ == JOB_CREATOR ||
+ char_dat[id[i]].status.class_ == JOB_BABY_ALCHEMIST))
+ {
+ fame_item.id = char_dat[id[i]].status.char_id;
+ fame_item.fame = char_dat[id[i]].status.fame;
+ strncpy(fame_item.name, char_dat[id[i]].status.name, NAME_LENGTH);
+
+ memcpy(&chemist_fame_list[j],&fame_item,sizeof(struct fame_list));
+
+ j++;
+ }
+ }
+ // Build Taekwon ranking list
+ for (i = 0, j = 0; i < char_num && j < fame_list_size_taekwon; i++) {
+ if (char_dat[id[i]].status.fame &&
+ char_dat[id[i]].status.class_ == JOB_TAEKWON)
+ {
+ fame_item.id = char_dat[id[i]].status.char_id;
+ fame_item.fame = char_dat[id[i]].status.fame;
+ strncpy(fame_item.name, char_dat[id[i]].status.name, NAME_LENGTH);
+
+ memcpy(&taekwon_fame_list[j],&fame_item,sizeof(struct fame_list));
+
+ j++;
+ }
+ }
+ DELETE_BUFFER(id);
+}
// Send map-servers the fame ranking lists
int char_send_fame_list(int fd) {
int i, len = 8;
@@ -2396,8 +2472,10 @@ int char_send_fame_list(int fd) {
// add total packet length
WBUFW(buf, 2) = len;
- // send to all map-servers
- mapif_sendall(buf, len);
+ if(fd!=-1)
+ mapif_send(fd, buf, len);
+ else
+ mapif_sendall(buf, len);
return 0;
}
@@ -2489,6 +2567,7 @@ int parse_frommap(int fd) {
memcpy(WFIFOP(fd,3), wisp_server_name, NAME_LENGTH); // name for wisp to player
WFIFOSET(fd,3+NAME_LENGTH);
//WFIFOSET(fd,27);
+ char_send_fame_list(fd); //Send fame list.
{
unsigned char buf[16384];
int x;
@@ -2908,7 +2987,7 @@ int parse_frommap(int fd) {
strncpy(list[i].name, char_dat[j].status.name, NAME_LENGTH);
else //Not found??
strncpy(list[i].name, "Unknown", NAME_LENGTH);
- char_send_fame_list(fd);
+ char_send_fame_list(-1);
}
break;
@@ -2947,78 +3026,10 @@ int parse_frommap(int fd) {
case 0x2b1a:
if (RFIFOREST(fd) < 2)
return 0;
- {
- int i, j, k;
- struct fame_list fame_item;
- CREATE_BUFFER(id, int, char_num);
-
- for(i = 0; i < char_num; i++) {
- id[i] = i;
- for(j = 0; j < i; j++) {
- if (char_dat[i].status.fame > char_dat[id[j]].status.fame) {
- for(k = i; k > j; k--)
- id[k] = id[k-1];
- id[j] = i; // id[i]
- break;
- }
- }
- }
-
- // Empty ranking lists
- memset(smith_fame_list, 0, sizeof(smith_fame_list));
- memset(chemist_fame_list, 0, sizeof(chemist_fame_list));
- memset(taekwon_fame_list, 0, sizeof(taekwon_fame_list));
- // Build Blacksmith ranking list
- for (i = 0, j = 0; i < char_num && j < fame_list_size_smith; i++) {
- if (char_dat[id[i]].status.fame && (char_dat[id[i]].status.class_ == 10 ||
- char_dat[id[i]].status.class_ == 4011 ||
- char_dat[id[i]].status.class_ == 4033))
- {
- fame_item.id = char_dat[id[i]].status.char_id;
- fame_item.fame = char_dat[id[i]].status.fame;
- strncpy(fame_item.name, char_dat[id[i]].status.name, NAME_LENGTH);
-
- smith_fame_list[j] = fame_item;
-
- j++;
- }
- }
- // Build Alchemist ranking list
- for (i = 0, j = 0; i < char_num && j < fame_list_size_chemist; i++) {
- if (char_dat[id[i]].status.fame && (char_dat[id[i]].status.class_ == 18 ||
- char_dat[id[i]].status.class_ == 4019 ||
- char_dat[id[i]].status.class_ == 4041))
- {
- fame_item.id = char_dat[id[i]].status.char_id;
- fame_item.fame = char_dat[id[i]].status.fame;
- strncpy(fame_item.name, char_dat[id[i]].status.name, NAME_LENGTH);
-
- chemist_fame_list[j] = fame_item;
-
- j++;
- }
- }
- // Build Taekwon ranking list
- for (i = 0, j = 0; i < char_num && j < fame_list_size_taekwon; i++) {
- if (char_dat[id[i]].status.fame && char_dat[id[i]].status.class_ == 4046)
- {
- fame_item.id = char_dat[id[i]].status.char_id;
- fame_item.fame = char_dat[id[i]].status.fame;
- strncpy(fame_item.name, char_dat[id[i]].status.name, NAME_LENGTH);
-
- taekwon_fame_list[j] = fame_item;
-
- j++;
- }
- }
-
- DELETE_BUFFER(id);
-
- char_send_fame_list(fd);
-
+ char_read_fame_list();
+ char_send_fame_list(-1);
RFIFOSKIP(fd,2);
break;
- }
//Request to save status change data. [Skotlex]
case 0x2b1c:
@@ -4236,6 +4247,8 @@ int do_init(int argc, char **argv) {
add_timer_interval(gettick() + 3600*1000, send_accounts_tologin, 0, 0, 3600*1000); //Sync online accounts every hour
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();
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index aecdb80e5..9edcd5d00 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -1963,16 +1963,16 @@ int parse_tologin(int fd) {
skill_point = atoi(sql_row[2]);
guild_id = atoi(sql_row[3]);
class_ = jobclass;
- if (jobclass == 19 || jobclass == 20 ||
- jobclass == 4020 || jobclass == 4021 ||
- jobclass == 4042 || jobclass == 4043) {
+ if (jobclass == JOB_BARD || jobclass == JOB_DANCER ||
+ jobclass == JOB_CLOWN || jobclass == JOB_GYPSY ||
+ jobclass == JOB_BABY_BARD || jobclass == JOB_BABY_DANCER) {
// job modification
- if (jobclass == 19 || jobclass == 20) {
- class_ = (sex) ? 19 : 20;
- } else if (jobclass == 4020 || jobclass == 4021) {
- class_ = (sex) ? 4020 : 4021;
- } else if (jobclass == 4042 || jobclass == 4043) {
- class_ = (sex) ? 4042 : 4043;
+ if (jobclass == JOB_BARD || jobclass == JOB_DANCER) {
+ class_ = (sex) ? JOB_BARD : JOB_DANCER;
+ } else if (jobclass == JOB_CLOWN || jobclass == JOB_GYPSY) {
+ class_ = (sex) ? JOB_CLOWN : JOB_GYPSY;
+ } else if (jobclass == JOB_BABY_BARD || jobclass == JOB_BABY_DANCER) {
+ class_ = (sex) ? JOB_BABY_BARD : JOB_BABY_DANCER;
}
// remove specifical skills of classes 19,20 4020,4021 and 4042,4043
sprintf(tmp_sql, "SELECT `lv` FROM `%s` WHERE `char_id` = '%d' AND `id` >= '315' AND `id` <= '330'",skill_db, char_id);
@@ -2207,6 +2207,79 @@ int save_accreg2(unsigned char* buf, int len) {
return 0;
}
+void char_read_fame_list()
+{
+ int i;
+ struct fame_list fame_item;
+
+ // Empty ranking lists
+ memset(smith_fame_list, 0, sizeof(smith_fame_list));
+ memset(chemist_fame_list, 0, sizeof(chemist_fame_list));
+ memset(taekwon_fame_list, 0, sizeof(taekwon_fame_list));
+ // Build Blacksmith ranking list
+ sprintf(tmp_sql, "SELECT `char_id`,`fame`, `name` FROM `%s` WHERE `fame`>0 AND (`class`='%d' OR `class`='%d' OR `class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_BLACKSMITH, JOB_WHITESMITH, JOB_BABY_BLACKSMITH, fame_list_size_smith);
+ if (mysql_query(&mysql_handle, tmp_sql)) {
+ ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
+ ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
+ }
+ sql_res = mysql_store_result(&mysql_handle);
+ if (sql_res) {
+ i = 0;
+ while((sql_row = mysql_fetch_row(sql_res))) {
+ fame_item.id = atoi(sql_row[0]);
+ fame_item.fame = atoi(sql_row[1]);
+ strncpy(fame_item.name, sql_row[2], NAME_LENGTH);
+ memcpy(&smith_fame_list[i], &fame_item, sizeof(struct fame_list));
+
+ if (++i == fame_list_size_smith)
+ break;
+ }
+ mysql_free_result(sql_res);
+ }
+ // Build Alchemist ranking list
+ sprintf(tmp_sql, "SELECT `char_id`,`fame`, `name` FROM `%s` WHERE `fame`>0 AND (`class`='%d' OR `class`='%d' OR `class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_ALCHEMIST, JOB_CREATOR, JOB_BABY_ALCHEMIST, fame_list_size_chemist);
+ if (mysql_query(&mysql_handle, tmp_sql)) {
+ ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
+ ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
+ }
+ sql_res = mysql_store_result(&mysql_handle);
+ if (sql_res) {
+ i = 0;
+ while((sql_row = mysql_fetch_row(sql_res))) {
+ fame_item.id = atoi(sql_row[0]);
+ fame_item.fame = atoi(sql_row[1]);
+ strncpy(fame_item.name, sql_row[2], NAME_LENGTH);
+
+ memcpy(&chemist_fame_list[i], fame_item, sizeof(fame_list));
+
+ if (++i == fame_list_size_chemist)
+ break;
+ }
+ mysql_free_result(sql_res);
+ }
+ // Build Taekwon ranking list
+ sprintf(tmp_sql, "SELECT `char_id`,`fame`, `name` FROM `%s` WHERE `fame`>0 AND (`class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_TAEKWON, fame_list_size_taekwon);
+ if (mysql_query(&mysql_handle, tmp_sql)) {
+ ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
+ ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
+ }
+ sql_res = mysql_store_result(&mysql_handle);
+ if (sql_res) {
+ i = 0;
+ while((sql_row = mysql_fetch_row(sql_res))) {
+ fame_item.id = atoi(sql_row[0]);
+ fame_item.fame = atoi(sql_row[1]);
+ strncpy(fame_item.name, sql_row[2], NAME_LENGTH);
+
+ memcpy(&taekwon_fame_list[i], fame_item, sizeof(fame_list));
+
+ if (++i == fame_list_size_taekwon)
+ break;
+ }
+ mysql_free_result(sql_res);
+ }
+}
+
// Send map-servers the fame ranking lists
int char_send_fame_list(int fd) {
int i, len = 8;
@@ -2235,9 +2308,10 @@ int char_send_fame_list(int fd) {
// add total packet length
WBUFW(buf, 2) = len;
- // send to all map-servers
- mapif_sendall(buf, len);
-
+ if (fd != -1)
+ mapif_send(fd, buf, len);
+ else
+ mapif_sendall(buf, len);
return 0;
}
@@ -2336,6 +2410,7 @@ int parse_frommap(int fd) {
WFIFOB(fd,2) = 0;
memcpy(WFIFOP(fd,3), wisp_server_name, NAME_LENGTH); // name for wisp to player
WFIFOSET(fd,3+NAME_LENGTH);
+ char_send_fame_list(fd); //Send fame list.
//WFIFOSET(fd,27);
{
unsigned char buf[16384];
@@ -2805,7 +2880,7 @@ int parse_frommap(int fd) {
strncpy(list[i].name, char_dat[j].name, NAME_LENGTH);
else //Not found??
strncpy(list[i].name, "Unknown", NAME_LENGTH);
- char_send_fame_list(fd);
+ char_send_fame_list(-1);
}
break;
@@ -2856,83 +2931,10 @@ int parse_frommap(int fd) {
case 0x2b1a:
if (RFIFOREST(fd) < 2)
return 0;
- {
- int i;
- struct fame_list fame_item;
-
- // Empty ranking lists
- memset(smith_fame_list, 0, sizeof(smith_fame_list));
- memset(chemist_fame_list, 0, sizeof(chemist_fame_list));
- memset(taekwon_fame_list, 0, sizeof(taekwon_fame_list));
- // Build Blacksmith ranking list
- sprintf(tmp_sql, "SELECT `char_id`,`fame`, `name` FROM `%s` WHERE `fame`>0 AND (`class`='10' OR `class`='4011' OR `class`='4033') ORDER BY `fame` DESC LIMIT 0,%d", char_db, fame_list_size_smith);
- if (mysql_query(&mysql_handle, tmp_sql)) {
- ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
- ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
- }
- sql_res = mysql_store_result(&mysql_handle);
- if (sql_res) {
- i = 0;
- while((sql_row = mysql_fetch_row(sql_res))) {
- fame_item.id = atoi(sql_row[0]);
- fame_item.fame = atoi(sql_row[1]);
- strncpy(fame_item.name, sql_row[2], NAME_LENGTH);
-
- smith_fame_list[i] = fame_item;
-
- if (++i == fame_list_size_smith)
- break;
- }
- mysql_free_result(sql_res);
- }
- // Build Alchemist ranking list
- sprintf(tmp_sql, "SELECT `char_id`,`fame`, `name` FROM `%s` WHERE `fame`>0 AND (`class`='18' OR `class`='4019' OR `class`='4041') ORDER BY `fame` DESC LIMIT 0,%d", char_db, fame_list_size_chemist);
- if (mysql_query(&mysql_handle, tmp_sql)) {
- ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
- ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
- }
- sql_res = mysql_store_result(&mysql_handle);
- if (sql_res) {
- i = 0;
- while((sql_row = mysql_fetch_row(sql_res))) {
- fame_item.id = atoi(sql_row[0]);
- fame_item.fame = atoi(sql_row[1]);
- strncpy(fame_item.name, sql_row[2], NAME_LENGTH);
-
- chemist_fame_list[i] = fame_item;
-
- if (++i == fame_list_size_chemist)
- break;
- }
- mysql_free_result(sql_res);
- }
- // Build Taekwon ranking list
- sprintf(tmp_sql, "SELECT `char_id`,`fame`, `name` FROM `%s` WHERE `fame`>0 AND (`class`='4048') ORDER BY `fame` DESC LIMIT 0,%d", char_db, fame_list_size_taekwon);
- if (mysql_query(&mysql_handle, tmp_sql)) {
- ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
- ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
- }
- sql_res = mysql_store_result(&mysql_handle);
- if (sql_res) {
- i = 0;
- while((sql_row = mysql_fetch_row(sql_res))) {
- fame_item.id = atoi(sql_row[0]);
- fame_item.fame = atoi(sql_row[1]);
- strncpy(fame_item.name, sql_row[2], NAME_LENGTH);
-
- taekwon_fame_list[i] = fame_item;
-
- if (++i == fame_list_size_taekwon)
- break;
- }
- mysql_free_result(sql_res);
- }
-
- char_send_fame_list(fd);
-
+ char_read_fame_list();
+ char_send_fame_list(-1);
RFIFOSKIP(fd,2);
break;
- }
//Request saving sc_data of a player. [Skotlex]
case 0x2b1c:
@@ -4301,7 +4303,9 @@ int do_init(int argc, char **argv){
// send USER COUNT PING to login server.
add_timer_interval(gettick() + 10, send_users_tologin, 0, 0, 5 * 1000);
add_timer_interval(gettick() + 3600*1000, send_accounts_tologin, 0, 0, 3600 * 1000); //Sync online accounts every hour.
-
+
+ char_read_fame_list(); //Read fame lists.
+
if(char_gm_read)
read_gm_account();
diff --git a/src/common/mmo.h b/src/common/mmo.h
index c7cd259ad..f842c4b0d 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -383,6 +383,89 @@ enum {
GD_DEVELOPMENT=10014,
};
+//These mark the ID of the jobs, as expected by the client. [Skotlex]
+enum {
+ JOB_NOVICE,
+ JOB_SWORDMAN,
+ JOB_MAGE,
+ JOB_ARCHER,
+ JOB_ACOLYTE,
+ JOB_MERCHANT,
+ JOB_THIEF,
+ JOB_KNIGHT,
+ JOB_PRIEST,
+ JOB_WIZARD,
+ JOB_BLACKSMITH,
+ JOB_HUNTER,
+ JOB_ASSASSIN,
+ JOB_KNIGHT2,
+ JOB_CRUSADER,
+ JOB_MONK,
+ JOB_SAGE,
+ JOB_ROGUE,
+ JOB_ALCHEMIST,
+ JOB_BARD,
+ JOB_DANCER,
+ JOB_CRUSADER2,
+ JOB_WEDDING,
+ JOB_SUPER_NOVICE,
+ JOB_GUNSLINGER,
+ JOB_NINJA,
+ JOB_XMAS,
+
+ JOB_NOVICE_HIGH = 4001,
+ JOB_SWORDMAN_HIGH,
+ JOB_MAGE_HIGH,
+ JOB_ARCHER_HIGH,
+ JOB_ACOLYTE_HIGH,
+ JOB_MERCHANT_HIGH,
+ JOB_THIEF_HIGH,
+ JOB_LORD_KNIGHT,
+ JOB_HIGH_PRIEST,
+ JOB_HIGH_WIZARD,
+ JOB_WHITESMITH,
+ JOB_SNIPER,
+ JOB_ASSASSIN_CROSS,
+ JOB_LORD_KNIGHT2,
+ JOB_PALADIN,
+ JOB_CHAMPION,
+ JOB_PROFESSOR,
+ JOB_STALKER,
+ JOB_CREATOR,
+ JOB_CLOWN,
+ JOB_GYPSY,
+ JOB_PALADIN2,
+
+ JOB_BABY,
+ JOB_BABY_SWORDMAN,
+ JOB_BABY_MAGE,
+ JOB_BABY_ARCHER,
+ JOB_BABY_ACOLYTE,
+ JOB_BABY_MERCHANT,
+ JOB_BABY_THIEF,
+ JOB_BABY_KNIGHT,
+ JOB_BABY_PRIEST,
+ JOB_BABY_WIZARD,
+ JOB_BABY_BLACKSMITH,
+ JOB_BABY_HUNTER,
+ JOB_BABY_ASSASSIN,
+ JOB_BABY_KNIGHT2,
+ JOB_BABY_CRUSADER,
+ JOB_BABY_MONK,
+ JOB_BABY_SAGE,
+ JOB_BABY_ROGUE,
+ JOB_BABY_ALCHEMIST,
+ JOB_BABY_BARD,
+ JOB_BABY_DANCER,
+ JOB_BABY_CRUSADER2,
+ JOB_SUPER_BABY,
+
+ JOB_TAEKWON,
+ JOB_STAR_GLADIATOR,
+ JOB_STAR_GLADIATOR2,
+ JOB_SOUL_LINKER,
+};
+
#ifndef __WIN32
#ifndef strcmpi
#define strcmpi strcasecmp
diff --git a/src/map/chrif.c b/src/map/chrif.c
index d3e04a7a1..17e47b4f5 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -1457,7 +1457,7 @@ int chrif_parse(int fd)
switch(cmd) {
case 0x2af9: chrif_connectack(fd); break;
- case 0x2afb: chrif_sendmapack(fd); chrif_buildfamelist(); break;
+ case 0x2afb: chrif_sendmapack(fd); break;
case 0x2afd: chrif_authok(fd); break;
case 0x2b00: map_setusers(fd); break;
case 0x2b03: clif_charselectok(RFIFOL(fd,2)); break;
diff --git a/src/map/map.h b/src/map/map.h
index 883fbbe25..94f6c894e 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -55,89 +55,6 @@
#define map_id2index(id) map[(id)].index
-//These mark the ID of the jobs, as expected by the client. [Skotlex]
-enum {
- JOB_NOVICE,
- JOB_SWORDMAN,
- JOB_MAGE,
- JOB_ARCHER,
- JOB_ACOLYTE,
- JOB_MERCHANT,
- JOB_THIEF,
- JOB_KNIGHT,
- JOB_PRIEST,
- JOB_WIZARD,
- JOB_BLACKSMITH,
- JOB_HUNTER,
- JOB_ASSASSIN,
- JOB_KNIGHT2,
- JOB_CRUSADER,
- JOB_MONK,
- JOB_SAGE,
- JOB_ROGUE,
- JOB_ALCHEMIST,
- JOB_BARD,
- JOB_DANCER,
- JOB_CRUSADER2,
- JOB_WEDDING,
- JOB_SUPER_NOVICE,
- JOB_GUNSLINGER,
- JOB_NINJA,
- JOB_XMAS,
-
- JOB_NOVICE_HIGH = 4001,
- JOB_SWORDMAN_HIGH,
- JOB_MAGE_HIGH,
- JOB_ARCHER_HIGH,
- JOB_ACOLYTE_HIGH,
- JOB_MERCHANT_HIGH,
- JOB_THIEF_HIGH,
- JOB_LORD_KNIGHT,
- JOB_HIGH_PRIEST,
- JOB_HIGH_WIZARD,
- JOB_WHITESMITH,
- JOB_SNIPER,
- JOB_ASSASSIN_CROSS,
- JOB_LORD_KNIGHT2,
- JOB_PALADIN,
- JOB_CHAMPION,
- JOB_PROFESSOR,
- JOB_STALKER,
- JOB_CREATOR,
- JOB_CLOWN,
- JOB_GYPSY,
- JOB_PALADIN2,
-
- JOB_BABY,
- JOB_BABY_SWORDMAN,
- JOB_BABY_MAGE,
- JOB_BABY_ARCHER,
- JOB_BABY_ACOLYTE,
- JOB_BABY_MERCHANT,
- JOB_BABY_THIEF,
- JOB_BABY_KNIGHT,
- JOB_BABY_PRIEST,
- JOB_BABY_WIZARD,
- JOB_BABY_BLACKSMITH,
- JOB_BABY_HUNTER,
- JOB_BABY_ASSASSIN,
- JOB_BABY_KNIGHT2,
- JOB_BABY_CRUSADER,
- JOB_BABY_MONK,
- JOB_BABY_SAGE,
- JOB_BABY_ROGUE,
- JOB_BABY_ALCHEMIST,
- JOB_BABY_BARD,
- JOB_BABY_DANCER,
- JOB_BABY_CRUSADER2,
- JOB_SUPER_BABY,
-
- JOB_TAEKWON,
- JOB_STAR_GLADIATOR,
- JOB_STAR_GLADIATOR2,
- JOB_SOUL_LINKER,
-};
-
//The following system marks a different job ID system used by the map server,
//which makes a lot more sense than the normal one. [Skotlex]
//
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-12 17:41:03 +0000