Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Follow up r17232 fix wrong index assignement in deleting chan. (issue created in r17232 sorry)

Browse Source 
rechange unwanted chande for pincode default value.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17233 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
glighta 2013-04-07 09:55:04 +00:00
parent 29970729cf
commit 6073dd60b9
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/char_athena.conf
View File

@ -9,7 +9,7 @@ userid: s1
passwd: p1 passwd: p1
// Server name, use alternative character such as ASCII 160 for spaces. // Server name, use alternative character such as ASCII 160 for spaces.
// NOTE: Do not use spaces or any of these characters which are not allowed in // NOTE: Do not use spaces or any of these characters which are not allowed in
// Windows filenames \/:*?"<>| // Windows filenames \/:*?"<>|
// ... or else guild emblems won't work client-side! // ... or else guild emblems won't work client-side!
server_name: rAthena server_name: rAthena
@ -93,7 +93,7 @@ gm_allow_group: 99
// On SQL servers, it applies to guilds (character save interval is defined on the map config) // On SQL servers, it applies to guilds (character save interval is defined on the map config)
autosave_time: 60 autosave_time: 60
// Display information on the console whenever characters/guilds/parties/pets are loaded/saved? // Display information on the console whenever characters/guilds/parties/pets are loaded/saved?
save_log: yes save_log: yes
// Start point, Map name followed by coordinates (x,y) // Start point, Map name followed by coordinates (x,y)
@ -114,7 +114,7 @@ fame_list_blacksmith: 10
fame_list_taekwon: 10 fame_list_taekwon: 10
// Guild earned exp modifier. // Guild earned exp modifier.
// Adjusts taxed exp before adding it to the guild's exp. For example, if set // Adjusts taxed exp before adding it to the guild's exp. For example, if set
// to 200, the guild receives double the player's taxed exp. // to 200, the guild receives double the player's taxed exp.
guild_exp_rate: 100 guild_exp_rate: 100
@ -165,7 +165,7 @@ db_path: db
// NOTE: Requires client 2011-03-09aragexeRE or newer. // NOTE: Requires client 2011-03-09aragexeRE or newer.
// A window is opened before you can select your character and you will have to enter a pincode by using only your mouse. // A window is opened before you can select your character and you will have to enter a pincode by using only your mouse.
// Default: yes // Default: yes
pincode_enabled: no pincode_enabled: yes
// How often does a user have to change his pincode? // How often does a user have to change his pincode?
// 0: never (default) // 0: never (default)

10
src/map/clif.c
View File

@ -5585,10 +5585,9 @@ void clif_chsys_left(struct raChSysCh *channel, struct map_session_data *sd) {
for( i = 0; i < sd->channel_count; i++ ) { for( i = 0; i < sd->channel_count; i++ ) {
if( sd->channels[i] == NULL ) if( sd->channels[i] == NULL )
continue; continue;
if( cursor != i ) { if( cursor != i )
sd->channels[cursor] = sd->channels[i]; sd->channels[cursor] = sd->channels[i];
cursor++; cursor++;
}
} }
if ( !(sd->channel_count = cursor) ) { if ( !(sd->channel_count = cursor) ) {
aFree(sd->channels); aFree(sd->channels);
@ -5612,10 +5611,9 @@ void clif_chsys_delete(struct raChSysCh *channel) {
for( i = 0; i < sd->channel_count; i++ ) { //move down links for( i = 0; i < sd->channel_count; i++ ) { //move down links
if( sd->channels[i] == NULL ) if( sd->channels[i] == NULL )
continue; continue;
if( cursor != i ) { if( cursor != i )
sd->channels[cursor] = sd->channels[i]; sd->channels[cursor] = sd->channels[i];
cursor++; cursor++;
}
} }
if ( !(sd->channel_count = cursor) ) { //news chan count = total if ( !(sd->channel_count = cursor) ) { //news chan count = total
aFree(sd->channels); aFree(sd->channels);