games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Removed CGI in favor of VLC. Map handle is for now global variable

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-10 22:52:48 +00:00
parent f657e85305
commit ffd37a8fa8
106 changed files with 940 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/media/CMusicHandler.cpp
View File

@@ -10,7 +10,6 @@
#include "StdInc.h"
#include "CMusicHandler.h"
#include "../CGameInfo.h"
#include "../eventsSDL/InputHandler.h"
#include "../GameEngine.h"
#include "../renderSDL/SDLRWwrapper.h"
@@ -21,6 +20,7 @@
#include "../../lib/CRandomGenerator.h"
#include "../../lib/TerrainHandler.h"
#include "../../lib/filesystem/Filesystem.h"
#include "../../lib/VCMI_Lib.h"
void CMusicHandler::onVolumeChange(const JsonNode & volumeNode)
{
@@ -63,13 +63,13 @@ CMusicHandler::CMusicHandler():
void CMusicHandler::loadTerrainMusicThemes()
{
for(const auto & terrain : CGI->terrainTypeHandler->objects)
for(const auto & terrain : VLC->terrainTypeHandler->objects)
{
for(const auto & filename : terrain->musicFilename)
addEntryToSet("terrain_" + terrain->getJsonKey(), filename);
}
for(const auto & faction : CGI->townh->objects)
for(const auto & faction : VLC->townh->objects)
{
if (!faction || !faction->hasTown())
continue;