Fixed typos inside src/

8 files changed, 46 insertions, 46 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 57031e3ee..fe17fd14f 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -118,7 +118,7 @@ bool char_new = true;
 int char_new_display = 0;
 
 bool name_ignoring_case = false; // Allow or not identical name for characters but with a different case by [Yor]
-int char_name_option = 0; // Option to know which letters/symbols are authorised in the name of a character (0: all, 1: only those in char_name_letters, 2: all EXCEPT those in char_name_letters) by [Yor]
+int char_name_option = 0; // Option to know which letters/symbols are authorized in the name of a character (0: all, 1: only those in char_name_letters, 2: all EXCEPT those in char_name_letters) by [Yor]
 char unknown_char_name[NAME_LENGTH] = "Unknown"; // Name to use when the requested name cannot be determined
 #define TRIM_CHARS "\255\xA0\032\t\x0A\x0D " //The following characters are trimmed regardless because they cause confusion and problems on the servers. [Skotlex]
 char char_name_letters[1024] = ""; // list of letters/symbols allowed (or not) in a character name. by [Yor]
@@ -126,8 +126,8 @@ char char_name_letters[1024] = ""; // list of letters/symbols allowed (or not) i
 int char_del_level = 0; //From which level u can delete character [Lupus]
 int char_del_delay = 86400;
 
-int log_char = 1;	// loggin char or not [devil]
-int log_inter = 1;	// loggin inter or not [devil]
+int log_char = 1;	// logging char or not [devil]
+int log_inter = 1;	// logging inter or not [devil]
 
 int char_aegis_delete = 0; // Verify if char is in guild/party or char and reacts as Aegis does (doesn't allow deletion), see char_delete2_req for more information
 
@@ -1387,7 +1387,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 	if( SQL_SUCCESS == SQL->StmtNextRow(stmt) )
 		strcat(t_msg, " accdata");
 
-	if (save_log) ShowInfo("Loaded char (%d - %s): %s\n", char_id, p->name, t_msg);	//ok. all data load successfuly!
+	if (save_log) ShowInfo("Loaded char (%d - %s): %s\n", char_id, p->name, t_msg);	//ok. all data load successfully!
 	SQL->StmtFree(stmt);
 	StrBuf->Destroy(&buf);
 
@@ -1413,7 +1413,7 @@ int mmo_char_sql_init(void)
 	//and send the loginserver the new state....
 
 	// Force all users offline in sql when starting char-server
-	// (useful when servers crashs and don't clean the database)
+	// (useful when servers crashes and don't clean the database)
 	set_all_offline_sql();
 
 	return 0;
@@ -1468,7 +1468,7 @@ bool char_slotchange(struct char_session_data *sd, int fd, unsigned short from,
 }
 
 //-----------------------------------
-// Function to change chararcter's names
+// Function to change character's names
 //-----------------------------------
 int rename_char_sql(struct char_session_data *sd, int char_id)
 {
@@ -1540,9 +1540,9 @@ int check_char_name(char * name, char * esc_name)
 	if( strcmpi(name, wisp_server_name) == 0 )
 		return -1; // nick reserved for internal server messages
 
-	// Check Authorised letters/symbols in the name of the character
+	// Check Authorized letters/symbols in the name of the character
 	if( char_name_option == 1 )
-	{ // only letters/symbols in char_name_letters are authorised
+	{ // only letters/symbols in char_name_letters are authorized
 		for( i = 0; i < NAME_LENGTH && name[i]; i++ )
 			if( strchr(char_name_letters, name[i]) == NULL )
 				return -2;
@@ -1576,7 +1576,7 @@ int check_char_name(char * name, char * esc_name)
  *  -1: 'Charname already exists'
  *  -2: 'Char creation denied'/ Unknown error
  *  -3: 'You are underaged'
- *  -4: 'You are not elegible to open the Character Slot.'
+ *  -4: 'You are not eligible to open the Character Slot.'
  *  -5: 'Symbols in Character Names are forbidden'
  *  char_id: Success
  **/
@@ -2202,7 +2202,7 @@ void mapif_server_reset(int id);
 void loginif_reset(void)
 {
 	int id;
-	// TODO kick everyone out and reset everything or wait for connect and try to reaquire locks [FlavioJS]
+	// TODO kick everyone out and reset everything or wait for connect and try to reacquire locks [FlavioJS]
 	for( id = 0; id < ARRAYLENGTH(server); ++id )
 		mapif_server_reset(id);
 	flush_fifos();
@@ -2286,7 +2286,7 @@ int parse_fromlogin(int fd) {
 		
 		switch( command ) {
 
-			// acknowledgement of connect-to-loginserver request
+			// acknowledgment of connect-to-loginserver request
 			case 0x2711:
 				if (RFIFOREST(fd) < 3)
 					return 0;
@@ -2306,7 +2306,7 @@ int parse_fromlogin(int fd) {
 				RFIFOSKIP(fd,3);
 			break;
 
-			// acknowledgement of account authentication request
+			// acknowledgment of account authentication request
 			case 0x2713:
 				if (RFIFOREST(fd) < 33)
 					return 0;
@@ -2526,7 +2526,7 @@ int parse_fromlogin(int fd) {
 				unsigned char buf[11];
 				WBUFW(buf,0) = 0x2b14;
 				WBUFL(buf,2) = RFIFOL(fd,2);
-				WBUFB(buf,6) = RFIFOB(fd,6); // 0: change of statut, 1: ban
+				WBUFB(buf,6) = RFIFOB(fd,6); // 0: change of status, 1: ban
 				WBUFL(buf,7) = RFIFOL(fd,7); // status or final date of a banishment
 				mapif_sendall(buf, 11);
 			}
@@ -3161,7 +3161,7 @@ int parse_frommap(int fd)
 					memcpy(&char_dat, RFIFOP(fd,13), sizeof(struct mmo_charstatus));
 					mmo_char_tosql(cid, &char_dat);
 				} else {	//This may be valid on char-server reconnection, when re-sending characters that already logged off.
-					ShowError("parse_from_map (save-char): Received data for non-existant/offline character (%d:%d).\n", aid, cid);
+					ShowError("parse_from_map (save-char): Received data for non-existing/offline character (%d:%d).\n", aid, cid);
 					set_char_online(id, cid, aid);
 				}
 
@@ -4174,7 +4174,7 @@ int parse_char(int fd)
 				ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", account_id, login_id1, login_id2);
 
 				if (sd) {
-					//Received again auth packet for already authentified account?? Discard it.
+					//Received again auth packet for already authenticated account?? Discard it.
 					//TODO: Perhaps log this as a hack attempt?
 					//TODO: and perhaps send back a reply?
 					break;
@@ -4201,7 +4201,7 @@ int parse_char(int fd)
 					break;
 				}
 
-				// search authentification
+				// search authentication
 				node = (struct auth_node*)idb_get(auth_db, account_id);
 				if( node != NULL &&
 					node->account_id == account_id &&
@@ -4232,7 +4232,7 @@ int parse_char(int fd)
 				{// authentication not found (coming from login server)
 					if (login_fd > 0) { // don't send request if no login-server
 						WFIFOHEAD(login_fd,23);
-						WFIFOW(login_fd,0) = 0x2712; // ask login-server to authentify an account
+						WFIFOW(login_fd,0) = 0x2712; // ask login-server to authenticate an account
 						WFIFOL(login_fd,2) = sd->account_id;
 						WFIFOL(login_fd,6) = sd->login_id1;
 						WFIFOL(login_fd,10) = sd->login_id2;
@@ -4317,7 +4317,7 @@ int parse_char(int fd)
 					break;
 				}
 				
-				/* set char as online prior to loading its data so 3rd party applications will realise the sql data is not reliable */
+				/* set char as online prior to loading its data so 3rd party applications will realize the sql data is not reliable */
 				set_char_online(-2,char_id,sd->account_id);
 				if( !mmo_char_fromsql(char_id, &char_dat, true) ) { /* failed? set it back offline */
 					set_char_offline(char_id, sd->account_id);
@@ -4459,13 +4459,13 @@ int parse_char(int fd)
 					WFIFOW(fd,0) = 0x6e;
 					/* Others I found [Ind] */
 					/* 0x02 = Symbols in Character Names are forbidden */
-					/* 0x03 = You are not elegible to open the Character Slot. */
+					/* 0x03 = You are not eligible to open the Character Slot. */
 					/* 0x0B = This service is only available for premium users.  */
 					switch (result) {
 						case -1: WFIFOB(fd,2) = 0x00; break; // 'Charname already exists'
 						case -2: WFIFOB(fd,2) = 0xFF; break; // 'Char creation denied'
 						case -3: WFIFOB(fd,2) = 0x01; break; // 'You are underaged'
-						case -4: WFIFOB(fd,2) = 0x03; break; // 'You are not elegible to open the Character Slot.'
+						case -4: WFIFOB(fd,2) = 0x03; break; // 'You are not eligible to open the Character Slot.'
 						case -5: WFIFOB(fd,2) = 0x02; break; // 'Symbols in Character Names are forbidden'
 
 						default:
@@ -4641,7 +4641,7 @@ int parse_char(int fd)
 			//Confirm change name.
 			// 0x28f <char_id>.L
 			case 0x28f:
-				// 0: Sucessfull
+				// 0: Successful
 				// 1: This character's name has already been changed. You cannot change a character's name more than once.
 				// 2: User information is not correct.
 				// 3: You have failed to change this character's name.
@@ -4746,7 +4746,7 @@ int parse_char(int fd)
 
 				RFIFOSKIP(fd,60);
 			}
-			return 0; // avoid processing of followup packets here
+			return 0; // avoid processing of follow-up packets here
 				
 			// checks the entered pin
 			case 0x8b8:
@@ -5006,8 +5006,8 @@ static int online_data_cleanup(int tid, int64 tick, int id, intptr_t data) {
 }
 
 //----------------------------------
-// Reading Lan Support configuration
-// Rewrote: Anvanced subnet check [LuzZza]
+// Reading LAN Support configuration
+// Rewrote: Advanced subnet check [LuzZza]
 //----------------------------------
 int char_lan_config_read(const char *lancfgName)
 {
@@ -5479,7 +5479,7 @@ int do_init(int argc, char **argv) {
 	timer->add_func_list(online_data_cleanup, "online_data_cleanup");
 	timer->add_interval(timer->gettick() + 1000, online_data_cleanup, 0, 0, 600 * 1000);
 
-	//Cleaning the tables for NULL entrys @ startup [Sirius]
+	//Cleaning the tables for NULL entries @ startup [Sirius]
 	//Chardb clean
 	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '0'", char_db) )
 		Sql_ShowDebug(sql_handle);
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index d246e9851..8cd870647 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -230,7 +230,7 @@ void inter_auctions_fromsql(void)
 		if( auction->timestamp > now )
 			endtick = ((int64)(auction->timestamp - now) * 1000) + tick;
 		else
-			endtick = tick + 10000; // 10 Second's to process ended auctions
+			endtick = tick + 10000; // 10 seconds to process ended auctions
 
 		auction->auction_end_timer = timer->add(endtick, auction_end_timer, auction->auction_id, 0);
 		idb_put(auction_db_, auction->auction_id, auction);
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index ffbe48e10..a6fcfe48c 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -117,7 +117,7 @@ int inter_guild_tosql(struct guild *g,int flag)
 	// GS_EXPULSION `guild_expulsion` (`guild_id`,`account_id`,`name`,`mes`)
 	// GS_SKILL `guild_skill` (`guild_id`,`id`,`lv`)
 
-	// temporary storage for str convertion. They must be twice the size of the
+	// temporary storage for str conversion. They must be twice the size of the
 	// original string to ensure no overflows will occur. [Skotlex]
 	char t_info[256];
 	char esc_name[NAME_LENGTH*2+1];
@@ -836,7 +836,7 @@ int guild_calcinfo(struct guild *g)
 	// Save next exp step
 	g->next_exp = nextexp;
 
-	// Set the max number of members, Guild Extention skill - currently adds 6 to max per skill lv.
+	// Set the max number of members, Guild Extension skill - currently adds 6 to max per skill lv.
 	g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 6;
 	if(g->max_member > MAX_GUILD)
 	{
@@ -1142,8 +1142,8 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member
 		mapif_guild_created(fd,account_id,NULL);
 		return 0;
 	}
-	// Check Authorised letters/symbols in the name of the character
-	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+	// Check Authorized letters/symbols in the name of the character
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorized
 		for (i = 0; i < NAME_LENGTH && name[i]; i++)
 			if (strchr(char_name_letters, name[i]) == NULL) {
 				mapif_guild_created(fd,account_id,NULL);
@@ -1212,7 +1212,7 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member
 // Return guild info to client
 int mapif_parse_GuildInfo(int fd,int guild_id)
 {
-	struct guild * g = inter_guild_fromsql(guild_id); //We use this because on start-up the info of castle-owned guilds is requied. [Skotlex]
+	struct guild * g = inter_guild_fromsql(guild_id); //We use this because on start-up the info of castle-owned guilds is required. [Skotlex]
 	if(g)
 	{
 		if (!guild_calcinfo(g))
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index 795a6b927..acde9eb38 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -248,9 +248,9 @@ bool mapif_homunculus_rename(char *name)
 {
 	int i;
 
-	// Check Authorised letters/symbols in the name of the homun
+	// Check Authorized letters/symbols in the name of the homun
 	if( char_name_option == 1 )
-	{// only letters/symbols in char_name_letters are authorised
+	{// only letters/symbols in char_name_letters are authorized
 		for( i = 0; i < NAME_LENGTH && name[i]; i++ )
 			if( strchr(char_name_letters, name[i]) == NULL )
 				return false;
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 5dd64a32b..a8722fbe3 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -475,8 +475,8 @@ int mapif_parse_CreateParty(int fd, char *name, int item, int item2, struct part
 		mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
 		return 0;
 	}
-	// Check Authorised letters/symbols in the name of the character
-	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+	// Check Authorized letters/symbols in the name of the character
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorized
 		for (i = 0; i < NAME_LENGTH && name[i]; i++)
 			if (strchr(char_name_letters, name[i]) == NULL) {
 				if( name[i] == '"' ) { /* client-special-char */
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 61b43c57d..d4155b0d6 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -197,7 +197,7 @@ int mapif_parse_quest_save(int fd) {
 		if (j < old_n) {
 			// Update existing quests
 
-			// Only states and counts are changable.
+			// Only states and counts are changeable.
 			ARR_FIND( 0, MAX_QUEST_OBJECTIVES, k, new_qd[i].count[k] != old_qd[j].count[k] );
 			if (k != MAX_QUEST_OBJECTIVES || new_qd[i].state != old_qd[j].state)
 				success &= mapif_quest_update(char_id, new_qd[i]);
diff --git a/src/char/inter.c b/src/char/inter.c
index 972407ef3..c2d8de37a 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -589,7 +589,7 @@ void mapif_parse_accinfo(int fd) {
 				inter_msg_to_fd(fd, u_fd, aid, "No matches were found for your criteria, '%s'",query);
 			} else {
 				Sql_ShowDebug(sql_handle);
-				inter_msg_to_fd(fd, u_fd, aid, "An error occured, bother your admin about it.");
+				inter_msg_to_fd(fd, u_fd, aid, "An error occurred, bother your admin about it.");
 			}
 			SQL->FreeResult(sql_handle);
 			return;
@@ -658,7 +658,7 @@ void mapif_parse_accinfo2(bool success, int map_fd, int u_fd, int u_aid, int acc
 		if (SQL->NumRows(sql_handle) == 0) {
 			inter_msg_to_fd(map_fd, u_fd, u_aid, "This account doesn't have characters.");
 		} else {
-			inter_msg_to_fd(map_fd, u_fd, u_aid, "An error occured, bother your admin about it.");
+			inter_msg_to_fd(map_fd, u_fd, u_aid, "An error occurred, bother your admin about it.");
 			Sql_ShowDebug(sql_handle);
 		}
 	} else {
@@ -1165,7 +1165,7 @@ int check_ttl_wisdata(void)
 			struct WisData *wd = (struct WisData*)idb_get(wis_db, wis_dellist[i]);
 			ShowWarning("inter: wis data id=%d time out : from %s to %s\n", wd->id, wd->src, wd->dst);
 			// removed. not send information after a timeout. Just no answer for the player
-			//mapif_wis_end(wd, 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+			//mapif_wis_end(wd, 1); // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 			idb_remove(wis_db, wd->id);
 		}
 	} while(wis_delnum >= WISDELLIST_MAX);
@@ -1199,7 +1199,7 @@ int mapif_parse_WisRequest(int fd)
 	if (RFIFOW(fd,2)-52 >= sizeof(wd->msg)) {
 		ShowWarning("inter: Wis message size too long.\n");
 		return 0;
-	} else if (RFIFOW(fd,2)-52 <= 0) { // normaly, impossible, but who knows...
+	} else if (RFIFOW(fd,2)-52 <= 0) { // normally, impossible, but who knows...
 		ShowError("inter: Wis message doesn't exist.\n");
 		return 0;
 	}
@@ -1216,7 +1216,7 @@ int mapif_parse_WisRequest(int fd)
 		unsigned char buf[27];
 		WBUFW(buf, 0) = 0x3802;
 		memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
-		WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+		WBUFB(buf,26) = 1; // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 		mapif_send(fd, buf, 27);
 	}
 	else
@@ -1231,7 +1231,7 @@ int mapif_parse_WisRequest(int fd)
 			uint8 buf[27];
 			WBUFW(buf, 0) = 0x3802;
 			memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
-			WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+			WBUFB(buf,26) = 1; // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 			mapif_send(fd, buf, 27);
 		}
 		else
@@ -1272,7 +1272,7 @@ int mapif_parse_WisReply(int fd)
 		return 0;	// This wisp was probably suppress before, because it was timeout of because of target was found on another map-server
 
 	if ((--wd->count) <= 0 || flag != 1) {
-		mapif_wis_end(wd, flag); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+		mapif_wis_end(wd, flag); // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 		idb_remove(wis_db, id);
 	}
 
@@ -1376,8 +1376,8 @@ int mapif_parse_NameChangeRequest(int fd)
 	type = RFIFOB(fd,10);
 	name = (char*)RFIFOP(fd,11);
 
-	// Check Authorised letters/symbols in the name
-	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+	// Check Authorized letters/symbols in the name
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorized
 		for (i = 0; i < NAME_LENGTH && name[i]; i++)
 		if (strchr(char_name_letters, name[i]) == NULL) {
 			mapif_namechange_ack(fd, account_id, char_id, type, 0, name);
diff --git a/src/char/pincode.c b/src/char/pincode.c
index 59182f12d..18ad0ffc8 100644
--- a/src/char/pincode.c
+++ b/src/char/pincode.c
@@ -33,7 +33,7 @@ void pincode_handle ( int fd, struct char_session_data* sd ) {
 	}
 	
 	if( strlen(sd->pincode) == 4 ){
-		if( *pincode->changetime && time(NULL) > (sd->pincode_change+*pincode->changetime) ){ // User hasnt changed his PIN code for a long time
+		if( *pincode->changetime && time(NULL) > (sd->pincode_change+*pincode->changetime) ){ // User hasn't changed his PIN code for a long time
 			pincode->sendstate( fd, sd, PINCODE_EXPIRED );
 		} else { // Ask user for his PIN code
 			pincode->sendstate( fd, sd, PINCODE_ASK );