diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/char/char.c | 12 | ||||
| -rw-r--r-- | src/char/int_guild.c | 7 | ||||
| -rw-r--r-- | src/char/inter.c | 4 |
3 files changed, 10 insertions, 13 deletions
diff --git a/src/char/char.c b/src/char/char.c index 5b497bd0c..a24e198bf 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -195,7 +195,7 @@ static DBData create_online_char_data(DBKey key, va_list args) CREATE(character, struct online_char_data, 1); character->account_id = key.i; character->char_id = -1; - character->server = -1; + character->server = -1; character->pincode_enable = -1; character->fd = -1; character->waiting_disconnect = INVALID_TIMER; @@ -1724,8 +1724,8 @@ int delete_char_sql(int char_id) SQL->GetData(sql_handle, 6, &data, NULL); partner_id = atoi(data); SQL->GetData(sql_handle, 7, &data, NULL); father_id = atoi(data); SQL->GetData(sql_handle, 8, &data, NULL); mother_id = atoi(data); - SQL->GetData(sql_handle, 9, &data, NULL); - elemental_id = atoi(data); + SQL->GetData(sql_handle, 9, &data, NULL); + elemental_id = atoi(data); SQL->EscapeStringLen(sql_handle, esc_name, name, min(len, NAME_LENGTH)); SQL->FreeResult(sql_handle); @@ -1779,9 +1779,9 @@ int delete_char_sql(int char_id) if( hom_id ) mapif_homunculus_delete(hom_id); - /* remove elemental */ - if (elemental_id) - mapif_elemental_delete(elemental_id); + /* remove elemental */ + if (elemental_id) + mapif_elemental_delete(elemental_id); /* remove mercenary data */ mercenary_owner_delete(char_id); diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 0f6814527..28b803027 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -611,10 +611,9 @@ static bool exp_guild_parse_row(char* split[], int column, int current) { } -int inter_guild_CharOnline(int char_id, int guild_id) -{ - struct guild *g; - int i; +int inter_guild_CharOnline(int char_id, int guild_id) { + struct guild *g; + int i; if (guild_id == -1) { //Get guild_id from the database diff --git a/src/char/inter.c b/src/char/inter.c index e1deb1a07..059c33784 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -369,9 +369,7 @@ const char* job_name(int class_) { } } -/** - * [Dekamaster/Nightroad] - **/ +/* [Dekamaster/Nightroad] */ const char * geoip_countryname[253] = {"Unknown","Asia/Pacific Region","Europe","Andorra","United Arab Emirates","Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia","Netherlands Antilles", "Angola","Antarctica","Argentina","American Samoa","Austria","Australia","Aruba","Azerbaijan","Bosnia and Herzegovina","Barbados", "Bangladesh","Belgium","Burkina Faso","Bulgaria","Bahrain","Burundi","Benin","Bermuda","Brunei Darussalam","Bolivia", |