pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-16 17:41:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge git://github.com/EQEmu/Server into Development

Browse Source
This commit is contained in:
KayenEQ 2014-09-27 09:20:27 -04:00
commit acc6926448
7 changed files with 16922 additions and 16503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1951
common/patches/client62.cpp
View File

File diff suppressed because it is too large Load Diff

9677
common/patches/rof.cpp
View File

File diff suppressed because it is too large Load Diff

6385
common/patches/sod.cpp
View File

File diff suppressed because it is too large Load Diff

5586
common/patches/sof.cpp
View File

File diff suppressed because it is too large Load Diff

2799
common/patches/titanium.cpp
View File

File diff suppressed because it is too large Load Diff

7013
common/patches/underfoot.cpp
View File

File diff suppressed because it is too large Load Diff

14
zone/trading.cpp
View File

@ -1861,7 +1861,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
int Action = BazaarSearchResults; int Action = BazaarSearchResults;
uint32 Cost = 0; uint32 Cost = 0;
int32 SerialNumber = 0; int32 SerialNumber = 0;
char Name[64] = {0}; char temp_buffer[64] = {0};
int Count = 0; int Count = 0;
uint32 StatValue=0; uint32 StatValue=0;
@ -1887,23 +1887,23 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
bool Stackable = atoi(row[10]); bool Stackable = atoi(row[10]);
if(Stackable) { if(Stackable) {
int Charges = atoi(row[9]); int Charges = atoi(row[9]);
sprintf(Name, "%s(%i)", row[7], Charges); sprintf(temp_buffer, "%s(%i)", row[7], Charges);
} }
else else
sprintf(Name,"%s(%i)",row[7], Count); sprintf(temp_buffer,"%s(%i)",row[7], Count);
memcpy(bufptr,&Name, strlen(Name)); memcpy(bufptr,&temp_buffer, strlen(temp_buffer));
bufptr += 64; bufptr += 64;
// Extra fields for SoD+ // Extra fields for SoD+
// //
if(Trader2) if(Trader2)
sprintf(Name, "%s", Trader2->GetName()); sprintf(temp_buffer, "%s", Trader2->GetName());
else else
sprintf(Name, "Unknown"); sprintf(temp_buffer, "Unknown");
memcpy(bufptr,&Name, strlen(Name)); memcpy(bufptr,&temp_buffer, strlen(temp_buffer));
bufptr += 64; bufptr += 64;