Laizerox

I ran small tests and did come to result that linux refuses to read 3 .MPQ files... These files are common, common-2 and new lichking one. In other way I tried to open them in text editor and text editor fails to open them as well where as it can open others... So I have no idea what causes the real problem...

Extractor compile for linux. This diff file won't apply automatically! diff -Naur extractor_b/extractor_v2/CMakeLists.txt extractor_a/extractor_v2/CMakeLists.txt --- extractor_b/extractor_v2/CMakeLists.txt 2009-03-01 21:07:18.000000000 +0200 +++ extractor_a/extractor_v2/CMakeLists.txt 2009-03-08 12:02:17.000000000 +0200 @@ -20,7 +20,7 @@ link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq) link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib) -add_executable (ad dbcfile.cpp mpq_libmpq.cpp System.cpp) +add_executable (ad dbcfile.cpp mpq_libmpq.cpp system.cpp) target_link_libraries (ad libmpq) target_link_libraries (ad loadlib) diff -Naur extractor_b/extractor_v2/loadlib/adt.cpp extractor_a/extractor_v2/loadlib/adt.cpp --- extractor_b/extractor_v2/loadlib/adt.cpp 2001-01-01 01:59:16.000000000 +0200 +++ extractor_a/extractor_v2/loadlib/adt.cpp 2009-03-08 13:38:48.000000000 +0200 @@ -1,7 +1,13 @@ #define _CRT_SECURE_NO_DEPRECATE #ifdef WIN32 -#include <windows.h> +#include <windows.h> +#else +#include <stdint.h> +#endif + +#ifndef uint64_t +#include <linux/types.h> #endif #include "adt.h" @@ -132,4 +138,4 @@ return false; return true; -} \\ No newline at end of file +} diff -Naur extractor_b/extractor_v2/loadlib/loadlib.cpp extractor_a/extractor_v2/loadlib/loadlib.cpp --- extractor_b/extractor_v2/loadlib/loadlib.cpp 2001-01-01 00:48:54.000000000 +0200 +++ extractor_a/extractor_v2/loadlib/loadlib.cpp 2009-03-08 13:39:40.000000000 +0200 @@ -1,11 +1,17 @@ #define _CRT_SECURE_NO_DEPRECATE #ifdef WIN32 -#include <windows.h> +#include <windows.h> +#else +#include <stdint.h> +#endif + +#ifndef uint64_t +#include <linux/types.h> #endif #include "loadlib.h" -#include "..\\mpq_libmpq.h" +#include "../mpq_libmpq.h" class MPQFile; @@ -64,4 +70,4 @@ data = 0; data_size = 0; version = 0; -} \\ No newline at end of file +} diff -Naur extractor_b/extractor_v2/loadlib/loadlib.h extractor_a/extractor_v2/loadlib/loadlib.h --- extractor_b/extractor_v2/loadlib/loadlib.h 2001-01-01 00:55:08.000000000 +0200 +++ extractor_a/extractor_v2/loadlib/loadlib.h 2009-03-08 13:40:38.000000000 +0200 @@ -1,11 +1,17 @@ #ifndef LOAD_LIB_H #define LOAD_LIB_H +#ifdef WIN32 typedef __int64 int64; +typedef unsigned __int64 uint64; +#else +typedef int64_t int64; +typedef uint64_t uint64; +#endif + typedef long int32; typedef short int16; typedef char int8; -typedef unsigned __int64 uint64; typedef unsigned long uint32; typedef unsigned short uint16; typedef unsigned char uint8; diff -Naur extractor_b/extractor_v2/loadlib/wdt.cpp extractor_a/extractor_v2/loadlib/wdt.cpp --- extractor_b/extractor_v2/loadlib/wdt.cpp 2001-01-01 00:49:18.000000000 +0200 +++ extractor_a/extractor_v2/loadlib/wdt.cpp 2009-03-08 13:39:46.000000000 +0200 @@ -1,7 +1,13 @@ #define _CRT_SECURE_NO_DEPRECATE #ifdef WIN32 -#include <windows.h> +#include <windows.h> +#else +#include <stdint.h> +#endif + +#ifndef uint64_t +#include <linux/types.h> #endif #include "wdt.h" @@ -63,4 +69,4 @@ if (!wmo->prepareLoadedData()) return false; return true; -} \\ No newline at end of file +} diff -Naur extractor_b/extractor_v2/loadlib/wdt.h extractor_a/extractor_v2/loadlib/wdt.h --- extractor_b/extractor_v2/loadlib/wdt.h 2001-01-01 02:01:20.000000000 +0200 +++ extractor_a/extractor_v2/loadlib/wdt.h 2009-03-08 11:57:19.000000000 +0200 @@ -65,4 +65,5 @@ wdt_MWMO *wmo; }; -#endif \\ No newline at end of file +#endif + diff -Naur extractor_b/extractor_v2/mpq_libmpq.h extractor_a/extractor_v2/mpq_libmpq.h --- extractor_b/extractor_v2/mpq_libmpq.h 2009-02-23 00:53:52.000000000 +0200 +++ extractor_a/extractor_v2/mpq_libmpq.h 2009-03-08 13:40:53.000000000 +0200 @@ -13,11 +13,17 @@ using namespace std; +#ifdef WIN32 typedef __int64 int64; +typedef unsigned __int64 uint64; +#else +typedef int64_t int64; +typedef uint64_t uint64; +#endif + typedef long int32; typedef short int16; typedef char int8; -typedef unsigned __int64 uint64; typedef unsigned long uint32; typedef unsigned short uint16; typedef unsigned char uint8; diff -Naur extractor_b/extractor_v2/system.cpp extractor_a/extractor_v2/system.cpp --- extractor_b/extractor_v2/system.cpp 2009-03-07 00:22:17.000000000 +0200 +++ extractor_a/extractor_v2/system.cpp 2009-03-08 11:55:52.000000000 +0200 @@ -14,8 +14,8 @@ #include "dbcfile.h" #include "mpq_libmpq.h" -#include "loadlib\\adt.h" -#include "loadlib\\wdt.h" +#include "loadlib/adt.h" +#include "loadlib/wdt.h" extern ArchiveSet gOpenArchives;

SD2 should also handle 10h continent wide mob spawning from obelisks in AQ event after opening gates ... I can make obelisks spawn for 10h but they will do nothing without sd2

Nice to see w12x this here ... Now I may start working on AQ as I said (if no one has started it)...