nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-14 01:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core): Activate creatures and objects during opening cinematics (#4045)

Browse Source 
Co-authored-by: Si1ker <55638679+Sombranator@users.noreply.github.com>
Co-authored-by: Stefano Borzì <stefanoborzi32@gmail.com>
This commit is contained in:
Silker
2021-01-22 00:03:30 +00:00
committed by GitHub
parent f07966fd3e
commit 0a8a7ef149
14 changed files with 785 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/tools/map_extractor/System.cpp
View File

@@ -10,6 +10,7 @@
#include <cstdlib>
#include <deque>
#include <set>
#include <filesystem>
#ifdef _WIN32
#include "direct.h"
@@ -62,12 +63,13 @@ char input_path[MAX_PATH_LENGTH] = ".";
// **************************************************
enum Extract
{
EXTRACT_MAP = 1,
EXTRACT_DBC = 2
EXTRACT_MAP = 1,
EXTRACT_DBC = 2,
EXTRACT_CAMERA = 4
};
// Select data for extract
int CONF_extract = EXTRACT_MAP | EXTRACT_DBC;
int CONF_extract = EXTRACT_MAP | EXTRACT_DBC | EXTRACT_CAMERA;
// This option allow limit minimum height to some value (Allow save some memory)
bool CONF_allow_height_limit = true;
float CONF_use_minHeight = -500.0f;
@@ -140,7 +142,7 @@ void Usage(char* prg)
"%s -[var] [value]\n"\
"-i set input path\n"\
"-o set output path\n"\
"-e extract only MAP(1)/DBC(2) - standard: both(3)\n"\
"-e extract only MAP(1)/DBC(2)/Camera(4) - standard: all(7)\n"\
"-f height stored as int (less map size but lost some accuracy) 1 by default\n"\
"Example: %s -f 0 -i \"c:\\games\\game\"", prg, prg);
exit(1);
@@ -156,37 +158,55 @@ void HandleArgs(int argc, char* arg[])
// f - use float to int conversion
// h - limit minimum height
if (arg[c][0] != '-')
{
Usage(arg[0]);
}
switch (arg[c][1])
{
case 'i':
if (c + 1 < argc) // all ok
{
strcpy(input_path, arg[(c++) + 1]);
}
else
{
Usage(arg[0]);
}
break;
case 'o':
if (c + 1 < argc) // all ok
{
strcpy(output_path, arg[(c++) + 1]);
}
else
{
Usage(arg[0]);
}
break;
case 'f':
if (c + 1 < argc) // all ok
{
CONF_allow_float_to_int = atoi(arg[(c++) + 1]) != 0;
}
else
{
Usage(arg[0]);
}
break;
case 'e':
if (c + 1 < argc) // all ok
{
CONF_extract = atoi(arg[(c++) + 1]);
if (!(CONF_extract > 0 && CONF_extract < 4))
if (!(CONF_extract > 0 && CONF_extract < 8))
{
Usage(arg[0]);
}
}
else
{
Usage(arg[0]);
}
break;
}
}
@@ -1048,6 +1068,62 @@ void ExtractDBCFiles(int locale, bool basicLocale)
printf("Extracted %u DBC files\n\n", count);
}
void ExtractCameraFiles(int locale, bool basicLocale)
{
printf("Extracting camera files...\n");
DBCFile camdbc("DBFilesClient\\CinematicCamera.dbc");
if (!camdbc.open())
{
printf("Unable to open CinematicCamera.dbc. Camera extract aborted.\n");
return;
}
// get camera file list from DBC
std::vector<std::string> camerafiles;
size_t cam_count = camdbc.getRecordCount();
for (uint32 i = 0; i < cam_count; ++i)
{
std::string camFile(camdbc.getRecord(i).getString(1));
size_t loc = camFile.find(".mdx");
if (loc != std::string::npos)
{
camFile.replace(loc, 4, ".m2");
}
camerafiles.push_back(std::string(camFile));
}
std::string path = output_path;
path += "/Cameras/";
CreateDir(path);
if (!basicLocale)
{
path += langs[locale];
path += "/";
CreateDir(path);
}
// extract M2s
uint32 count = 0;
for (std::string thisFile : camerafiles)
{
std::string filename = path;
filename += (thisFile.c_str() + strlen("Cameras\\"));
if (std::filesystem::exists(filename))
{
continue;
}
if (ExtractFile(thisFile.c_str(), filename))
{
++count;
}
}
printf("Extracted %u camera files\n", count);
}
void LoadLocaleMPQFiles(int const locale)
{
char filename[512];
@@ -1136,6 +1212,19 @@ int main(int argc, char* arg[])
return 0;
}
if (CONF_extract & EXTRACT_CAMERA)
{
printf("Using locale: %s\n", langs[FirstLocale]);
// Open MPQs
LoadLocaleMPQFiles(FirstLocale);
LoadCommonMPQFiles();
ExtractCameraFiles(FirstLocale, true);
// Close MPQs
CloseMPQFiles();
}
if (CONF_extract & EXTRACT_MAP)
{
printf("Using locale: %s\n", langs[FirstLocale]);