git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@286 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
mc_cameri
parent
10c6562d8f
commit
d21b4b214b
@ -1,4 +1,9 @@
|
||||
Date Added
|
||||
11/21
|
||||
* Added charcommand.c/.h for the following reasons: [MC Cameri]
|
||||
- Less congestion in atcommand.c
|
||||
- Port commands that start with @char to #, example:
|
||||
~ @charoption will now be #option
|
||||
11/20
|
||||
* Added str_lower() function to atcommand.c (from OA). [MC Cameri]
|
||||
* Simplified @charchangesex to @charchangesex [player], your sex is changed to the opposite one [MC Cameri]
|
||||
|
||||
@ -13,10 +13,10 @@ sqlobj:
|
||||
COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grfio.o ../common/db.o ../common/lock.o ../common/nullpo.o ../common/malloc.o ../common/showmsg.o
|
||||
LIBS = -lz -lm
|
||||
|
||||
map-server: txtobj/map.o txtobj/chrif.o txtobj/clif.o txtobj/pc.o txtobj/npc.o txtobj/chat.o txtobj/path.o txtobj/itemdb.o txtobj/mob.o txtobj/script.o txtobj/storage.o txtobj/skill.o txtobj/atcommand.o txtobj/battle.o txtobj/intif.o txtobj/trade.o txtobj/party.o txtobj/vending.o txtobj/guild.o txtobj/pet.o txtobj/log.o $(COMMON_OBJ)
|
||||
map-server: txtobj/map.o txtobj/chrif.o txtobj/clif.o txtobj/pc.o txtobj/npc.o txtobj/chat.o txtobj/path.o txtobj/itemdb.o txtobj/mob.o txtobj/script.o txtobj/storage.o txtobj/skill.o txtobj/atcommand.o txtobj/charcommand.o txtobj/battle.o txtobj/intif.o txtobj/trade.o txtobj/party.o txtobj/vending.o txtobj/guild.o txtobj/pet.o $(COMMON_OBJ)
|
||||
$(CC) -o ../../$@ $^ $(LIBS)
|
||||
|
||||
map-server_sql: sqlobj/map.o sqlobj/chrif.o sqlobj/clif.o sqlobj/pc.o sqlobj/npc.o sqlobj/chat.o sqlobj/path.o sqlobj/itemdb.o sqlobj/mob.o sqlobj/script.o sqlobj/storage.o sqlobj/skill.o sqlobj/atcommand.o sqlobj/battle.o sqlobj/intif.o sqlobj/trade.o sqlobj/party.o sqlobj/vending.o sqlobj/guild.o sqlobj/pet.o sqlobj/mail.o sqlobj/log.o $(COMMON_OBJ)
|
||||
map-server_sql: sqlobj/map.o sqlobj/chrif.o sqlobj/clif.o sqlobj/pc.o sqlobj/npc.o sqlobj/chat.o sqlobj/path.o sqlobj/itemdb.o sqlobj/mob.o sqlobj/script.o sqlobj/storage.o sqlobj/skill.o sqlobj/atcommand.o sqlobj/charcommand.o sqlobj/battle.o sqlobj/intif.o sqlobj/trade.o sqlobj/party.o sqlobj/vending.o sqlobj/guild.o sqlobj/pet.o sqlobj/mail.o sqlobj/log.o $(COMMON_OBJ)
|
||||
$(CC) -o ../../$@ $^ $(LIB_S)
|
||||
|
||||
txtobj/%.o: %.c
|
||||
@ -27,7 +27,7 @@ sqlobj/%.o: %.c
|
||||
|
||||
txtobj/map.o: map.c map.h chrif.h clif.h npc.h pc.h mob.h chat.h skill.h itemdb.h storage.h party.h pet.h atcommand.h ../common/core.h ../common/timer.h ../common/db.h ../common/grfio.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/chrif.o: chrif.c map.h battle.h chrif.h clif.h intif.h pc.h npc.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/clif.o: clif.c map.h chrif.h clif.h mob.h intif.h pc.h npc.h itemdb.h chat.h script.h storage.h party.h guild.h atcommand.h pet.h atcommand.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/showmsg.h
|
||||
txtobj/clif.o: clif.c map.h chrif.h clif.h mob.h intif.h pc.h npc.h itemdb.h chat.h script.h storage.h party.h guild.h atcommand.h pet.h charcommand.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/showmsg.h
|
||||
txtobj/pc.o: pc.c map.h clif.h intif.h pc.h npc.h mob.h itemdb.h battle.h skill.h script.h party.h guild.h pet.h trade.h storage.h chat.h vending.h ../common/timer.h ../common/mmo.h ../common/db.h ../common/showmsg.h
|
||||
txtobj/npc.o: npc.c map.h npc.h clif.h pc.h script.h mob.h itemdb.h battle.h ../common/db.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/chat.o: chat.c map.h clif.h pc.h chat.h ../common/db.h ../common/mmo.h ../common/showmsg.h
|
||||
@ -45,10 +45,11 @@ txtobj/party.o: party.c party.h clif.h intif.h pc.h map.h battle.h ../common/db.
|
||||
txtobj/vending.o: vending.c vending.h clif.h itemdb.h map.h pc.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/guild.o: guild.c guild.h storage.h battle.h clif.h intif.h pc.h npc.h map.h ../common/db.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/pet.o: pet.c pet.h map.h clif.h chrif.h intif.h pc.h itemdb.h battle.h mob.h npc.h script.h ../common/db.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/charcommand.o: charcommand.c charcommand.h itemdb.h pc.h map.h skill.h clif.h mob.h intif.h battle.h storage.h guild.h pet.h log.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
|
||||
sqlobj/map.o: map.c map.h chrif.h clif.h npc.h pc.h mob.h chat.h skill.h itemdb.h storage.h party.h pet.h atcommand.h log.h ../common/core.h ../common/timer.h ../common/db.h ../common/grfio.h ../common/mmo.h ../common/showmsg.h
|
||||
sqlobj/chrif.o: chrif.c map.h battle.h chrif.h clif.h intif.h pc.h npc.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
sqlobj/clif.o: clif.c map.h chrif.h clif.h mob.h intif.h pc.h npc.h itemdb.h chat.h script.h storage.h party.h guild.h atcommand.h pet.h atcommand.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/showmsg.h
|
||||
sqlobj/clif.o: clif.c map.h chrif.h clif.h mob.h intif.h pc.h npc.h itemdb.h chat.h script.h storage.h party.h guild.h atcommand.h pet.h charcommand.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/showmsg.h
|
||||
sqlobj/pc.o: pc.c map.h clif.h intif.h pc.h npc.h mob.h itemdb.h battle.h skill.h script.h party.h guild.h pet.h trade.h storage.h chat.h vending.h log.h ../common/timer.h ../common/mmo.h ../common/db.h ../common/showmsg.h
|
||||
sqlobj/npc.o: npc.c map.h npc.h clif.h pc.h script.h mob.h itemdb.h battle.h ../common/db.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
sqlobj/chat.o: chat.c map.h clif.h pc.h chat.h ../common/db.h ../common/mmo.h ../common/showmsg.h
|
||||
@ -68,6 +69,7 @@ sqlobj/guild.o: guild.c guild.h storage.h battle.h clif.h intif.h pc.h npc.h map
|
||||
sqlobj/pet.o: pet.c pet.h map.h clif.h chrif.h intif.h pc.h itemdb.h battle.h mob.h npc.h script.h ../common/db.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
sqlobj/mail.o: mail.c mail.h ../common/showmsg.h
|
||||
sqlobj/log.o: log.c log.h map.h ../common/nullpo.h
|
||||
sqlobj/charcommand.o: charcommand.c charcommand.h itemdb.h pc.h map.h skill.h clif.h mob.h intif.h battle.h storage.h guild.h pet.h log.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
|
||||
clean:
|
||||
rm -rf *.o ../../map-server ../../map-server_sql sqlobj txtobj
|
||||
|
||||
@ -13,10 +13,10 @@ sqlobj:
|
||||
COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grfio.o ../common/db.o ../common/lock.o ../common/nullpo.o ../common/malloc.o ../common/showmsg.o
|
||||
LIBS = -lz -lm
|
||||
|
||||
map-server: txtobj/map.o txtobj/chrif.o txtobj/clif.o txtobj/pc.o txtobj/npc.o txtobj/chat.o txtobj/path.o txtobj/itemdb.o txtobj/mob.o txtobj/script.o txtobj/storage.o txtobj/skill.o txtobj/atcommand.o txtobj/battle.o txtobj/intif.o txtobj/trade.o txtobj/party.o txtobj/vending.o txtobj/guild.o txtobj/pet.o $(COMMON_OBJ)
|
||||
map-server: txtobj/map.o txtobj/chrif.o txtobj/clif.o txtobj/pc.o txtobj/npc.o txtobj/chat.o txtobj/path.o txtobj/itemdb.o txtobj/mob.o txtobj/script.o txtobj/storage.o txtobj/skill.o txtobj/atcommand.o txtobj/charcommand.o txtobj/battle.o txtobj/intif.o txtobj/trade.o txtobj/party.o txtobj/vending.o txtobj/guild.o txtobj/pet.o $(COMMON_OBJ)
|
||||
$(CC) -o ../../$@ $> $(LIBS)
|
||||
|
||||
map-server_sql: sqlobj/map.o sqlobj/chrif.o sqlobj/clif.o sqlobj/pc.o sqlobj/npc.o sqlobj/chat.o sqlobj/path.o sqlobj/itemdb.o sqlobj/mob.o sqlobj/script.o sqlobj/storage.o sqlobj/skill.o sqlobj/atcommand.o sqlobj/battle.o sqlobj/intif.o sqlobj/trade.o sqlobj/party.o sqlobj/vending.o sqlobj/guild.o sqlobj/pet.o sqlobj/mail.o sqlobj/log.o $(COMMON_OBJ)
|
||||
map-server_sql: sqlobj/map.o sqlobj/chrif.o sqlobj/clif.o sqlobj/pc.o sqlobj/npc.o sqlobj/chat.o sqlobj/path.o sqlobj/itemdb.o sqlobj/mob.o sqlobj/script.o sqlobj/storage.o sqlobj/skill.o sqlobj/atcommand.o sqlobj/charcommand.o sqlobj/battle.o sqlobj/intif.o sqlobj/trade.o sqlobj/party.o sqlobj/vending.o sqlobj/guild.o sqlobj/pet.o sqlobj/mail.o sqlobj/log.o $(COMMON_OBJ)
|
||||
$(CC) -o ../../$@ $> $(LIB_S)
|
||||
|
||||
txtobj/%.o: %.c
|
||||
@ -27,7 +27,7 @@ sqlobj/%.o: %.c
|
||||
|
||||
txtobj/map.o: map.c map.h chrif.h clif.h npc.h pc.h mob.h chat.h skill.h itemdb.h storage.h party.h pet.h atcommand.h ../common/core.h ../common/timer.h ../common/db.h ../common/grfio.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/chrif.o: chrif.c map.h battle.h chrif.h clif.h intif.h pc.h npc.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/clif.o: clif.c map.h chrif.h clif.h mob.h intif.h pc.h npc.h itemdb.h chat.h script.h storage.h party.h guild.h atcommand.h pet.h atcommand.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/showmsg.h
|
||||
txtobj/clif.o: clif.c map.h chrif.h clif.h mob.h intif.h pc.h npc.h itemdb.h chat.h script.h storage.h party.h guild.h atcommand.h pet.h charcommand.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/showmsg.h
|
||||
txtobj/pc.o: pc.c map.h clif.h intif.h pc.h npc.h mob.h itemdb.h battle.h skill.h script.h party.h guild.h pet.h trade.h storage.h chat.h vending.h ../common/timer.h ../common/mmo.h ../common/db.h ../common/showmsg.h
|
||||
txtobj/npc.o: npc.c map.h npc.h clif.h pc.h script.h mob.h itemdb.h battle.h ../common/db.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/chat.o: chat.c map.h clif.h pc.h chat.h ../common/db.h ../common/mmo.h ../common/showmsg.h
|
||||
@ -45,10 +45,11 @@ txtobj/party.o: party.c party.h clif.h intif.h pc.h map.h battle.h ../common/db.
|
||||
txtobj/vending.o: vending.c vending.h clif.h itemdb.h map.h pc.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/guild.o: guild.c guild.h storage.h battle.h clif.h intif.h pc.h npc.h map.h ../common/db.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/pet.o: pet.c pet.h map.h clif.h chrif.h intif.h pc.h itemdb.h battle.h mob.h npc.h script.h ../common/db.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
txtobj/charcommand.o: charcommand.c charcommand.h itemdb.h pc.h map.h skill.h clif.h mob.h intif.h battle.h storage.h guild.h pet.h log.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
|
||||
sqlobj/map.o: map.c map.h chrif.h clif.h npc.h pc.h mob.h chat.h skill.h itemdb.h storage.h party.h pet.h atcommand.h log.h ../common/core.h ../common/timer.h ../common/db.h ../common/grfio.h ../common/mmo.h ../common/showmsg.h
|
||||
sqlobj/chrif.o: chrif.c map.h battle.h chrif.h clif.h intif.h pc.h npc.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
sqlobj/clif.o: clif.c map.h chrif.h clif.h mob.h intif.h pc.h npc.h itemdb.h chat.h script.h storage.h party.h guild.h atcommand.h pet.h atcommand.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/showmsg.h
|
||||
sqlobj/clif.o: clif.c map.h chrif.h clif.h mob.h intif.h pc.h npc.h itemdb.h chat.h script.h storage.h party.h guild.h atcommand.h pet.h charcommand.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/showmsg.h
|
||||
sqlobj/pc.o: pc.c map.h clif.h intif.h pc.h npc.h mob.h itemdb.h battle.h skill.h script.h party.h guild.h pet.h trade.h storage.h chat.h vending.h log.h ../common/timer.h ../common/mmo.h ../common/db.h ../common/showmsg.h
|
||||
sqlobj/npc.o: npc.c map.h npc.h clif.h pc.h script.h mob.h itemdb.h battle.h ../common/db.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
sqlobj/chat.o: chat.c map.h clif.h pc.h chat.h ../common/db.h ../common/mmo.h ../common/showmsg.h
|
||||
@ -68,6 +69,7 @@ sqlobj/guild.o: guild.c guild.h storage.h battle.h clif.h intif.h pc.h npc.h map
|
||||
sqlobj/pet.o: pet.c pet.h map.h clif.h chrif.h intif.h pc.h itemdb.h battle.h mob.h npc.h script.h ../common/db.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
sqlobj/mail.o: mail.c mail.h ../common/showmsg.h
|
||||
sqlobj/log.o: log.c log.h map.h ../common/nullpo.h
|
||||
sqlobj/charcommand.o: charcommand.c charcommand.h itemdb.h pc.h map.h skill.h clif.h mob.h intif.h battle.h storage.h guild.h pet.h log.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/showmsg.h
|
||||
|
||||
clean:
|
||||
rm -rf *.o ../../map-server ../../map-server_sql sqlobj txtobj
|
||||
|
||||
@ -898,7 +898,8 @@ int atcommand_config_read(const char *cfgName) {
|
||||
atcommand_config_read(w2);
|
||||
else if (strcmpi(w1, "command_symbol") == 0 && w2[0] > 31 &&
|
||||
w2[0] != '/' && // symbol of standard ragnarok GM commands
|
||||
w2[0] != '%') // symbol of party chat speaking
|
||||
w2[0] != '%' && // symbol of party chat speaking
|
||||
w2[0] != '#') // symbol of charcommand
|
||||
command_symbol = w2[0];
|
||||
}
|
||||
fclose(fp);
|
||||
|
||||
@ -249,5 +249,7 @@ int atcommand_recall(const int fd, struct map_session_data* sd, const char* comm
|
||||
int atcommand_config_read(const char *cfgName);
|
||||
int msg_config_read(const char *cfgName);
|
||||
|
||||
char *str_lower(char *str);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
#include "script.h"
|
||||
#include "skill.h"
|
||||
#include "atcommand.h"
|
||||
#include "charcommand.h"
|
||||
#include "intif.h"
|
||||
#include "battle.h"
|
||||
#include "mob.h"
|
||||
@ -7608,7 +7609,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c <
|
||||
char *buf;
|
||||
|
||||
nullpo_retv(sd);
|
||||
|
||||
if (is_charcommand(fd, sd, RFIFOP(fd,4),0)!= CharCommand_None) return;
|
||||
if ((is_atcommand(fd, sd, RFIFOP(fd,4), 0) != AtCommand_None) ||
|
||||
(sd->sc_data &&
|
||||
(sd->sc_data[SC_BERSERK].timer != -1 || //バーサーク時は会話も不可
|
||||
@ -7935,7 +7936,8 @@ void clif_parse_Wis(int fd, struct map_session_data *sd) { // S 0096 <len>.w <ni
|
||||
gm_command = (char*)aCalloc(strlen(RFIFOP(fd,28)) + 28, sizeof(char)); // 24+3+(RFIFOW(fd,2)-28)+1 or 24+3+(strlen(RFIFOP(fd,28))+1 (size can be wrong with hacker)
|
||||
|
||||
sprintf(gm_command, "%s : %s", sd->status.name, RFIFOP(fd,28));
|
||||
if ((is_atcommand(fd, sd, gm_command, 0) != AtCommand_None) ||
|
||||
if ((is_charcommand(fd, sd, gm_command, 0) != CharCommand_None) ||
|
||||
(is_atcommand(fd, sd, gm_command, 0) != AtCommand_None) ||
|
||||
(sd && sd->sc_data &&
|
||||
(sd->sc_data[SC_BERSERK].timer!=-1 || //バーサーク時は会話も不可
|
||||
sd->sc_data[SC_NOCHAT].timer != -1))) //チャット禁止
|
||||
@ -9160,7 +9162,8 @@ void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd) {
|
||||
*/
|
||||
void clif_parse_PartyMessage(int fd, struct map_session_data *sd) {
|
||||
nullpo_retv(sd);
|
||||
|
||||
if (is_charcommand(fd, sd, RFIFOP(fd,4), 0) != CharCommand_None)
|
||||
return;
|
||||
if (is_atcommand(fd, sd, RFIFOP(fd,4), 0) != AtCommand_None)
|
||||
return;
|
||||
if(sd->sc_data &&
|
||||
@ -9370,7 +9373,8 @@ void clif_parse_GuildExplusion(int fd,struct map_session_data *sd) {
|
||||
*/
|
||||
void clif_parse_GuildMessage(int fd,struct map_session_data *sd) {
|
||||
nullpo_retv(sd);
|
||||
|
||||
if (is_charcommand(fd, sd, RFIFOP(fd, 4), 0) != CharCommand_None)
|
||||
return;
|
||||
if (is_atcommand(fd, sd, RFIFOP(fd, 4), 0) != AtCommand_None)
|
||||
return;
|
||||
if(sd->sc_data &&
|
||||
|
||||
@ -33,6 +33,7 @@
|
||||
#include "guild.h"
|
||||
#include "pet.h"
|
||||
#include "atcommand.h"
|
||||
#include "charcommand.h"
|
||||
#include "nullpo.h"
|
||||
#include "socket.h"
|
||||
#include "log.h"
|
||||
@ -2214,6 +2215,7 @@ int do_init(int argc, char *argv[]) {
|
||||
unsigned char *MAP_CONF_NAME = "conf/map_athena.conf";
|
||||
unsigned char *BATTLE_CONF_FILENAME = "conf/battle_athena.conf";
|
||||
unsigned char *ATCOMMAND_CONF_FILENAME = "conf/atcommand_athena.conf";
|
||||
unsigned char *CHARCOMMAND_CONF_FILENAME = "conf/charcommand_athena.conf";
|
||||
unsigned char *SCRIPT_CONF_NAME = "conf/script_athena.conf";
|
||||
unsigned char *MSG_CONF_NAME = "conf/msg_athena.conf";
|
||||
unsigned char *GRF_PATH_FILENAME = "conf/grf-files.txt";
|
||||
@ -2230,6 +2232,8 @@ int do_init(int argc, char *argv[]) {
|
||||
BATTLE_CONF_FILENAME = argv[i+1];
|
||||
else if (strcmp(argv[i],"--atcommand_config") == 0)
|
||||
ATCOMMAND_CONF_FILENAME = argv[i+1];
|
||||
else if (strcmp(argv[i],"--charcommand_config") == 0)
|
||||
CHARCOMMAND_CONF_FILENAME = argv[i+1];
|
||||
else if (strcmp(argv[i],"--script_config") == 0)
|
||||
SCRIPT_CONF_NAME = argv[i+1];
|
||||
else if (strcmp(argv[i],"--msg_config") == 0)
|
||||
@ -2272,6 +2276,7 @@ int do_init(int argc, char *argv[]) {
|
||||
|
||||
battle_config_read(BATTLE_CONF_FILENAME);
|
||||
atcommand_config_read(ATCOMMAND_CONF_FILENAME);
|
||||
charcommand_config_read(CHARCOMMAND_CONF_FILENAME);
|
||||
script_config_read(SCRIPT_CONF_NAME);
|
||||
msg_config_read(MSG_CONF_NAME);
|
||||
#ifndef TXT_ONLY
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user