diff options
| -rw-r--r-- | contrib/extractor/System.cpp | 9 | ||||
| -rw-r--r-- | contrib/extractor/ad.exe | bin | 163328 -> 162816 bytes | |||
| -rw-r--r-- | sql/mangos.sql | 3 | ||||
| -rw-r--r-- | src/game/Language.h | 3 | ||||
| -rw-r--r-- | src/game/Level1.cpp | 6 | ||||
| -rw-r--r-- | src/game/Map.h | 2 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
7 files changed, 17 insertions, 8 deletions
diff --git a/contrib/extractor/System.cpp b/contrib/extractor/System.cpp index 7d498102603..2696c7b1a2b 100644 --- a/contrib/extractor/System.cpp +++ b/contrib/extractor/System.cpp @@ -207,7 +207,7 @@ void ReadLiquidTypeTableDBC() // Map file format data #define MAP_MAGIC 'SPAM' -#define MAP_VERSION_MAGIC '0.1v' +#define MAP_VERSION_MAGIC '0.1w' #define MAP_AREA_MAGIC 'AERA' #define MAP_HEIGTH_MAGIC 'TGHM' #define MAP_LIQUID_MAGIC 'QILM' @@ -304,7 +304,6 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x) memset(liquid_show, 0, sizeof(liquid_show)); memset(liquid_type, 0, sizeof(liquid_type)); - memset(liquid_height, 0, sizeof(liquid_height)); // Prepare map header map_fileheader map; @@ -709,6 +708,8 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x) if (maxHeight < h) maxHeight = h; if (minHeight > h) minHeight = h; } + else + liquid_height[y][x] = CONF_use_minHeight; } } map.liquidMapOffset = map.heightMapOffset + map.heightMapSize; @@ -812,11 +813,11 @@ void ExtractMapsFromMpq() printf("Convert map files\n"); for(uint32 z = 0; z < map_count; ++z) { - printf("Extract %s (%d/%d) \n", map_ids[z].name, z, map_count); + printf("Extract %s (%d/%d) \n", map_ids[z].name, z+1, map_count); // Loadup map grid data sprintf(mpq_map_name, "World\\Maps\\%s\\%s.wdt", map_ids[z].name, map_ids[z].name); WDT_file wdt; - if (!wdt.loadFile(mpq_map_name)) + if (!wdt.loadFile(mpq_map_name, false)) { // printf("Error loading %s map wdt data\n", map_ids[z].name); continue; diff --git a/contrib/extractor/ad.exe b/contrib/extractor/ad.exe Binary files differindex f3a475c4e64..8300b697cef 100644 --- a/contrib/extractor/ad.exe +++ b/contrib/extractor/ad.exe diff --git a/sql/mangos.sql b/sql/mangos.sql index fed04397b1d..813a008785b 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7422_01_mangos_mangos_string` bit(1) default NULL + `required_7439_01_mangos_mangos_string` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -2408,6 +2408,7 @@ INSERT INTO `mangos_string` VALUES (172,'server console command',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (173,'You changed runic power of %s to %i/%i.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (174,'%s changed your runic power to %i/%i.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(175,'Liquid level: %f, ground: %f, type: %d, status: %d',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (200,'No selection.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (201,'Object GUID is: lowpart %u highpart %X',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (202,'The name was too long by %i characters.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), diff --git a/src/game/Language.h b/src/game/Language.h index be303c294e4..4662017110e 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -172,7 +172,8 @@ enum TrinityStrings LANG_CONSOLE_COMMAND = 172, LANG_YOU_CHANGE_RUNIC_POWER = 173, LANG_YOURS_RUNIC_POWER_CHANGED = 174, - // Room for more level 1 175-199 not used + LANG_LIQUID_STATUS = 175, + // Room for more level 1 176-199 not used // level 2 chat LANG_NO_SELECTION = 200, diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 78e32e62574..346547e0c4b 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -733,6 +733,12 @@ bool ChatHandler::HandleGPSCommand(const char* args) cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), obj->GetInstanceId(), zone_x, zone_y, ground_z, floor_z, have_map, have_vmap ); + LiquidData liquid_status; + ZLiquidStatus res = map->getLiquidStatus(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), MAP_ALL_LIQUIDS, &liquid_status); + if (res) + { + PSendSysMessage(LANG_LIQUID_STATUS, liquid_status.level, liquid_status.depth_level, liquid_status.type, res); + } return true; } diff --git a/src/game/Map.h b/src/game/Map.h index 0d03970e102..3a2c4e8e2fd 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -74,7 +74,7 @@ typedef Trinity::SingleThreaded<GridRWLock>::Lock NullGuard; // Map file format defines //****************************************** #define MAP_MAGIC 'SPAM' -#define MAP_VERSION_MAGIC '0.1v' +#define MAP_VERSION_MAGIC '0.1w' #define MAP_AREA_MAGIC 'AERA' #define MAP_HEIGTH_MAGIC 'TGHM' #define MAP_LIQUID_MAGIC 'QILM' diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 838a591c8f1..b4cca70987c 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7438" + #define REVISION_NR "7439" #endif // __REVISION_NR_H__ |