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 'master' of https://github.com/EQEmu/Server into EQEmu-master

Browse Source 
Conflicts:
	zone/client.h
	zone/mod_functions.cpp
	zone/mod_functions_base.cpp
This commit is contained in:
root
2013-06-01 19:17:23 -05:00
parent ac5926bdfe 39426789f4
commit 7fca5a7a89
231 changed files with 2955 additions and 3061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/tribute.cpp
+15 -20
View File
@@ -24,24 +24,19 @@
#include <string>
#include <map>
using namespace std;
#ifdef _WINDOWS
#include <windows.h>
#include <winsock.h>
#include <process.h>
#define snprintf _snprintf
#if (_MSC_VER < 1500)
#include <windows.h>
#include <winsock.h>
#include <process.h>
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#endif
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#else
#include <stdarg.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include "../common/unix.h"
#include <stdarg.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include "../common/unix.h"
#endif
/*
@@ -58,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) {
@@ -309,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();
@@ -343,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();