QuasarApp/Snake
4
1
Fork 0
mirror of https://github.com/QuasarApp/Snake.git synced 2025-04-26 17:54:42 +00:00
Code Issues Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Andrei Yankovich 2021-08-13 17:35:42 +03:00
parent 8979ba73ce
commit c97cf9f4e0
30 changed files with 221 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Client/languages/de.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

11
src/Client/languages/en.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

11
src/Client/languages/es.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="ru">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

11
src/Client/languages/fr.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

11
src/Client/languages/ja.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

11
src/Client/languages/pl.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

11
src/Client/languages/ru.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

11
src/Client/languages/tr.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

11
src/Client/languages/uk.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

11
src/Client/languages/zh.ts
View File

@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AbstractLvl::AbsLvlSnake</name>
<message>
<source>AbsLvlSnake</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AbsLvlSnake Snake</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AbstractLvl::AbsLvlWorld</name>
<message>

2
src/Core/Crawl/clientapp.h
View File

@ -62,7 +62,7 @@ public:
static_assert(std::is_base_of_v<ILevel, LevelType>,
"Plrease use the child classes of the ILevel interface for tegistering new levels in the crawl game.");
addLvl(LevelType().world());
addLvl(new LevelType());
}
private:

4
src/Core/CrawlModule/Crawl.qml
View File

@ -24,13 +24,13 @@ ApplicationWindow {
Scene {
id: scane;
model: (model)? model.world : null;
worldModel: (model)? model.world : null;
anchors.fill: parent;
}
Scene {
id: nest;
model: (model)? model.world : null;
worldModel: (model)? model.world : null;
anchors.fill: parent;
}

1
src/CrawlAbstractLvl/abstractlevel.cpp
View File

@ -12,6 +12,5 @@ AbstractLevel::AbstractLevel() {
initAbstractLvlResources();
setWorld(new AbstractLvl::AbsLvlWorld());
setPreviewScane(new AbstractLvl::AbsLvlWorld());
}

25
src/CrawlAbstractLvl/private/abslvlsnake.cpp
View File

@ -30,5 +30,30 @@ AbsLvlSnake::AbsLvlSnake(): Snake(AUTO_CLASS_NAME) {
registerItemType<AbsLvlSnakeItem>();
}
QString AbsLvlSnake::itemTextId() const {
return "AbsLvlSnake";
}
QString AbsLvlSnake::itemName() const {
return tr("AbsLvlSnake");
}
QString AbsLvlSnake::description() const {
return tr("AbsLvlSnake Snake");
}
QString AbsLvlSnake::image() const {
return "";
}
int AbsLvlSnake::cost() const {
return 0;
}
int AbsLvlSnake::requiredTier() const {
return 0;
}
}

9
src/CrawlAbstractLvl/private/abslvlsnake.h
View File

@ -19,6 +19,15 @@ class AbsLvlSnake : public CRAWL::Snake {
public:
AbsLvlSnake();
// IItem interface
public:
QString itemTextId() const override;
QString itemName() const override;
QString description() const override;
QString image() const override;
int cost() const override;
int requiredTier() const override;
};
}

2
src/CrawlAbstractLvl/private/abslvlworld.cpp
View File

@ -23,7 +23,7 @@ AbsLvlWorld::AbsLvlWorld() {
setCameraRotation(QQuaternion::fromEulerAngles({0,0,0}));
}
CRAWL::PlayableObject *AbsLvlWorld::initPlayer() const {
CRAWL::PlayableObject *AbsLvlWorld::initPlayer(int) const {
return new AbsLvlSnake();
}

2
src/CrawlAbstractLvl/private/abslvlworld.h
View File

@ -19,7 +19,7 @@ public:
AbsLvlWorld();
CRAWL::PlayableObject *initPlayer() const override;
CRAWL::PlayableObject *initPlayer(int type) const override;
CRAWL::WorldRule *initWorldRules() override;
QString initHdrBackGround() const override;
QString description() const override;

24
src/CrawlTestLvl/private/testsnake.cpp
View File

@ -25,4 +25,28 @@ TestSnake::TestSnake(): Snake("Snake") {
unsigned int TestSnake::itemsCount() const {
return 50;
}
QString TestSnake::itemTextId() const {
return "TestSnake";
}
QString TestSnake::itemName() const {
return tr("TestSnake");
}
QString TestSnake::description() const {
return tr("TestSnake Snake");
}
QString TestSnake::image() const {
return "";
}
int TestSnake::cost() const {
return 0;
}
int TestSnake::requiredTier() const {
return 0;
}
}

9
src/CrawlTestLvl/private/testsnake.h
View File

@ -23,6 +23,15 @@ public:
// AutoGenerateClaster interface
public:
unsigned int itemsCount() const override;
// IItem interface
public:
QString itemTextId() const override;
QString itemName() const override;
QString description() const override;
QString image() const override;
int cost() const override;
int requiredTier() const override;
};
}

2
src/CrawlTestLvl/private/world.cpp
View File

@ -73,7 +73,7 @@ void World::initControl(CRAWL::IControl *control) {
return IWorld::initControl(control);
}
CRAWL::PlayableObject *World::initPlayer() const {
CRAWL::PlayableObject *World::initPlayer(int) const {
return new TestSnake();
}

2
src/CrawlTestLvl/private/world.h
View File

@ -28,7 +28,7 @@ public:
int cost() const override;
CRAWL::IControl *initUserInterface() const override;
void initControl(CRAWL::IControl *control) override;
CRAWL::PlayableObject *initPlayer() const override;
CRAWL::PlayableObject *initPlayer(int type) const override;
CRAWL::IAI *initBackGroundAI() const override;
QString itemTextId() const override;
int requiredTier() const override;

6
src/CrawlTestLvl/testlevel.cpp
View File

@ -9,10 +9,6 @@
#include "world.h"
TestLevel::TestLevel() {
}
CRAWL::IWorld *TestLevel::world() {
initTestLvlResources();
return new TestLvl::World();
setWorld(new TestLvl::World());
}

4
src/CrawlTestLvl/testlevel.h
View File

@ -21,10 +21,6 @@ class CRAWL_TEST_LEVEL_EXPORT TestLevel: public CRAWL::ILevel
{
public:
TestLevel();
// ILevel interface
public:
CRAWL::IWorld *world() override;
};
#endif // TESTLVL_H

7
src/JungleLvl/jungle.cpp
View File

@ -10,10 +10,7 @@
#include "world.h"
Jungle::Jungle() {
}
CRAWL::IWorld *Jungle::world() {
initJungleLvlResources();
return new JungleLvl::World();
setWorld(new JungleLvl::World());
}

3
src/JungleLvl/jungle.h
View File

@ -26,9 +26,6 @@ class CRAWL_JUNGLE_LEVEL_EXPORT Jungle: public CRAWL::ILevel
public:
Jungle();
// ILevel interface
public:
CRAWL::IWorld *world() override;
};
#endif // JUNGLE_H

24
src/JungleLvl/private/snake.cpp
View File

@ -31,6 +31,30 @@ Snake::Snake(): CRAWL::Snake("JungleSnake") {
{1, 0.5}});
}
QString Snake::itemTextId() const {
return "JungleSnake";
}
QString Snake::itemName() const {
return tr("JungleSnake");
}
QString Snake::description() const {
return tr("JungleSnake Snake");;
}
QString Snake::image() const {
return "";
}
int Snake::cost() const {
return 0;
}
int Snake::requiredTier() const {
return 0;
}
unsigned int Snake::itemsCount() const {
return 50;
}

8
src/JungleLvl/private/snake.h
View File

@ -23,11 +23,17 @@ class Snake: public CRAWL::Snake
public:
Snake();
QString itemTextId() const override;
QString itemName() const override;
QString description() const override;
QString image() const override;
int cost() const override;
int requiredTier() const override;
// IWorldItem interface
protected:
unsigned int itemsCount() const override;
};

2
src/JungleLvl/private/world.cpp
View File

@ -108,7 +108,7 @@ void World::initControl(CRAWL::IControl *control) {
return IWorld::initControl(control);
}
CRAWL::PlayableObject *World::initPlayer() const {
CRAWL::PlayableObject *World::initPlayer(int) const {
return new Snake();
}

2
src/JungleLvl/private/world.h
View File

@ -27,7 +27,7 @@ public:
int cost() const override;
CRAWL::IControl *initUserInterface() const override;
void initControl(CRAWL::IControl *control) override;
CRAWL::PlayableObject *initPlayer() const override;
CRAWL::PlayableObject *initPlayer(int) const override;
CRAWL::IAI *initBackGroundAI() const override;
QString itemTextId() const override;
int requiredTier() const override;

2
tests/units/clasterstest.cpp
View File

@ -45,7 +45,7 @@ public:
// IWorld interface
public:
CRAWL::PlayableObject *initPlayer() const override {return nullptr;};
CRAWL::PlayableObject *initPlayer(int) const override {return nullptr;};
CRAWL::WorldRule *initWorldRules() override {return nullptr;};
QString initHdrBackGround() const override {return "";};
QString description() const override {return "";};