Celtic Minstrel
c413d292a9
(PC Editor and Scenario Editor are unaffected by this commit.)
Things removed:
- All references to Carbon and QuickDraw are gone.
- No more Resource Manager; the game no longer relies on old resource files at all
- The old dialog framework (from dlogtool.c, functions usually prefixed with cd_) is no longer used.
- Files that weren't being compiled
- Boost libraries that are now in the C++ library (function, shared_ptr)
- Obsolete build settings
Replacement dependencies:
- Boost Filesystem replaces references to things like FSSpec
- SFML replaces all the QuickDraw code and most window management
- Cocoa replaces AppleEvent management, menu management, and some window management
- I wrote a resource manager interface to mimick the important aspects of the behaviour of the Mac Resource Manager
- I had to rewrite some functions that QuickDraw provided natively, such as clipping regions; not all of these are tested
Things added:
- Every referenced dialog has been converted from a DITL resource into the new XML-based dialog format.
- All referenced STR# resources have been extracted into simple text files
- Now compiles against Mac OSX 10.7 SDK and libc++
- The first item in the Help menu opens the docs on Sylae's website
- It seems all the constants for soundtool vanished somewhere, so I added them back from the original Mac source
Other changes:
- Updated to XCode 4(?) project format
- Added the xcschemes created by XCode 4; I'm not sure how important these are, but they seem like they might be important
- Added document on converting dialogs to the XML format.
- Make string formatting mismatches into errors instead of warnings
- Disable error limit
- Graphics sheets that previously used masking now have alpha transparency
- Converted all graphics sheets to 8-bit PNG
- Trimmed white border from intro image
- Converted dialogs in the resource file have their resource name set to the name of the XML file of the converted version
- Referenced string resources in the resource file have their resource name set to the name of the text file of the extracted version
- Add the black-and-white patterns from the PAT resources to the pixpats.png; at least one of them is used somewhere in the game
- Recreated the menu.xib as a Cocoa xib file instead of a Carbon xib file
- Disable GNU C++ extensions; maybe this'll make it easier to compile with cl.exe later
- Add marks to the enormous handle_action function to make it easier to navigate\
- A build step to validate the XML dialogs using xmllint (doesn't quite work properly yet but does at least catch dialogs that are not well-formed)- Fix a lot of warnings about assigning string constants to non-const char pointers
- Fixed the file and application icons (which had somehow become corrupted at some point)
- Lots of additional functions in the custom location and rectangle classes, including implicit conversion to and from SFML rects and vectors; also they now store coordinates as int instead of char
- A new enum for encounter note types
- Much tweaking of the encounter note recording mechanisms
- To ease porting, I added a simple function that converts from classic Mac ticks (about 1/60 of a second) to the SFML time type
- Python script to convert STR# resources to txt files, replacing newlines with vertical bars
- Extracted the Mac font (Dungeon Bold) from the resource file and also added the Windows font (MaidenWord)
XML Dialog Framework changes:
- Remove the static initialization object in favour of manually calling cDialog::init()
- {set,get}Format() no longer used for colour; there's a dedicated {set,get}Colour() instead
- draw() methods unprotected in the control classes so that controls can be drawn in the main window
- There's no longer a friend relationship between the dialogs and the controls
- Fixed buttons duplicating the "depressed" boolean
- Buttons now properly offset the label for tiny and push buttons, and for LEDs
- Buttons no longer assume that either none or both of "width" and "height" are given in the XML
- Add {get,set}BtnType() to cButton
- cLedGroup now overrides handleClick(), which has also been made virtual; this was necessary for LEDs within a group to properly hilite while being clicked
- Add addChoice() to cLedGroup to insert additional LED choices
- Moved the key enums and cKey to a separate file
- Add a method to get a control's attached key
- Add methods to get and set a control's rect and position
- Controls can now directly take a window as a parent rather than a dialog
- Add addLabelFor() method to cDialog which adds a static text control as a label for another control
- Remove hack for storing a dialog result of arbitrary type in favour of boost::any
- Add method to get default text colour for a dialog
- Add method to get a dialog's rect
- Add method to add the same event handler to multiple controls in a dialog
- Add concept of default button to dialogs
- Add enum for text field type (currently either number or text)
- Implement the text field without use of native controls, including somewhat decent text input and a flashing insertion point
- cPict no longer stores references to every sheet; it fetches them as needed from the resource manager
- The many draw functions in cPict are no longer static, since they need to access the window containing the pict (before they could only be static due to QuickDraw's global state)
- Add setPict() without a type argument to change the graphic without changing the type, which is a common operation
- Add a scrollbar control; the specifics aren't implemented yet
- Change signature of the record callback for cStrDlog; it will no longer be passed the strings
- Publicize the no-button constructor of cChoiceDlog; it'll assume "okay" is the only button
- Add operator-> to cPictChoice for accessing the underlying dialog
- Add constructor to cPictChoice that takes a starting and ending pic num
- Remove err parameter from giveError
- Many more keys handled, plus support for catching copy, paste, cut, and select all keyboard shortcuts
- Text input fields take priority, overriding any other keyboard shortcuts in the dialog, but they never catch help (F1), escape, or enter
- Some changes to the format itself:
-> keys go in the "def-key" attribute, but modifiers go in "key-mod"
-> "clickable" is no longer a recognized attribute
-> "title" is now a recognized text size (18pt, even larger than "large" at 12pt)
-> "defbtn" attribute on the root element
123 lines
3.0 KiB
C++
123 lines
3.0 KiB
C++
/*
|
|
* town.h
|
|
* BoE
|
|
*
|
|
* Created by Celtic Minsrel on 22/04/09.
|
|
*
|
|
*/
|
|
|
|
#ifndef TOWN_H
|
|
#define TOWN_H
|
|
|
|
#include <vector>
|
|
#include <iosfwd>
|
|
#include "simpletypes.h"
|
|
#include "location.h"
|
|
#include "special.h"
|
|
#include "monster.h"
|
|
#include "talking.h"
|
|
|
|
namespace legacy {
|
|
struct town_record_type;
|
|
struct big_tr_type;
|
|
struct ave_tr_type;
|
|
struct tiny_tr_type;
|
|
struct creature_start_type;
|
|
struct wandering_type;
|
|
struct preset_item_type;
|
|
struct preset_field_type;
|
|
};
|
|
|
|
class cTown { // formerly town_record_type
|
|
public:
|
|
// class cCreature { // formerly creature_start_type
|
|
// public:
|
|
// unsigned short number;
|
|
// unsigned char start_attitude;
|
|
// location start_loc;
|
|
// unsigned char mobile;
|
|
// unsigned char time_flag;
|
|
// unsigned char extra1,extra2;
|
|
// short spec1, spec2;
|
|
// char spec_enc_code,time_code;
|
|
// short monster_time,personality;
|
|
// short special_on_kill,facial_pic;
|
|
//
|
|
// cCreature& operator = (legacy::creature_start_type old);
|
|
// };
|
|
class cWandering { // formerly wandering_type
|
|
public:
|
|
m_num_t monst[4];
|
|
|
|
bool isNull();
|
|
cWandering& operator = (legacy::wandering_type old);
|
|
};
|
|
class cItem { // formerly preset_item_type
|
|
public:
|
|
location loc;
|
|
short code,ability;
|
|
unsigned char charges,always_there,property,contained;
|
|
|
|
cItem& operator = (legacy::preset_item_type old);
|
|
};
|
|
class cField { // formerly preset_field_type
|
|
public:
|
|
location loc;
|
|
short type;
|
|
|
|
cField& operator = (legacy::preset_field_type old);
|
|
};
|
|
short town_chop_time,town_chop_key;
|
|
cWandering wandering[4];
|
|
location wandering_locs[4];
|
|
location special_locs[50];
|
|
unsigned short spec_id[50];
|
|
location sign_locs[15];
|
|
short lighting_type;
|
|
location start_locs[4];
|
|
location exit_locs[4];
|
|
short exit_specs[4];
|
|
rectangle in_town_rect;
|
|
cItem preset_items[64];
|
|
short max_num_monst;
|
|
std::vector<cField> preset_fields;
|
|
short spec_on_entry,spec_on_entry_if_dead;
|
|
short timer_spec_times[8];
|
|
short timer_specs[8];
|
|
unsigned char strlens[180];
|
|
cSpecial specials[100];
|
|
//unsigned char specials1,specials2,res1,res2;
|
|
bool strong_barriers : 1;
|
|
bool defy_mapping : 1;
|
|
bool defy_scrying : 1;
|
|
char reserved_bits : 5;
|
|
short hostile_fry_party; // number of a special to be called when the town goes hostile TODO: Not sure about this yet though
|
|
short difficulty;
|
|
//char town_strs[180][256];
|
|
char town_name[256];
|
|
char rect_names[16][256];
|
|
char comment[3][256];
|
|
char spec_strs[100][256];
|
|
char sign_strs[20][256];
|
|
char(& town_strs(short i))[256] __attribute__((deprecated));
|
|
cSpeech talking;
|
|
|
|
virtual ~cTown(){}
|
|
virtual void append(legacy::big_tr_type& old);
|
|
virtual void append(legacy::ave_tr_type& old);
|
|
virtual void append(legacy::tiny_tr_type& old);
|
|
virtual ter_num_t& terrain(size_t x, size_t y) = 0;
|
|
virtual rectangle& room_rect(size_t i) = 0;
|
|
virtual cCreature& creatures(size_t i) = 0;
|
|
virtual unsigned char& lighting(size_t i, size_t r) = 0;
|
|
virtual short max_dim() = 0;
|
|
virtual short max_monst() = 0;
|
|
virtual short max_items() = 0;
|
|
|
|
cTown();
|
|
cTown(short size);
|
|
cTown& operator = (legacy::town_record_type& old);
|
|
void writeTo(std::ostream& file);
|
|
};
|
|
|
|
#endif |