Major code reorganization
This commit only updates the XCode project for the changes. A later commit each will update it for scons and MSVC. A few actual changes are mixed in: - Add a prefix header for a handful of common definitions - Moved current_cursor into the Cursor class as a static member - Removed the make_cursor_sword and make_cursor_watch functions - Include tests in the All target - Remove redundant -l flags for Common and Common-Party (since they're included in the Link phases anyway)
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#include "catch.hpp"
|
||||
#include "scenario.hpp"
|
||||
#include "creature.hpp"
|
||||
#include "creatlist.hpp"
|
||||
#include "population.hpp"
|
||||
#include "pc.hpp"
|
||||
#include "party.hpp"
|
||||
|
||||
|
@@ -10,6 +10,8 @@
|
||||
#include "item.hpp"
|
||||
#include "oldstructs.hpp"
|
||||
#include "spell.hpp"
|
||||
#include "damage.hpp"
|
||||
#include "race.hpp"
|
||||
|
||||
static void set_item_name(legacy::item_record_type& item, const std::string& full, const std::string& name) {
|
||||
std::copy_n(full.begin(), std::min<size_t>(25, 1 + full.size()), item.full_name);
|
||||
|
@@ -5,7 +5,7 @@
|
||||
#include "dialog.hpp"
|
||||
#include "catch.hpp"
|
||||
#include "scenario.hpp"
|
||||
#include "restypes.hpp"
|
||||
#include "res_strings.hpp"
|
||||
|
||||
using namespace std;
|
||||
using namespace ticpp;
|
||||
|
@@ -6,7 +6,7 @@
|
||||
#include "catch.hpp"
|
||||
#include "scenario.hpp"
|
||||
#include "town.hpp"
|
||||
#include "restypes.hpp"
|
||||
#include "res_strings.hpp"
|
||||
|
||||
using namespace std;
|
||||
using namespace ticpp;
|
||||
|
@@ -9,8 +9,15 @@
|
||||
#include "catch.hpp"
|
||||
#include "oldstructs.hpp"
|
||||
#include "special.hpp"
|
||||
#include "restypes.hpp"
|
||||
#include "res_strings.hpp"
|
||||
#include "pictypes.hpp"
|
||||
#include "spell.hpp"
|
||||
#include "damage.hpp"
|
||||
#include "skills_traits.hpp"
|
||||
#include "fields.hpp"
|
||||
#include "race.hpp"
|
||||
#include "monster.hpp" // for eAttitude
|
||||
#include "town.hpp" // for lighting constants
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
@@ -9,6 +9,7 @@
|
||||
#include "catch.hpp"
|
||||
#include "terrain.hpp"
|
||||
#include "oldstructs.hpp"
|
||||
#include "damage.hpp"
|
||||
|
||||
TEST_CASE("Converting terrain types from legacy scenarios") {
|
||||
cTerrain new_ter;
|
||||
|
Reference in New Issue
Block a user