pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 08:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Spells via shared memory work, removal of blah, general fixes

Browse Source
This commit is contained in:
KimLS
2013-02-19 22:20:30 -08:00
parent acecff23f4
commit f8bae86082
17 changed files with 25 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/net.cpp
+7 -5
View File
@@ -43,7 +43,6 @@ using namespace std;
#define strcasecmp _stricmp
#endif
bool spells_loaded = false;
volatile bool RunLoops = true;
extern volatile bool ZoneLoaded;
#ifdef SHAREMEM
@@ -123,7 +122,7 @@ TaskManager *taskmanager = 0;
QuestParserCollection *parse = 0;
const SPDat_Spell_Struct* spells;
void LoadSPDat(EQEmu::MemoryMappedFile **mmf);
void LoadSpells(EQEmu::MemoryMappedFile **mmf);
int32 SPDAT_RECORDS = -1;
#ifdef _WINDOWS
@@ -260,7 +259,7 @@ int main(int argc, char** argv) {
}
_log(ZONE__INIT, "Loading spells");
EQEmu::MemoryMappedFile *mmf = NULL;
LoadSPDat(&mmf);
LoadSpells(&mmf);
_log(ZONE__INIT, "Loading guilds");
guild_mgr.LoadGuilds();
@@ -610,20 +609,23 @@ bool chrcmpI(const char* a, const char* b) {
return true;
}
void LoadSPDat(EQEmu::MemoryMappedFile **mmf) {
void LoadSpells(EQEmu::MemoryMappedFile **mmf) {
int records = database.GetMaxSpellID() + 1;
try {
EQEmu::IPCMutex mutex("spells");
mutex.Lock();
*mmf = new EQEmu::MemoryMappedFile("shared/spells");
if((*mmf)->Size() != records * sizeof(SPDat_Spell_Struct)) {
uint32 size = (*mmf)->Size();
if(size != (records * sizeof(SPDat_Spell_Struct))) {
EQ_EXCEPT("zone", "Unable to load spells: (*mmf)->Size() != records * sizeof(SPDat_Spell_Struct)");
}
spells = reinterpret_cast<SPDat_Spell_Struct*>((*mmf)->Get());
mutex.Unlock();
} catch(std::exception &ex) {
LogFile->write(EQEMuLog::Error, "Error loading spells: %s", ex.what());
return;
}
SPDAT_RECORDS = records;