pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 09:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into char_to_string

Browse Source 
Conflicts:
	common/dbcore.h
This commit is contained in:
Arthur Ice
2013-05-25 21:30:21 -07:00
parent 1b9004445d 52b8c0e078
commit a372ba3d39
55 changed files with 576 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/AdventureManager.cpp
+24 -24
View File
@@ -1278,8 +1278,8 @@ void AdventureManager::DoLeaderboardRequestWins(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_wins.begin();
while(i < 100 && iter != leaderboard_info_wins.end())
@@ -1345,8 +1345,8 @@ void AdventureManager::DoLeaderboardRequestPercentage(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_percentage.begin();
while(i < 100 && iter != leaderboard_info_percentage.end())
@@ -1412,8 +1412,8 @@ void AdventureManager::DoLeaderboardRequestWinsGuk(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_wins_guk.begin();
while(i < 100 && iter != leaderboard_info_wins_guk.end())
@@ -1479,8 +1479,8 @@ void AdventureManager::DoLeaderboardRequestPercentageGuk(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_percentage_guk.begin();
while(i < 100 && iter != leaderboard_info_percentage_guk.end())
@@ -1546,8 +1546,8 @@ void AdventureManager::DoLeaderboardRequestWinsMir(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_wins_mir.begin();
while(i < 100 && iter != leaderboard_info_wins_mir.end())
@@ -1613,8 +1613,8 @@ void AdventureManager::DoLeaderboardRequestPercentageMir(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_percentage_mir.begin();
while(i < 100 && iter != leaderboard_info_percentage_mir.end())
@@ -1680,8 +1680,8 @@ void AdventureManager::DoLeaderboardRequestWinsMmc(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_wins_mmc.begin();
while(i < 100 && iter != leaderboard_info_wins_mmc.end())
@@ -1747,8 +1747,8 @@ void AdventureManager::DoLeaderboardRequestPercentageMmc(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_percentage_mmc.begin();
while(i < 100 && iter != leaderboard_info_percentage_mmc.end())
@@ -1814,8 +1814,8 @@ void AdventureManager::DoLeaderboardRequestWinsRuj(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_wins_ruj.begin();
while(i < 100 && iter != leaderboard_info_wins_ruj.end())
@@ -1881,8 +1881,8 @@ void AdventureManager::DoLeaderboardRequestPercentageRuj(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_percentage_ruj.begin();
while(i < 100 && iter != leaderboard_info_percentage_ruj.end())
@@ -1948,8 +1948,8 @@ void AdventureManager::DoLeaderboardRequestWinsTak(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_wins_ruj.begin();
while(i < 100 && iter != leaderboard_info_wins_ruj.end())
@@ -2015,8 +2015,8 @@ void AdventureManager::DoLeaderboardRequestPercentageTak(const char* player)
strcpy((char*)pack->pBuffer, player);
int place = -1;
int our_successes;
int our_failures;
int our_successes = 0;
int our_failures = 0;
int i = 0;
std::list<LeaderboardInfo>::iterator iter = leaderboard_info_percentage_tak.begin();
while(i < 100 && iter != leaderboard_info_percentage_tak.end())
world/CMakeLists.txt
+2
View File
@@ -65,6 +65,8 @@ SET(world_headers
ADD_EXECUTABLE(world ${world_sources} ${world_headers})
INSTALL(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
ADD_DEFINITIONS(-DWORLD)
TARGET_LINK_LIBRARIES(world Common ${PERL_LIBRARY} debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY})
world/client.cpp
+33 -33
View File
@@ -2,8 +2,34 @@
#include "../common/EQPacket.h"
#include "../common/EQStreamIntf.h"
#include "../common/misc.h"
#include "../common/rulesys.h"
#include "../common/emu_opcodes.h"
#include "../common/eq_packet_structs.h"
#include "../common/packet_dump.h"
#include "../common/EQStreamIntf.h"
#include "../common/Item.h"
#include "../common/races.h"
#include "../common/classes.h"
#include "../common/languages.h"
#include "../common/skills.h"
#include "../common/extprofile.h"
#include "../common/StringUtil.h"
#include "../common/clientversions.h"
#include "client.h"
#include "worlddb.h"
#include "WorldConfig.h"
#include "LoginServer.h"
#include "LoginServerList.h"
#include "zoneserver.h"
#include "zonelist.h"
#include "clientlist.h"
#include "wguild_mgr.h"
#include "SoFCharCreateData.h"
#include <iostream>
#include <iomanip>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -17,44 +43,18 @@
#ifdef _WINDOWS
#include <windows.h>
#include <winsock.h>
#define snprintf _snprintf
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#else
#ifdef FREEBSD //Timothy Whitman - January 7, 2003
#include <sys/types.h>
#endif
#include <sys/socket.h>
#ifdef FREEBSD //Timothy Whitman - January 7, 2003
#include <sys/types.h>
#endif
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
#endif
#include "client.h"
#include "../common/emu_opcodes.h"
#include "../common/eq_packet_structs.h"
#include "../common/packet_dump.h"
#include "../common/EQStreamIntf.h"
#include "worlddb.h"
#include "../common/Item.h"
#include "../common/races.h"
#include "../common/classes.h"
#include "../common/languages.h"
#include "../common/skills.h"
#include "../common/extprofile.h"
#include "../common/StringUtil.h"
#include "WorldConfig.h"
#include "LoginServer.h"
#include "LoginServerList.h"
#include "zoneserver.h"
#include "zonelist.h"
#include "clientlist.h"
#include "wguild_mgr.h"
#include "../common/rulesys.h"
#include "SoFCharCreateData.h"
#include "../common/clientversions.h"
std::vector<RaceClassAllocation> character_create_allocations;
std::vector<RaceClassCombos> character_create_race_class_combos;
@@ -252,7 +252,7 @@ void Client::SendMembershipSettings() {
Membership_Details_Struct* mds = (Membership_Details_Struct*)outapp->pBuffer;
mds->membership_setting_count = 66;
uint32 gold_settings[22] = {-1,-1,-1,-1,-1,-1,1,1,1,-1,1,-1,-1,1,1,1,1,1,1,-1,-1,0};
int32 gold_settings[22] = {-1,-1,-1,-1,-1,-1,1,1,1,-1,1,-1,-1,1,1,1,1,1,1,-1,-1,0};
uint32 entry_count = 0;
for (int setting_id=0; setting_id < 22; setting_id++)
{
@@ -1578,7 +1578,7 @@ bool CheckCharCreateInfoSoF(CharCreate_Struct *cc)
uint32 max_stats = 0;
uint32 allocs = character_create_allocations.size();
RaceClassAllocation allocation;
RaceClassAllocation allocation = {0};
found = false;
for(int i = 0; i < combos; ++i) {
if(character_create_allocations[i].Index == class_combo.AllocationIndex) {
world/world_logsys.cpp
+14 -12
View File
@@ -1,18 +1,21 @@
#include "../common/debug.h"
#include "../common/logsys.h"
#include "../common/StringUtil.h"
#include "zoneserver.h"
#include "client.h"
#include <stdarg.h>
#include <stdio.h>
void log_message_clientVA(LogType type, Client *who, const char *fmt, va_list args) {
char prefix_buffer[256];
snprintf(prefix_buffer, 255, "[%s] %s: ", log_type_info[type].name, who->GetAccountName());
prefix_buffer[255] = '\0';
LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args);
std::string prefix_buffer;
StringFormat(prefix_buffer,"[%s] %s: ", log_type_info[type].name, who->GetAccountName());
LogFile->writePVA(EQEMuLog::Debug, prefix_buffer.c_str(), fmt, args);
}
void log_message_client(LogType type, Client *who, const char *fmt, ...) {
@@ -24,18 +27,17 @@ void log_message_client(LogType type, Client *who, const char *fmt, ...) {
void log_message_zoneVA(LogType type, ZoneServer *who, const char *fmt, va_list args) {
char prefix_buffer[256];
char zone_tag[65];
std::string prefix_buffer, zone_tag;
const char *zone_name=who->GetZoneName();
if (*zone_name==0)
snprintf(zone_tag,64,"[%d]", who->GetID());
if (zone_name == nullptr)
StringFormat(zone_tag,"[%d]", who->GetID());
else
snprintf(zone_tag,64,"[%d] [%s]",who->GetID(),zone_name);
StringFormat(zone_tag,"[%d] [%s]",who->GetID(),zone_name);
snprintf(prefix_buffer, 255, "[%s] %s ", log_type_info[type].name, zone_tag);
prefix_buffer[255] = '\0';
StringFormat(prefix_buffer, "[%s] %s ", log_type_info[type].name, zone_tag.c_str());
LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args);
LogFile->writePVA(EQEMuLog::Debug, prefix_buffer.c_str(), fmt, args);
}
void log_message_zone(LogType type, ZoneServer *who, const char *fmt, ...) {