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

Fixed @whozeny.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@300 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
valaris 2004-11-21 17:49:35 +00:00
parent 4952522a1d
commit a6379d05f6
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -1,5 +1,6 @@
Date Added Date Added
11/21 11/21
* Fixed @whozeny. [Valaris]
* Added rest of mapflags to const.txt. [Valaris] * Added rest of mapflags to const.txt. [Valaris]
* Closed AFM files after reading, this fixed the improper char-server session #. [Valaris] * Closed AFM files after reading, this fixed the improper char-server session #. [Valaris]
* Skill updates: [Celest] * Skill updates: [Celest]

7
src/map/atcommand.c
View File

@ -1639,7 +1639,7 @@ int atcommand_whozeny(
char match_text[100]; char match_text[100];
char player_name[24]; char player_name[24];
int zeny[clif_countusers()]; int zeny[clif_countusers()];
char counted[clif_countusers()]; int counted[clif_countusers()];
memset(output, '\0', sizeof(output)); memset(output, '\0', sizeof(output));
memset(match_text, '\0', sizeof(match_text)); memset(match_text, '\0', sizeof(match_text));
@ -1658,6 +1658,7 @@ int atcommand_whozeny(
player_name[j] = tolower(player_name[j]); player_name[j] = tolower(player_name[j]);
if (strstr(player_name, match_text) != NULL) { // search with no case sensitive if (strstr(player_name, match_text) != NULL) { // search with no case sensitive
zeny[count]=pl_sd->status.zeny; zeny[count]=pl_sd->status.zeny;
counted[i]=0;
count++; count++;
} }
} }
@ -1668,7 +1669,9 @@ int atcommand_whozeny(
if(!zeny[c]) if(!zeny[c])
continue; continue;
for (i = 0; i < fd_max; i++) { for (i = 0; i < fd_max; i++) {
if (session[i] && (pl_sd = session[i]->session_data) && pl_sd->state.auth && !counted[i] && zeny[c]) { if(!zeny[c])
continue;
if (session[i] && (pl_sd = session[i]->session_data) && pl_sd->state.auth && zeny[c] && counted[i]==0) {
if(pl_sd->status.zeny==zeny[c]) { if(pl_sd->status.zeny==zeny[c]) {
sprintf(output, "Name: %s | Zeny: %d", pl_sd->status.name, pl_sd->status.zeny); sprintf(output, "Name: %s | Zeny: %d", pl_sd->status.name, pl_sd->status.zeny);
clif_displaymessage(fd, output); clif_displaymessage(fd, output);

8
src/map/map.c
View File

@ -1480,8 +1480,8 @@ static int map_readafm(int m,char *fn) {
afm_file = fopen(fn, "r"); afm_file = fopen(fn, "r");
if (afm_file != NULL) { if (afm_file != NULL) {
printf("\rLoading Maps [%d/%d]: %-50s ",m,map_num,fn); // printf("\rLoading Maps [%d/%d]: %-50s ",m,map_num,fn);
fflush(stdout); // fflush(stdout);
str=fgets(afm_line, sizeof(afm_line)-1, afm_file); str=fgets(afm_line, sizeof(afm_line)-1, afm_file);
str=fgets(afm_line, sizeof(afm_line)-1, afm_file); str=fgets(afm_line, sizeof(afm_line)-1, afm_file);
@ -1569,8 +1569,8 @@ static int map_readmap(int m,char *fn, char *alias) {
if(gat==NULL) if(gat==NULL)
return -1; return -1;
printf("\rLoading Maps [%d/%d]: %-50s ",m,map_num,fn); // printf("\rLoading Maps [%d/%d]: %-50s ",m,map_num,fn);
fflush(stdout); // fflush(stdout);
map[m].m=m; map[m].m=m;
xs=map[m].xs=*(int*)(gat+6); xs=map[m].xs=*(int*)(gat+6);

4
src/map/npc.c
View File

@ -2282,8 +2282,8 @@ int do_init_npc(void)
} }
} }
fclose(fp); fclose(fp);
printf("\rLoading NPCs [%d]: %-54s",npc_id-START_NPC_NUM,nsl->name); // printf("\rLoading NPCs [%d]: %-54s",npc_id-START_NPC_NUM,nsl->name);
fflush(stdout); // fflush(stdout);
} }
printf("\rNPCs Loaded: %d [Warps:%d Shops:%d Scripts:%d Mobs:%d]\n", printf("\rNPCs Loaded: %d [Warps:%d Shops:%d Scripts:%d Mobs:%d]\n",
npc_id-START_NPC_NUM,npc_warp,npc_shop,npc_script,npc_mob); npc_id-START_NPC_NUM,npc_warp,npc_shop,npc_script,npc_mob);