mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-04-08 22:23:50 +00:00
Merge commit '32bb0becc8' into chore/game-screen-extract
This commit is contained in:
commit
43aecab1ef
145 changed files with 3237 additions and 2849 deletions
|
|
@ -48,7 +48,6 @@
|
|||
#include "pipeline/dbc_layout.hpp"
|
||||
|
||||
#include <SDL2/SDL.h>
|
||||
// GL/glew.h removed — Vulkan migration Phase 1
|
||||
#include <cstdlib>
|
||||
#include <climits>
|
||||
#include <algorithm>
|
||||
|
|
@ -256,7 +255,6 @@ bool Application::initialize() {
|
|||
|
||||
// Create subsystems
|
||||
authHandler = std::make_unique<auth::AuthHandler>();
|
||||
gameHandler = std::make_unique<game::GameHandler>();
|
||||
world = std::make_unique<game::World>();
|
||||
|
||||
// Create and initialize expansion registry
|
||||
|
|
@ -268,6 +266,14 @@ bool Application::initialize() {
|
|||
// Create asset manager
|
||||
assetManager = std::make_unique<pipeline::AssetManager>();
|
||||
|
||||
// Populate game services — all subsystems now available
|
||||
gameServices_.renderer = renderer.get();
|
||||
gameServices_.assetManager = assetManager.get();
|
||||
gameServices_.expansionRegistry = expansionRegistry_.get();
|
||||
|
||||
// Create game handler with explicit service dependencies
|
||||
gameHandler = std::make_unique<game::GameHandler>(gameServices_);
|
||||
|
||||
// Try to get WoW data path from environment variable
|
||||
const char* dataPathEnv = std::getenv("WOW_DATA_PATH");
|
||||
std::string dataPath = dataPathEnv ? dataPathEnv : "./Data";
|
||||
|
|
@ -914,6 +920,7 @@ void Application::shutdown() {
|
|||
world.reset();
|
||||
LOG_WARNING("Resetting gameHandler...");
|
||||
gameHandler.reset();
|
||||
gameServices_ = {};
|
||||
LOG_WARNING("Resetting authHandler...");
|
||||
authHandler.reset();
|
||||
LOG_WARNING("Resetting assetManager...");
|
||||
|
|
@ -5657,6 +5664,8 @@ void Application::buildCreatureDisplayLookups() {
|
|||
|
||||
gryphonDisplayId_ = resolveDisplayIdForExactPath("Creature\\Gryphon\\Gryphon.m2");
|
||||
wyvernDisplayId_ = resolveDisplayIdForExactPath("Creature\\Wyvern\\Wyvern.m2");
|
||||
gameServices_.gryphonDisplayId = gryphonDisplayId_;
|
||||
gameServices_.wyvernDisplayId = wyvernDisplayId_;
|
||||
LOG_INFO("Taxi mount displayIds: gryphon=", gryphonDisplayId_, " wyvern=", wyvernDisplayId_);
|
||||
|
||||
// CharHairGeosets.dbc: maps (race, sex, hairStyleId) → skinSectionId for hair mesh
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue