In no particular order:

- Added some of the most basic dialogs
- Changed C-style <xxx.h> headers to C++-style <cxxx> headers
- Switched graphics to load from the PNG files in graphics.exd rather than from Blades of Exile Graphics (NOTE: Some graphics still don't work, probably because of incorrect source rects)
- Switched cursors to load from GIF files in graphics.exd rather than from Blades of Exile Graphics
- Moved Niemand's tileImage functions from boe.graphics.cpp to graphtool.cpp, so they can be used by all three programs.
- Added some string lists in .txt files
- Made cursors into an enum
- Rewrote the code for displaying the Edit Terrain dialog to use the new engine (not tested yet)
- Fixed some __attribute__((deprecated)) stuff
- Most graphics are now loaded just after the custom graphics. This means they will be overridden by a file of the same name in the scenario's .exr folder.
- Altered modes a little so that when at the startup screen you are in MODE_STARTUP rather than MODE_OUTDOORS.
- Switched from function pointers to boost::function – the Boost libraries are now required.
- Finished off the new dialog engine and made gess necessary
- Added status icons as another type that can be drawn in dialogs
- C Wrappers for Cocoa cursors based on an Apple example. This is tested, and works perfectly.
- Added a switch in the program for using Windows graphics; however, there is no way as yet to set this flag, and in fact there aren't even any Windows graphics to use.
- Added include guards to graphtool.h
- Made separate mac and win directories within sounds.exa, since the Mac and Windows sounds are mostly subtly different (with two completely different!)

git-svn-id: http://openexile.googlecode.com/svn/trunk@90 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
2009-06-07 18:18:24 +00:00
parent 91f5435b9d
commit 78cd213972
129 changed files with 2919 additions and 1061 deletions

View File

@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
#include <cstdio>
#include <cstring>
//#include "item.h"
@@ -26,7 +26,7 @@
#include "mathutil.h"
#include "dlgutil.h"
extern short stat_window,current_cursor,which_combat_type,current_pc;
extern short stat_window,which_combat_type,current_pc;
extern eGameMode overall_mode;
//extern party_record_type party;
//extern current_town_type univ.town;
@@ -44,9 +44,8 @@ extern short modeless_key[18];
extern DialogPtr modeless_dialogs[18];
//extern short town_size[3];
extern short town_type;
extern GWorldPtr pc_gworld;
extern short dialog_answer;
extern GWorldPtr pcs_gworld;
extern ModalFilterUPP main_dialog_UPP;
extern cScenario scenario;
extern cUniverse univ;
@@ -1049,8 +1048,8 @@ short display_item(location from_loc,short pc_num,short mode, bool check_contain
}
}
if (pcs_gworld == NULL)
pcs_gworld = load_pict(902);
if (pc_gworld == NULL)
pc_gworld = load_pict(902);
cd_create_dialog(987,mainPtr);
if (check_container == true)
@@ -1074,8 +1073,8 @@ short display_item(location from_loc,short pc_num,short mode, bool check_contain
item_hit = cd_run_dialog();
cd_kill_dialog(987);
DisposeGWorld(pcs_gworld);
pcs_gworld = NULL;
DisposeGWorld(pc_gworld);
pc_gworld = NULL;
put_item_screen(stat_window,0);
put_pc_screen();