Some misc cleanups (typos, formatting, forgotten changelog entry etc)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9733 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-01-28 01:30:15 +00:00
parent 86221c4e69
commit d241d16d2a
9 changed files with 25 additions and 29 deletions

View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/01/27 2007/01/27
* Some misc cleanups (typos, formatting, forgotten changelog entry etc)
* Reformatted and translated atcommand.c * Reformatted and translated atcommand.c
- in the process improved @marry, allowing spaces after the first comma - in the process improved @marry, allowing spaces after the first comma
* Simple cleanup * Simple cleanup

View File

@ -1,5 +1,13 @@
Date Added 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 2007/01/26
* Added battle config hom_rename (homunc.txt) to enable renaming the * Added battle config hom_rename (homunc.txt) to enable renaming the
homunculus multiple times. Defaults to no. homunculus multiple times. Defaults to no.

0
save-tmpl/homun.txt Normal file
View File

View File

@ -154,13 +154,6 @@
//////////////////////////////////////////////// ////////////////////////////////////////////////
unsigned int malloc_usage (void); unsigned int malloc_usage (void);
#ifndef INLINE
#ifdef _WIN32
#define INLINE
#else
#define INLINE inline
#endif
#endif
void malloc_init (void); void malloc_init (void);
void malloc_final (void); void malloc_final (void);

View File

@ -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) int atcommand_jobchange(const int fd, struct map_session_data* sd, const char* command, const char* message)

View File

@ -272,7 +272,7 @@ enum AtCommandType {
AtCommand_ToNPC, // LuzZza AtCommand_ToNPC, // LuzZza
AtCommand_Commands, // [Skotlex] AtCommand_Commands, // [Skotlex]
AtCommand_NoAsk, // [LuzZza] 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_HomLevel, //[orn]
AtCommand_HomEvolution, //[orn] AtCommand_HomEvolution, //[orn]
AtCommand_MakeHomun, //[orn] AtCommand_MakeHomun, //[orn]
@ -294,22 +294,16 @@ typedef struct AtCommandInfo {
AtCommandType type; AtCommandType type;
const char* command; const char* command;
int level; int level;
int (*proc)(const int, struct map_session_data*, int (*proc)(const int fd, struct map_session_data* sd, const char* command, const char* message);
const char* command, const char* message);
} AtCommandInfo; } AtCommandInfo;
AtCommandType AtCommandType is_atcommand(const int fd, struct map_session_data* sd, const char* message);
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 AtCommandType atcommand(struct map_session_data *sd, const int level, const char* message, AtCommandInfo* info);
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); int get_atcommand_level(const AtCommandType type);
char * msg_txt(int msg_number); // [Yor] char* msg_txt(int msg_number); // [Yor]
char * player_title_txt(int level); // [Lupus] char* player_title_txt(int level); // [Lupus]
void do_init_atcommand(void); void do_init_atcommand(void);
void do_final_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); int msg_config_read(const char *cfgName);
void do_final_msg(void); 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; extern char atcommand_symbol;
#define MAX_MSG 1000 #define MAX_MSG 1000
extern char *msg_table[MAX_MSG]; extern char* msg_table[MAX_MSG];
#endif #endif

View File

@ -1977,7 +1977,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
char message[128]; char message[128];
i_data = itemdb_search(ditem->item_data.nameid); 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); 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); intif_GMmessage(message,strlen(message)+1,0);
} }
// Announce first, or else ditem will be freed. [Lance] // 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]; char message[128];
i_data = itemdb_exists(item.nameid); i_data = itemdb_exists(item.nameid);
sprintf (message, msg_txt(541), mvp_sd->status.name, md->name, i_data->jname, temp/100.); 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); intif_GMmessage(message,strlen(message)+1,0);
} }

View File

@ -3268,7 +3268,7 @@ int pc_steal_item(struct map_session_data *sd,struct block_list *bl, int lv)
char message[128]; char message[128];
i_data = itemdb_search(itemid); 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); 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); intif_GMmessage(message,strlen(message)+1,0);
} }
return 1; return 1;