games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Code Issues Releases Activity

Fix compilation problems

Browse Source
This commit is contained in:
nordsoft 2022-09-04 18:52:24 +04:00
parent 149790ad2d
commit 8e953c223e
6 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mapeditor/Animation.h
View File

@ -1,7 +1,6 @@
#ifndef ANIMATION_H #ifndef ANIMATION_H
#define ANIMATION_H #define ANIMATION_H
#include "../lib/vcmi_endian.h"
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
#include "../lib/GameConstants.h" #include "../lib/GameConstants.h"
#include <QRgb> #include <QRgb>

1
mapeditor/BitmapHandler.cpp
View File

@ -11,7 +11,6 @@
#include "../lib/filesystem/Filesystem.h" #include "../lib/filesystem/Filesystem.h"
#include "BitmapHandler.h" #include "BitmapHandler.h"
#include "../lib/vcmi_endian.h"
#include <QBitmap> #include <QBitmap>
#include <QImage> #include <QImage>

3
mapeditor/BitmapHandler.h
View File

@ -7,6 +7,9 @@
#pragma once #pragma once
#define read_le_u16(p) (* reinterpret_cast<const ui16 *>(p))
#define read_le_u32(p) (* reinterpret_cast<const ui32 *>(p))
namespace BitmapHandler namespace BitmapHandler
{ {
//Load file from /DATA or /SPRITES //Load file from /DATA or /SPRITES

6
mapeditor/CGameInfo.cpp
View File

@ -38,7 +38,6 @@ void CGameInfo::setFromLib()
skillh = VLC->skillh; skillh = VLC->skillh;
objtypeh = VLC->objtypeh; objtypeh = VLC->objtypeh;
battleFieldHandler = VLC->battlefieldsHandler; battleFieldHandler = VLC->battlefieldsHandler;
obstacleHandler = VLC->obstacleHandler;
} }
const ArtifactService * CGameInfo::artifacts() const const ArtifactService * CGameInfo::artifacts() const
@ -86,11 +85,6 @@ const SkillService * CGameInfo::skills() const
return globalServices->skills(); return globalServices->skills();
} }
const ObstacleService * CGameInfo::obstacles() const
{
return globalServices->obstacles();
}
void CGameInfo::updateEntity(Metatype metatype, int32_t index, const JsonNode & data) void CGameInfo::updateEntity(Metatype metatype, int32_t index, const JsonNode & data)
{ {
logGlobal->error("CGameInfo::updateEntity call is not expected."); logGlobal->error("CGameInfo::updateEntity call is not expected.");

1
mapeditor/CGameInfo.h
View File

@ -63,7 +63,6 @@ public:
const spells::Service * spells() const override; const spells::Service * spells() const override;
const SkillService * skills() const override; const SkillService * skills() const override;
const BattleFieldService * battlefields() const override; const BattleFieldService * battlefields() const override;
const ObstacleService * obstacles() const override;
void updateEntity(Metatype metatype, int32_t index, const JsonNode & data) override; void updateEntity(Metatype metatype, int32_t index, const JsonNode & data) override;

1
mapeditor/graphics.cpp
View File

@ -29,7 +29,6 @@
#include "BitmapHandler.h" #include "BitmapHandler.h"
#include "../lib/CGameState.h" #include "../lib/CGameState.h"
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
#include "../lib/vcmi_endian.h"
#include "../lib/CStopWatch.h" #include "../lib/CStopWatch.h"
#include "../lib/mapObjects/CObjectClassesHandler.h" #include "../lib/mapObjects/CObjectClassesHandler.h"
#include "../lib/mapObjects/CObjectHandler.h" #include "../lib/mapObjects/CObjectHandler.h"