summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--conf-tmpl/atcommand_athena.conf6
-rw-r--r--npc/other/bulletin_boards.txt2
-rw-r--r--src/char/char.c28
-rw-r--r--src/char_sql/char.c24
-rw-r--r--src/login/login.c6
-rw-r--r--src/login_sql/login.c6
-rw-r--r--src/map/atcommand.c22
-rw-r--r--src/map/chrif.c12
9 files changed, 51 insertions, 57 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 355925b32..6a8447147 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,7 +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/06/01
- * Fixed ircbot discarding all user levels when someone joins the channel
+ * Fixed ircbot not processing new users
2007/05/29
* Hopefully fixed the vsnprintf incompatibility
2007/05/28
diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index b0d3b0ec4..f0de7bedb 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -372,9 +372,6 @@ return: 40
// Broadcast to the map you are on (1 command + /lb, /nlb).
localbroadcast: 40
-// Enables lost skills.
-lostskill: 40
-
// To send specified character in jails
jail: 40
@@ -412,8 +409,9 @@ petfriendly: 40
// Sets hunger level of your pet.
pethungry: 40
-// Enables any skill.
+// Permanently adds/removes a quest skill
questskill: 40
+lostskill: 40
// Does a skill/stat reset.
reset: 40
diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt
index 38d49078e..553571291 100644
--- a/npc/other/bulletin_boards.txt
+++ b/npc/other/bulletin_boards.txt
@@ -523,7 +523,7 @@ xmas,147,311,5 script Bulletin Board#23 837,{
mes "[Toy Factory]";
mes "In 1st level, you will encounter a boss monster, ^6B1312Angeling^000000.";
mes "In 2nd level, you will encounter 2 dangrous boss monsters which are";
- mes "^6B1312Stormy Knight^000000 and ^6B1312Hatii^000000. It is adviced to be attentive while venturing.";
+ mes "^6B1312Stormy Knight^000000 and ^6B1312Hatii^000000. It is advised to be attentive while venturing.";
mes "For your reference, ^6B1312Myst Cases^000000, ^6B1312Cruisers^000000 and ^6B1312Cookies^000000 only appear in this dungeon.";
close;
}
diff --git a/src/char/char.c b/src/char/char.c
index fab36332b..8ef7eaddd 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3024,8 +3024,8 @@ int parse_frommap(int fd)
i = search_character_index(character_name);
if (i >= 0) {
memcpy(WFIFOP(fd,6), search_character_name(i), NAME_LENGTH); // put correct name if found
- WFIFOW(fd,6+NAME_LENGTH) = 0; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
- //WFIFOW(fd,32) = 0; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,6+NAME_LENGTH) = 0; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
+ //WFIFOW(fd,32) = 0; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
switch(RFIFOW(fd, 30)) {
case 1: // block
if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) {
@@ -3036,9 +3036,9 @@ int parse_frommap(int fd)
WFIFOL(login_fd,6) = 5; // status of the account
WFIFOSET(login_fd,10);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
case 2: // ban
if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) {
@@ -3054,9 +3054,9 @@ int parse_frommap(int fd)
WFIFOW(login_fd,16) = RFIFOW(fd,42); // second
WFIFOSET(login_fd,18);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
case 3: // unblock
if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) {
@@ -3067,9 +3067,9 @@ int parse_frommap(int fd)
WFIFOL(login_fd,6) = 0; // status of the account
WFIFOSET(login_fd,10);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
case 4: // unban
if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) {
@@ -3079,9 +3079,9 @@ int parse_frommap(int fd)
WFIFOL(login_fd, 2) = char_dat[i].status.account_id; // account value
WFIFOSET(login_fd,6);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
case 5: // changesex
if (acc == -1 || isGM(acc) >= isGM(char_dat[i].status.account_id)) {
@@ -3091,16 +3091,16 @@ int parse_frommap(int fd)
WFIFOL(login_fd, 2) = char_dat[i].status.account_id; // account value
WFIFOSET(login_fd,6);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
}
} else {
// character name not found
memcpy(WFIFOP(fd,6), character_name, NAME_LENGTH);
- WFIFOW(fd,8+NAME_LENGTH) = 1; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
- //WFIFOW(fd,32) = 1; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,8+NAME_LENGTH) = 1; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
+ //WFIFOW(fd,32) = 1; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
}
// send answer if a player ask, not if the server ask
if (acc != -1) {
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 5031a6c26..9929be3a7 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -2724,7 +2724,7 @@ int parse_frommap(int fd)
if (mysql_num_rows(sql_res)) {
sql_row = mysql_fetch_row(sql_res);
memcpy(WFIFOP(fd,6), sql_row[1], NAME_LENGTH); // put correct name if found
- WFIFOW(fd,32) = 0; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 0; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
switch(RFIFOW(fd, 30)) {
case 1: // block
if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
@@ -2735,9 +2735,9 @@ int parse_frommap(int fd)
WFIFOL(login_fd,6) = 5; // status of the account
WFIFOSET(login_fd,10);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
case 2: // ban
if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
@@ -2753,9 +2753,9 @@ int parse_frommap(int fd)
WFIFOW(login_fd,16) = RFIFOW(fd,42); // second
WFIFOSET(login_fd,18);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
case 3: // unblock
if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
@@ -2766,9 +2766,9 @@ int parse_frommap(int fd)
WFIFOL(login_fd,6) = 0; // status of the account
WFIFOSET(login_fd,10);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
case 4: // unban
if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
@@ -2778,9 +2778,9 @@ int parse_frommap(int fd)
WFIFOL(login_fd,2) = atoi(sql_row[0]); // account value
WFIFOSET(login_fd,6);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
case 5: // changesex
if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
@@ -2790,15 +2790,15 @@ int parse_frommap(int fd)
WFIFOL(login_fd,2) = atoi(sql_row[0]); // account value
WFIFOSET(login_fd,6);
} else
- WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 3; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
} else
- WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 2; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
break;
}
} else {
// character name not found
memcpy(WFIFOP(fd,6), character_name, NAME_LENGTH);
- WFIFOW(fd,32) = 1; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+ WFIFOW(fd,32) = 1; // answer: 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
}
// send answer if a player ask, not if the server ask
if (acc != -1) {
diff --git a/src/login/login.c b/src/login/login.c
index 6b432a87f..8b449acf9 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -1625,7 +1625,7 @@ int parse_fromchar(int fd)
}
break;
- case 0x2724: // Receiving of map-server via char-server a status change resquest
+ case 0x2724: // Receiving of map-server via char-server a status change request
if (RFIFOREST(fd) < 10)
return 0;
{
@@ -1664,7 +1664,7 @@ int parse_fromchar(int fd)
return 0;
}
- case 0x2725: // Receiving of map-server via char-server a ban resquest
+ case 0x2725: // Receiving of map-server via char-server a ban request
if (RFIFOREST(fd) < 18)
return 0;
{
@@ -1816,7 +1816,7 @@ int parse_fromchar(int fd)
RFIFOSKIP(fd,RFIFOW(fd,2));
break;
- case 0x272a: // Receiving of map-server via char-server a unban resquest
+ case 0x272a: // Receiving of map-server via char-server an unban request
if (RFIFOREST(fd) < 6)
return 0;
{
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index aabb3611d..b231d9e16 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -949,7 +949,7 @@ int parse_fromchar(int fd)
}
break;
- case 0x2724: // Receiving of map-server via char-server a status change resquest
+ case 0x2724: // Receiving an account state update request from a map-server (relayed via char-server)
if (RFIFOREST(fd) < 10)
return 0;
{
@@ -984,7 +984,7 @@ int parse_fromchar(int fd)
}
break;
- case 0x2725: // Receiving of map-server via char-server a ban resquest
+ case 0x2725: // Receiving of map-server via char-server a ban request
if (RFIFOREST(fd) < 18)
return 0;
{
@@ -1127,7 +1127,7 @@ int parse_fromchar(int fd)
RFIFOSKIP(fd,RFIFOW(fd,2));
break;
- case 0x272a: // Receiving of map-server via char-server a unban resquest
+ case 0x272a: // Receiving of map-server via char-server an unban request
if (RFIFOREST(fd) < 6)
return 0;
{
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 36b3964aa..5ec823a61 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -6693,21 +6693,18 @@ int atcommand_skilltree(const int fd, struct map_session_data* sd, const char* c
}
// Hand a ring with partners name on it to this char
-void getring (struct map_session_data *sd)
+void getring (struct map_session_data* sd)
{
- int flag,item_id = 0;
+ int flag, item_id;
struct item item_tmp;
- if(sd->status.sex==0)
- item_id = 2635;
- else
- item_id = 2634;
+ item_id = (sd->status.sex) ? WEDDING_RING_M : WEDDING_RING_F;
- memset(&item_tmp,0,sizeof(item_tmp));
- item_tmp.nameid=item_id;
- item_tmp.identify=1;
- item_tmp.card[0]=255;
- item_tmp.card[2]=sd->status.partner_id;
- item_tmp.card[3]=sd->status.partner_id >> 16;
+ memset(&item_tmp, 0, sizeof(item_tmp));
+ item_tmp.nameid = item_id;
+ item_tmp.identify = 1;
+ item_tmp.card[0] = 255;
+ item_tmp.card[2] = sd->status.partner_id;
+ item_tmp.card[3] = sd->status.partner_id >> 16;
//Logs (A)dmins items [Lupus]
if(log_config.enable_logs&0x400)
@@ -6717,7 +6714,6 @@ void getring (struct map_session_data *sd)
clif_additem(sd,0,0,flag);
map_addflooritem(&item_tmp,1,sd->bl.m,sd->bl.x,sd->bl.y,NULL,NULL,NULL,0);
}
-
}
/*==========================================
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 770e232b5..d6f3dea04 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -655,7 +655,7 @@ int chrif_changesex(int id, int sex)
* 4: unban
* 5: changesex
* type of answer:
- * 0: login-server resquest done
+ * 0: login-server request done
* 1: player not found
* 2: gm level too low
* 3: login-server offline
@@ -679,7 +679,7 @@ int chrif_char_ask_name_answer(int fd)
switch(RFIFOW(fd, 30)) {
case 1: // block
switch(RFIFOW(fd, 32)) {
- case 0: // login-server resquest done
+ case 0: // login-server request done
sprintf(output, "Login-server has been asked to block the player '%s'.", player_name);
break;
//case 1: // player not found
@@ -693,7 +693,7 @@ int chrif_char_ask_name_answer(int fd)
break;
case 2: // ban
switch(RFIFOW(fd, 32)) {
- case 0: // login-server resquest done
+ case 0: // login-server request done
sprintf(output, "Login-server has been asked to ban the player '%s'.", player_name);
break;
//case 1: // player not found
@@ -707,7 +707,7 @@ int chrif_char_ask_name_answer(int fd)
break;
case 3: // unblock
switch(RFIFOW(fd, 32)) {
- case 0: // login-server resquest done
+ case 0: // login-server request done
sprintf(output, "Login-server has been asked to unblock the player '%s'.", player_name);
break;
//case 1: // player not found
@@ -721,7 +721,7 @@ int chrif_char_ask_name_answer(int fd)
break;
case 4: // unban
switch(RFIFOW(fd, 32)) {
- case 0: // login-server resquest done
+ case 0: // login-server request done
sprintf(output, "Login-server has been asked to unban the player '%s'.", player_name);
break;
//case 1: // player not found
@@ -735,7 +735,7 @@ int chrif_char_ask_name_answer(int fd)
break;
case 5: // changesex
switch(RFIFOW(fd, 32)) {
- case 0: // login-server resquest done
+ case 0: // login-server request done
sprintf(output, "Login-server has been asked to change the sex of the player '%s'.", player_name);
break;
//case 1: // player not found
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-06 15:04:36 +0000