From f50f76af9cf4c6de540f18a46735f9f19c9da230 Mon Sep 17 00:00:00 2001 From: ultramage Date: Sun, 28 Jan 2007 01:30:15 +0000 Subject: Some misc cleanups (typos, formatting, forgotten changelog entry etc) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9733 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + conf-tmpl/Changelog.txt | 8 ++++++++ save-tmpl/homun.txt | 0 src/common/malloc.h | 7 ------- src/map/atcommand.c | 2 +- src/map/atcommand.h | 26 ++++++++++---------------- src/map/chrif.c | 2 +- src/map/mob.c | 4 ++-- src/map/pc.c | 4 ++-- 9 files changed, 25 insertions(+), 29 deletions(-) create mode 100644 save-tmpl/homun.txt diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index fab72366f..6934ad202 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +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/01/27 + * Some misc cleanups (typos, formatting, forgotten changelog entry etc) * Reformatted and translated atcommand.c - in the process improved @marry, allowing spaces after the first comma * Simple cleanup diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt index 0426710db..4323569f1 100644 --- a/conf-tmpl/Changelog.txt +++ b/conf-tmpl/Changelog.txt @@ -1,5 +1,13 @@ Date Added +2007/01/27 + * Atcommand fixup [ultramage] + - removed atcommands @w, @server_date/time, @red, @happyhappyjoyjoy, @shuffle + - synced gm level of @jailfor, @charjailtime, @npcmove, @chardropall, + @charstoreall, @send, @mute, @changelook, @exp and @nuke + - added conf entries for @whozeny, @kamic, @tonpc, @petid, @identify, @adopt, + @trade, @changelook, @send + - reorganized the atcommands a bit 2007/01/26 * Added battle config hom_rename (homunc.txt) to enable renaming the homunculus multiple times. Defaults to no. diff --git a/save-tmpl/homun.txt b/save-tmpl/homun.txt new file mode 100644 index 000000000..e69de29bb diff --git a/src/common/malloc.h b/src/common/malloc.h index 2cef33982..1af9cba62 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -154,13 +154,6 @@ //////////////////////////////////////////////// unsigned int malloc_usage (void); -#ifndef INLINE - #ifdef _WIN32 - #define INLINE - #else - #define INLINE inline - #endif -#endif void malloc_init (void); void malloc_final (void); diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 36bcee74a..0c4809b3a 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2253,7 +2253,7 @@ int atcommand_hide(const int fd, struct map_session_data* sd, const char* comman } /*========================================== - * 転職する upperを指定すると転生や養子にもなれる + * Changes a character's class *------------------------------------------ */ int atcommand_jobchange(const int fd, struct map_session_data* sd, const char* command, const char* message) diff --git a/src/map/atcommand.h b/src/map/atcommand.h index a18bb4aaf..84b4fa0ed 100644 --- a/src/map/atcommand.h +++ b/src/map/atcommand.h @@ -272,7 +272,7 @@ enum AtCommandType { AtCommand_ToNPC, // LuzZza AtCommand_Commands, // [Skotlex] AtCommand_NoAsk, // [LuzZza] - AtCommand_Request, // [Skotlex], supposedly taken from Freya (heard the command was there, but I haven't seen the code yet) + AtCommand_Request, // [Skotlex] AtCommand_HomLevel, //[orn] AtCommand_HomEvolution, //[orn] AtCommand_MakeHomun, //[orn] @@ -294,22 +294,16 @@ typedef struct AtCommandInfo { AtCommandType type; const char* command; int level; - int (*proc)(const int, struct map_session_data*, - const char* command, const char* message); + int (*proc)(const int fd, struct map_session_data* sd, const char* command, const char* message); } AtCommandInfo; -AtCommandType -is_atcommand(const int fd, struct map_session_data* sd, const char* message); -AtCommandType -is_atcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl); - -AtCommandType atcommand( - struct map_session_data *sd, - const int level, const char* message, AtCommandInfo* info); +AtCommandType is_atcommand(const int fd, struct map_session_data* sd, const char* message); +AtCommandType is_atcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl); +AtCommandType atcommand(struct map_session_data *sd, const int level, const char* message, AtCommandInfo* info); int get_atcommand_level(const AtCommandType type); -char * msg_txt(int msg_number); // [Yor] -char * player_title_txt(int level); // [Lupus] +char* msg_txt(int msg_number); // [Yor] +char* player_title_txt(int level); // [Lupus] void do_init_atcommand(void); void do_final_atcommand(void); @@ -324,12 +318,12 @@ int atcommand_config_read(const char *cfgName); int msg_config_read(const char *cfgName); void do_final_msg(void); -char *estr_lower(char *str); +char* estr_lower(char* str); -int e_mail_check(char *email); +int e_mail_check(char* email); extern char atcommand_symbol; #define MAX_MSG 1000 -extern char *msg_table[MAX_MSG]; +extern char* msg_table[MAX_MSG]; #endif diff --git a/src/map/chrif.c b/src/map/chrif.c index ecd5187c6..404685339 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -621,7 +621,7 @@ int chrif_changegm(int id, const char *pass, int len) chrif_check(-1); - WFIFOHEAD(char_fd, len + 8); + WFIFOHEAD(char_fd, len + 8); WFIFOW(char_fd,0) = 0x2b0a; WFIFOW(char_fd,2) = len + 8; WFIFOL(char_fd,4) = id; diff --git a/src/map/mob.c b/src/map/mob.c index e3e40ea95..c624643ef 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1977,7 +1977,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) char message[128]; i_data = itemdb_search(ditem->item_data.nameid); sprintf (message, msg_txt(541), (mvp_sd?mvp_sd->status.name:"???"), md->name, i_data->jname, (float)drop_rate/100); - //MSG: "'%s' won %s's %s (chance: %%%0.02f)" + //MSG: "'%s' won %s's %s (chance: %0.02f%%)" intif_GMmessage(message,strlen(message)+1,0); } // Announce first, or else ditem will be freed. [Lance] @@ -2099,7 +2099,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) char message[128]; i_data = itemdb_exists(item.nameid); sprintf (message, msg_txt(541), mvp_sd->status.name, md->name, i_data->jname, temp/100.); - //MSG: "'%s' won %s's %s (chance: %%%0.02f)" + //MSG: "'%s' won %s's %s (chance: %0.02f%%)" intif_GMmessage(message,strlen(message)+1,0); } diff --git a/src/map/pc.c b/src/map/pc.c index 9761ad811..d52303204 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -796,7 +796,7 @@ int pc_reg_received(struct map_session_data *sd) sd->die_counter = pc_readglobalreg(sd,"PC_DIE_COUNTER"); if ((sd->class_&MAPID_BASEMASK)==MAPID_TAEKWON) - { //Better check for class rather than skill to prevent "skill resets" from unsetting this + { //Better check for class rather than skill to prevent "skill resets" from unsetting this sd->mission_mobid = pc_readglobalreg(sd,"TK_MISSION_ID"); sd->mission_count = pc_readglobalreg(sd,"TK_MISSION_COUNT"); } @@ -3268,7 +3268,7 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, int lv) char message[128]; i_data = itemdb_search(itemid); sprintf (message, msg_txt(542), (sd->status.name != NULL)?sd->status.name :"GM", md->db->jname, i_data->jname, (float)md->db->dropitem[i].p/100); - //MSG: "'%s' stole %s's %s (chance: %%%0.02f)" + //MSG: "'%s' stole %s's %s (chance: %0.02f%%)" intif_GMmessage(message,strlen(message)+1,0); } return 1; -- cgit v1.2.3-70-g09d2