TESTBED: Remove data string from AchivementsInfo

This commit is contained in:
lb_ii 2021-06-04 03:55:45 +03:00 committed by lolbot-iichan
parent cd0a225394
commit 53721953a2
5 changed files with 8 additions and 91 deletions

View File

@ -1,51 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "testbed/achievements.h"
#include "testbed/testbed.h"
#include "testbed/testsuite.h"
namespace Testbed {
const Common::AchievementsInfo getAchievementsInfo(const Common::String &target) {
Common::AchievementsInfo result;
result.platform = Common::UNK_ACHIEVEMENTS;
result.appId = "testbed";
Common::AchievementDescription testSuiteFinalAchievement = {"EVERYTHINGWORKS", true, "Everything works!", "Completed all available testsuites"};
result.descriptions.push_back(testSuiteFinalAchievement);
Common::Array<Testbed::Testsuite *> testsuiteList;
Testbed::TestbedEngine::pushTestsuites(testsuiteList);
for (Common::Array<Testbed::Testsuite *>::const_iterator i = testsuiteList.begin(); i != testsuiteList.end(); ++i) {
Common::AchievementDescription it = {(*i)->getName(), false, (*i)->getDescription(), 0};
result.descriptions.push_back(it);
delete (*i);
}
Common::StatDescription testsRun = {"NUM_TESTS", "Number of tests run", "0"};
result.stats.push_back(testsRun);
return result;
}
} // End of namespace Testbed

View File

@ -1,35 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef TESTBED_ACHIEVEMENTS_H
#define TESTBED_ACHIEVEMENTS_H
#include "common/achievements.h"
namespace Testbed {
const Common::AchievementsInfo getAchievementsInfo(const Common::String &target);
} // End of namespace Testbed
#endif // TESTBED_ACHIEVEMENTS_H

View File

@ -26,7 +26,6 @@
#include "engines/advancedDetector.h"
#include "testbed/achievements.h"
#include "testbed/testbed.h"
class TestbedMetaEngine : public AdvancedMetaEngine {
@ -41,7 +40,10 @@ public:
}
const Common::AchievementsInfo getAchievementsInfo(const Common::String &target) const override {
return Testbed::getAchievementsInfo(target);
Common::AchievementsInfo result;
result.platform = Common::UNK_ACHIEVEMENTS;
result.appId = "testbed";
return result;
}
bool hasFeature(MetaEngineFeature f) const override {

View File

@ -1,7 +1,6 @@
MODULE := engines/testbed
MODULE_OBJS := \
achievements.o \
config.o \
config-params.o \
events.o \

View File

@ -32,7 +32,6 @@
#include "engines/util.h"
#include "testbed/achievements.h"
#include "testbed/events.h"
#include "testbed/fs.h"
#include "testbed/graphics.h"
@ -224,7 +223,10 @@ Common::Error TestbedEngine::run() {
initGraphics(320, 200);
// Initialize achievements manager
AchMan.setActiveDomain(getAchievementsInfo(ConfMan.getActiveDomainName()));
Common::AchievementsInfo info;
info.platform = Common::UNK_ACHIEVEMENTS;
info.appId = "testbed";
AchMan.setActiveDomain(info);
// As of now we are using GUI::MessageDialog for interaction, Test if it works.
// interactive mode could also be modified by a config parameter "non-interactive=1"