openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

- Fixed up file loading (but then broke it again)

Browse Source 
- Reworked preferences to use plist
- Cleaned out the shareware code
- More tweaks to the dialog engine
- Edited dialog #869 (the choose prefab scenario dialog) to use new invisible button (type 6) and to remove the "Must be registered" lines.
- Tweaked window size so that the startup screen fits within it.
- More major refactoring work.
- A few additions/alterations to boe.consts.h

Current status:
- Scenario editor: compiles and runs, but can't load a scenario
- Character editor: don't know
- Game: Doesn't even compile
I wouldn't normally submit code that doesn't compile, but I have already made a lot of major changes in this revision.
I will submit a version that compiles as soon as possible.

git-svn-id: http://openexile.googlecode.com/svn/trunk@28 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-04-23 20:53:49 +00:00
parent a2c2a85a8e
commit fad42597a6
82 changed files with 5978 additions and 4757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osx/Scenario Editor/scen.btnmg.cpp
View File

@@ -8,7 +8,7 @@
#include <math.h>
#include "scen.btnmg.h"
extern piles_of_stuff_dumping_type *data_store;
//extern piles_of_stuff_dumping_type *data_store;
extern Rect right_sbar_rect;
@@ -18,6 +18,8 @@ extern Rect right_buttons[NRSONPAGE];
Rect right_scrollbar_rect;
Rect right_area_rect;
extern short current_rs_top;
char strings_ls[NLS][40];
char strings_rs[NRS][40];
Boolean left_buttons_active = 1,right_buttons_active = 0;
extern short left_button_status[NLS]; // 0 - clear, 1 - text, 2 - title text, 3 - tabbed text, +10 - button
@@ -45,7 +47,7 @@ void init_lb() {
short i;
for (i = 0; i < NLS; i++) {
left_button_status[i] = 0;
sprintf((char *) data_store->strings_ls[i], "");
sprintf((char *) strings_ls[i], "");
}
}
@@ -73,9 +75,9 @@ void set_lb(short slot, short mode, char *label, short do_draw)
return;
}
left_button_status[slot] = mode;
//sprintf((char *)data_store->strings_ls[slot], "%-39.39s", label);
sprintf((char *)data_store->strings_ls[slot], "%-50.50s", label);
data_store->strings_ls[slot][39] = 0;
//sprintf((char *)strings_ls[slot], "%-39.39s", label);
sprintf((char *)strings_ls[slot], "%-50.50s", label);
strings_ls[slot][39] = 0;
if (do_draw > 0)
draw_lb_slot(slot,0);
@@ -91,7 +93,7 @@ void init_rb()
SetControlValue(right_sbar,0);
for (i = 0; i < NRS; i++) {
right_button_status[i] = 0;
sprintf((char *) data_store->strings_rs[i], "");
sprintf((char *) strings_rs[i], "");
}
}
@@ -123,12 +125,12 @@ void set_rb(short slot, short mode, char *label, short do_draw)
return;
}
right_button_status[slot] = mode;
//sprintf((char *)data_store->strings_rs[slot], "%-39.39s", label);
sprintf((char *)data_store->strings_rs[slot], "%s", label);
data_store->strings_rs[slot][39] = 0;
//sprintf((char *)strings_rs[slot], "%-39.39s", label);
sprintf((char *)strings_rs[slot], "%s", label);
strings_rs[slot][39] = 0;
for (i = 0; i < 39; i++)
if (data_store->strings_rs[slot][i] == '|')
data_store->strings_rs[slot][i] = ' ';
if (strings_rs[slot][i] == '|')
strings_rs[slot][i] = ' ';
if (do_draw > 0)
draw_rb_slot(slot,0);
/* for (i = 0; i < NRS; i++)