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:
2017-04-14 00:24:29 -04:00
parent b624841bea
commit 82abdab695
211 changed files with 1855 additions and 1881 deletions

View File

@@ -7,10 +7,11 @@
#include "pc.fileio.hpp"
#include "pc.action.hpp"
#include "graphtool.hpp"
#include "soundtool.hpp"
#include "sounds.hpp"
#include "mathutil.hpp"
#include "dialog.hpp"
#include "control.hpp"
#include "cursors.hpp"
#include <boost/lexical_cast.hpp>
extern cUniverse univ;
@@ -105,7 +106,7 @@ void edit_gold_or_food(short which_to_edit) {
store_which_to_edit = which_to_edit;
make_cursor_sword();
set_cursor(sword_curs);
cDialog dlog("get-num");
dlog["okay"].attachClickHandler(get_num_event_filter);
if(which_to_edit == 0)
@@ -126,7 +127,7 @@ void edit_day() {
location view_loc;
make_cursor_sword();
set_cursor(sword_curs);
cDialog dlog("edit-day");
dlog["okay"].attachClickHandler(get_num_event_filter);
@@ -154,7 +155,7 @@ bool take_gold(short amount,bool /*print_result*/) {
void edit_xp(cPlayer *pc) {
location view_loc;
make_cursor_sword();
set_cursor(sword_curs);
cDialog dlog("edit-xp");
dlog["okay"].attachClickHandler(get_num_event_filter);