games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

alignment & makefile fix

Browse Source
This commit is contained in:
Zyx-2000 2016-01-29 16:08:44 +01:00
parent 2b88de8e24
commit 7fbd5479e2
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/gui/CAnimation.cpp
View File

@ -75,9 +75,9 @@ class CFileCache
static const int cacheSize = 50; //Max number of cached files
struct FileData
{
ResourceID name;
size_t size;
std::unique_ptr<ui8[]> data;
ResourceID name;
size_t size;
std::unique_ptr<ui8[]> data;
std::unique_ptr<ui8[]> getCopy()
{

4
client/gui/CAnimation.h
View File

@ -39,8 +39,8 @@ private:
//offset[group][frame] - offset of frame data in file
std::map<size_t, std::vector <size_t> > offset;
std::unique_ptr<ui8[]> data;
std::unique_ptr<SDL_Color[]> palette;
std::unique_ptr<ui8[]> data;
std::unique_ptr<SDL_Color[]> palette;
public:
CDefFile(std::string Name);

2
lib/CMakeLists.txt
View File

@ -11,11 +11,11 @@ set(lib_SRCS
filesystem/CCompressedStream.cpp
filesystem/CFilesystemLoader.cpp
filesystem/CArchiveLoader.cpp
filesystem/CFileInfo.cpp
filesystem/CMemoryStream.cpp
filesystem/CBinaryReader.cpp
filesystem/CFileInputStream.cpp
filesystem/CZipLoader.cpp
filesystem/FileInfo.cpp
filesystem/Filesystem.cpp
filesystem/FileStream.cpp
filesystem/ResourceID.cpp

14
lib/filesystem/ResourceID.cpp
View File

@ -53,17 +53,15 @@ ResourceID::ResourceID()
}
#endif
ResourceID::ResourceID(std::string name_)
:type{readType(name_)},
ResourceID::ResourceID(std::string name_):
type{readType(name_)},
name{readName(std::move(name_))}
{
}
{}
ResourceID::ResourceID(std::string name_, EResType::Type type_)
:type{type_},
ResourceID::ResourceID(std::string name_, EResType::Type type_):
type{type_},
name{readName(std::move(name_))}
{
}
{}
#if 0
std::string ResourceID::getName() const
{