diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-10 08:27:03 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-10 08:27:03 +0000 |
| commit | ff07e78eefa511c7ae363a00bf9fbc761240552e (patch) | |
| tree | 828514051e0a65cdea44369db7f06206bfb48122 /src/map/intif.c | |
| parent | dfd9bcd2b9a77ff69d10add1f3b82566b1c87abe (diff) | |
| download | hercules-ff07e78eefa511c7ae363a00bf9fbc761240552e.tar.gz hercules-ff07e78eefa511c7ae363a00bf9fbc761240552e.tar.bz2 hercules-ff07e78eefa511c7ae363a00bf9fbc761240552e.tar.xz hercules-ff07e78eefa511c7ae363a00bf9fbc761240552e.zip | |
Renamed 'struct storage' to 'struct storage_data' (to make 'storage' available as a variable name).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12932 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/intif.c')
| -rw-r--r-- | src/map/intif.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/intif.c b/src/map/intif.c index e90b5985f..99e054119 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -338,16 +338,16 @@ int intif_request_storage(int account_id) return 0; } // 倉庫データ送信 -int intif_send_storage(struct storage *stor) +int intif_send_storage(struct storage_data *stor) { if (CheckForCharServer()) return 0; nullpo_retr(0, stor); - WFIFOHEAD(inter_fd,sizeof(struct storage)+8); + WFIFOHEAD(inter_fd,sizeof(struct storage_data)+8); WFIFOW(inter_fd,0) = 0x3011; - WFIFOW(inter_fd,2) = sizeof(struct storage)+8; + WFIFOW(inter_fd,2) = sizeof(struct storage_data)+8; WFIFOL(inter_fd,4) = stor->account_id; - memcpy( WFIFOP(inter_fd,8),stor, sizeof(struct storage) ); + memcpy( WFIFOP(inter_fd,8),stor, sizeof(struct storage_data) ); WFIFOSET(inter_fd,WFIFOW(inter_fd,2)); return 0; } @@ -971,7 +971,7 @@ int intif_parse_Registers(int fd) // 倉庫データ受信 int intif_parse_LoadStorage(int fd) { - struct storage *stor; + struct storage_data *stor; struct map_session_data *sd; sd=map_id2sd( RFIFOL(fd,4) ); @@ -990,13 +990,13 @@ int intif_parse_LoadStorage(int fd) ShowWarning("intif_parse_LoadStorage: received storage for an already modified non-saved storage! (User %d:%d)\n", sd->status.account_id, sd->status.char_id); return 1; } - if (RFIFOW(fd,2)-8 != sizeof(struct storage)) { - ShowError("intif_parse_LoadStorage: data size error %d %d\n", RFIFOW(fd,2)-8, sizeof(struct storage)); + if (RFIFOW(fd,2)-8 != sizeof(struct storage_data)) { + ShowError("intif_parse_LoadStorage: data size error %d %d\n", RFIFOW(fd,2)-8, sizeof(struct storage_data)); return 1; } if(battle_config.save_log) ShowInfo("intif_openstorage: %d\n",RFIFOL(fd,4) ); - memcpy(stor,RFIFOP(fd,8),sizeof(struct storage)); + memcpy(stor,RFIFOP(fd,8),sizeof(struct storage_data)); stor->dirty=0; stor->storage_status=1; sd->state.storage_flag = 1; |