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
55 lines
1.8 KiB
C
55 lines
1.8 KiB
C
|
|
#include <SFML/Graphics.hpp>
|
|
|
|
void adjust_window_mode();
|
|
void plop_fancy_startup();
|
|
void fancy_startup_delay();
|
|
void init_startup();
|
|
void reload_startup();
|
|
void init_animation();
|
|
void next_animation_step() ;
|
|
void draw_startup(short but_type);
|
|
void draw_anim();
|
|
void place_anim();
|
|
void draw_start_button(short which_position,short which_button);
|
|
void main_button_click(short mode,RECT button_rect);
|
|
void arrow_button_click(RECT button_rect);
|
|
void end_startup();
|
|
void Set_up_win ();
|
|
void load_main_screen();
|
|
void create_clip_region();
|
|
void set_gworld_fonts(short font_num);
|
|
void redraw_screen();
|
|
void put_background();
|
|
void draw_main_screen();
|
|
void draw_buttons(short mode);
|
|
void draw_text_area(short mode);
|
|
void reset_text_bar();
|
|
void draw_text_bar(short mode);
|
|
void put_text_bar(char *str);
|
|
void draw_terrain(short mode = 0);
|
|
void place_trim(short q,short r,location where,ter_num_t ter_type);
|
|
void draw_trim(short q,short r,short which_trim,short which_mode);
|
|
bool extend_road_terrain(ter_num_t ter);
|
|
void place_road(short q,short r,location where,bool here);
|
|
void draw_rest_screen();
|
|
void boom_space(location where,short mode,short type,short damage,short sound);
|
|
void draw_pointing_arrows() ;
|
|
void redraw_terrain();
|
|
void draw_targets(location center);
|
|
void frame_space(location where,short mode,short width,short height);
|
|
void erase_spot(short i,short j);
|
|
void draw_targeting_line(location where_curs);
|
|
bool party_toast();
|
|
void redraw_partial_terrain(RECT redraw_rect);
|
|
bool is_nature(char i, char j, unsigned char ground_t);
|
|
void put_dialog_graphic(short graphic_num,short spec_g,RECT draw_rect);
|
|
void draw_startup_stats();
|
|
void FlushAndPause(unsigned long ticks);
|
|
void draw_trim(short q,short r,short which_trim,ter_num_t ground_ter);
|
|
|
|
ter_num_t get_ground_from_ter(ter_num_t ter);
|
|
ter_num_t get_ter_from_ground(unsigned char ground);
|
|
|
|
void draw_startup_anim(bool advance);
|