pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-22 03:12:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge d5da4aa90badae1d115c728f1e62d3a2d5db83d1 into 9fdb6862f811c3afd4d4b05d6060dbd1e14f2c9b

Browse Source
This commit is contained in:
Arthur Ice 2013-03-10 16:15:43 -07:00
commit 1a63ac66e7
13 changed files with 576 additions and 533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/azone2/dat.cpp
View File

@ -136,7 +136,7 @@ DATLoader::~DATLoader()
this->Close(); this->Close();
} }
int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { int DATLoader::Open(char *base_path, const char *zone_name, Archive *archive) {
#ifdef DEBUGDAT #ifdef DEBUGDAT
printf("DATLoader::Open %s, [%s]\n", base_path, zone_name); printf("DATLoader::Open %s, [%s]\n", base_path, zone_name);

2
utils/azone2/dat.hpp
View File

@ -54,7 +54,7 @@ class DATLoader : public FileLoader {
public: public:
DATLoader(); DATLoader();
~DATLoader(); ~DATLoader();
virtual int Open(char *base_path, char *zone_name, Archive *archive); virtual int Open(char *base_path, const char *zone_name, Archive *archive);
virtual int Close(); virtual int Close();
}; };

2
utils/azone2/file_loader.hpp
View File

@ -9,7 +9,7 @@ public:
FileLoader() {} FileLoader() {}
virtual ~FileLoader() {} virtual ~FileLoader() {}
virtual int Open(char *base_path, char *zone_name, Archive *archive) = 0; virtual int Open(char *base_path, const char *zone_name, Archive *archive) = 0;
virtual int Close() = 0; virtual int Close() = 0;
Content_3D model_data; Content_3D model_data;

2
utils/azone2/ter.cpp
View File

@ -20,7 +20,7 @@ TERLoader::~TERLoader() {
this->Close(); this->Close();
} }
int TERLoader::Open(char *base_path, char *zone_name, Archive *archive) { int TERLoader::Open(char *base_path, const char *zone_name, Archive *archive) {
#ifdef DEBUGTER #ifdef DEBUGTER
printf("TERLoader::Open %s, [%s]\n", base_path, zone_name); printf("TERLoader::Open %s, [%s]\n", base_path, zone_name);

2
utils/azone2/ter.hpp
View File

@ -55,7 +55,7 @@ class TERLoader : public FileLoader {
public: public:
TERLoader(); TERLoader();
~TERLoader(); ~TERLoader();
virtual int Open(char *base_path, char *zone_name, Archive *archive); virtual int Open(char *base_path, const char *zone_name, Archive *archive);
virtual int Close(); virtual int Close();
}; };

2
utils/azone2/wld.cpp
View File

@ -461,7 +461,7 @@ WLDLoader::~WLDLoader() {
this->Close(); this->Close();
} }
int WLDLoader::Open(char *base_path, char *zone_name, Archive *archive) { int WLDLoader::Open(char *base_path, const char *zone_name, Archive *archive) {
uchar *buffer; uchar *buffer;
int buf_len; int buf_len;
int i, j, vc, pc, bc, mlen, *pmap; int i, j, vc, pc, bc, mlen, *pmap;

2
utils/azone2/wld.hpp
View File

@ -34,7 +34,7 @@ public:
WLDLoader(); WLDLoader();
~WLDLoader(); ~WLDLoader();
virtual int Open(char *base_path, char *zone_name, Archive *archive); virtual int Open(char *base_path, const char *zone_name, Archive *archive);
virtual int Close(); virtual int Close();
int fragcount; int fragcount;

2
utils/azone2/zon.cpp
View File

@ -22,7 +22,7 @@ ZonLoader::~ZonLoader() {
this->Close(); this->Close();
} }
int ZonLoader::Open(char *base_path, char *zone_name, Archive *archive) { int ZonLoader::Open(char *base_path, const char *zone_name, Archive *archive) {
uchar *buffer, *orig_buffer; uchar *buffer, *orig_buffer;
int buf_len; int buf_len;

2
utils/azone2/zon.hpp
View File

@ -36,7 +36,7 @@ public:
ZonLoader(); ZonLoader();
~ZonLoader(); ~ZonLoader();
virtual int Open(char *base_path, char *zone_name, Archive *archive); virtual int Open(char *base_path, const char *zone_name, Archive *archive);
virtual int Close(); virtual int Close();
private: private:

2
utils/azone2/zonv4.cpp
View File

@ -24,7 +24,7 @@ Zonv4Loader::~Zonv4Loader()
this->Close(); this->Close();
} }
int Zonv4Loader::Open(char *base_path, char *zone_name, Archive *archive) int Zonv4Loader::Open(char *base_path, const char *zone_name, Archive *archive)
{ {
uchar *buffer; uchar *buffer;

2
utils/azone2/zonv4.hpp
View File

@ -32,7 +32,7 @@ public:
Zonv4Loader(); Zonv4Loader();
~Zonv4Loader(); ~Zonv4Loader();
virtual int Open(char *base_path, char *zone_name, Archive *archive); virtual int Open(char *base_path, const char *zone_name, Archive *archive);
virtual int Close(); virtual int Close();
private: private:

1078
world/client.cpp
View File

File diff suppressed because it is too large Load Diff

9
world/client.h
View File

@ -90,7 +90,14 @@ private:
void SetClassStartingSkills( PlayerProfile_Struct *pp ); void SetClassStartingSkills( PlayerProfile_Struct *pp );
void SetRaceStartingSkills( PlayerProfile_Struct *pp ); void SetRaceStartingSkills( PlayerProfile_Struct *pp );
void SetRacialLanguages( PlayerProfile_Struct *pp ); void SetRacialLanguages( PlayerProfile_Struct *pp );
bool HandleLoginInfoPacket(const EQApplicationPacket *app);
bool HandleApproveNamePacket(const EQApplicationPacket *app);
bool HandleRandomNameGeneratorPacket(const EQApplicationPacket *app);
bool HandleCharacterCreateRequestPacket(const EQApplicationPacket *app);
bool HandleCharacterCreatePacket(const EQApplicationPacket *app);
bool HandleEnterWorldPacket(const EQApplicationPacket *app);
ClientListEntry* cle; ClientListEntry* cle;
Timer CLE_keepalive_timer; Timer CLE_keepalive_timer;
Timer connect; Timer connect;