pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'StringFormatting' into small_stage_cleanup

Browse Source 
Conflicts:
	common/Item.cpp
	world/client.cpp
	zone/net.cpp
This commit is contained in:
Arthur Ice
2013-05-22 18:36:07 -07:00
parent 41dcd5bc29 ea2a1651d5
commit 54914a970e
190 changed files with 1859 additions and 2097 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/tribute.cpp
+5 -7
View File
@@ -24,8 +24,6 @@
#include <string>
#include <map>
using namespace std;
#ifdef _WINDOWS
#include <windows.h>
#include <winsock.h>
@@ -55,12 +53,12 @@ public:
TributeLevel_Struct tiers[MAX_TRIBUTE_TIERS];
uint8 tier_count;
uint32 unknown;
string name;
string description;
std::string name;
std::string description;
bool is_guild; //is a guild tribute item
};
map<uint32, TributeData> tribute_list;
std::map<uint32, TributeData> tribute_list;
void Client::ToggleTribute(bool enabled) {
if(enabled) {
@@ -306,7 +304,7 @@ void Client::AddTributePoints(int32 ammount) {
void Client::SendTributes() {
map<uint32, TributeData>::iterator cur,end;
std::map<uint32, TributeData>::iterator cur,end;
cur = tribute_list.begin();
end = tribute_list.end();
@@ -340,7 +338,7 @@ void Client::SendTributes() {
void Client::SendGuildTributes() {
map<uint32, TributeData>::iterator cur,end;
std::map<uint32, TributeData>::iterator cur,end;
cur = tribute_list.begin();
end = tribute_list.end();