TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make do_wall_window into a proper callback. Only one dialog left - the main one.

Browse source
This commit is contained in:
Chris Taylor 2012-03-17 21:33:59 +08:00
parent 303a9f6858
commit c960c868f3
3 changed files with 102 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -5,6 +5,7 @@ D1X-Rebirth Changelog
editor/ehostage.c, editor/med.c: Make do_hostage_window into a proper callback (seems to be unused for now) editor/ehostage.c, editor/med.c: Make do_hostage_window into a proper callback (seems to be unused for now)
editor/eswitch.c, editor/med.c: Make do_trigger_window into a proper callback editor/eswitch.c, editor/med.c: Make do_trigger_window into a proper callback
editor/med.c, editor/medrobot.c: Make do_robot_window and do_object_window into proper callbacks, doing both in the same commit because of global recycling editor/med.c, editor/medrobot.c: Make do_robot_window and do_object_window into proper callbacks, doing both in the same commit because of global recycling
editor/med.c, editor/medwall.c: Make do_wall_window into a proper callback. Only one dialog left - the main one.
20120312 20120312
-------- --------

1
editor/med.c
View file

@ -1077,7 +1077,6 @@ void editor(void)
gr_set_curfont(editor_font); gr_set_curfont(editor_font);
event_process(); event_process();
last_keypress &= ~KEY_DEBUGGED; // mask off delete key bit which has no function in editor. last_keypress &= ~KEY_DEBUGGED; // mask off delete key bit which has no function in editor.
do_wall_window();
check_wall_validity(); check_wall_validity();
Assert(Num_walls>=0); Assert(Num_walls>=0);

160
editor/medwall.c
View file

@ -47,14 +47,18 @@ int wall_remove_door_flag(sbyte flag);
// Variables for this module... // Variables for this module...
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
static UI_DIALOG *MainWindow = NULL; static UI_DIALOG *MainWindow = NULL;
static UI_GADGET_USERBOX *WallViewBox;
static UI_GADGET_BUTTON *QuitButton;
static UI_GADGET_CHECKBOX *DoorFlag[4];
static UI_GADGET_RADIO *KeyFlag[4];
static int old_wall_num; typedef struct wall_dialog
static fix64 Time; {
static int framenum=0; UI_GADGET_USERBOX *wallViewBox;
UI_GADGET_BUTTON *quitButton;
UI_GADGET_CHECKBOX *doorFlag[4];
UI_GADGET_RADIO *keyFlag[4];
int old_wall_num;
fix64 time;
int framenum;
} wall_dialog;
static int Current_door_type=1; static int Current_door_type=1;
typedef struct count_wall { typedef struct count_wall {
@ -336,36 +340,45 @@ int NextWall() {
} }
int wall_dialog_handler(UI_DIALOG *dlg, d_event *event, wall_dialog *wd);
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Called from the editor... does one instance of the wall dialog box // Called from the editor... does one instance of the wall dialog box
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
int do_wall_dialog() int do_wall_dialog()
{ {
int i; int i;
wall_dialog *wd;
// Only open 1 instance of this window... // Only open 1 instance of this window...
if ( MainWindow != NULL ) return 0; if ( MainWindow != NULL ) return 0;
MALLOC(wd, wall_dialog, 1);
if (!wd)
return 0;
wd->framenum = 0;
// Close other windows. // Close other windows.
close_all_windows(); close_all_windows();
// Open a window with a quit button // Open a window with a quit button
MainWindow = ui_create_dialog( TMAPBOX_X+20, TMAPBOX_Y+20, 765-TMAPBOX_X, 545-TMAPBOX_Y, DF_DIALOG, NULL, NULL ); MainWindow = ui_create_dialog( TMAPBOX_X+20, TMAPBOX_Y+20, 765-TMAPBOX_X, 545-TMAPBOX_Y, DF_DIALOG, (int (*)(UI_DIALOG *, d_event *, void *))wall_dialog_handler, wd );
QuitButton = ui_add_gadget_button( MainWindow, 20, 252, 48, 40, "Done", NULL ); wd->quitButton = ui_add_gadget_button( MainWindow, 20, 252, 48, 40, "Done", NULL );
// These are the checkboxes for each door flag. // These are the checkboxes for each door flag.
i = 80; i = 80;
DoorFlag[0] = ui_add_gadget_checkbox( MainWindow, 22, i, 16, 16, 0, "Locked" ); i += 24; wd->doorFlag[0] = ui_add_gadget_checkbox( MainWindow, 22, i, 16, 16, 0, "Locked" ); i += 24;
DoorFlag[1] = ui_add_gadget_checkbox( MainWindow, 22, i, 16, 16, 0, "Auto" ); i += 24; wd->doorFlag[1] = ui_add_gadget_checkbox( MainWindow, 22, i, 16, 16, 0, "Auto" ); i += 24;
DoorFlag[2] = ui_add_gadget_checkbox( MainWindow, 22, i, 16, 16, 0, "Illusion OFF" ); i += 24; wd->doorFlag[2] = ui_add_gadget_checkbox( MainWindow, 22, i, 16, 16, 0, "Illusion OFF" ); i += 24;
KeyFlag[0] = ui_add_gadget_radio( MainWindow, 22, i, 16, 16, 0, "NONE" ); i += 24; wd->keyFlag[0] = ui_add_gadget_radio( MainWindow, 22, i, 16, 16, 0, "NONE" ); i += 24;
KeyFlag[1] = ui_add_gadget_radio( MainWindow, 22, i, 16, 16, 0, "Blue" ); i += 24; wd->keyFlag[1] = ui_add_gadget_radio( MainWindow, 22, i, 16, 16, 0, "Blue" ); i += 24;
KeyFlag[2] = ui_add_gadget_radio( MainWindow, 22, i, 16, 16, 0, "Red" ); i += 24; wd->keyFlag[2] = ui_add_gadget_radio( MainWindow, 22, i, 16, 16, 0, "Red" ); i += 24;
KeyFlag[3] = ui_add_gadget_radio( MainWindow, 22, i, 16, 16, 0, "Yellow" ); i += 24; wd->keyFlag[3] = ui_add_gadget_radio( MainWindow, 22, i, 16, 16, 0, "Yellow" ); i += 24;
// The little box the wall will appear in. // The little box the wall will appear in.
WallViewBox = ui_add_gadget_userbox( MainWindow, 155, 5, 64, 64 ); wd->wallViewBox = ui_add_gadget_userbox( MainWindow, 155, 5, 64, 64 );
// A bunch of buttons... // A bunch of buttons...
i = 80; i = 80;
@ -382,7 +395,7 @@ int do_wall_dialog()
ui_add_gadget_button( MainWindow,155,i,140, 22, "Bind to Trigger", bind_wall_to_trigger ); i += 25; ui_add_gadget_button( MainWindow,155,i,140, 22, "Bind to Trigger", bind_wall_to_trigger ); i += 25;
ui_add_gadget_button( MainWindow,155,i,140, 22, "Bind to Control", bind_wall_to_control_center ); i+=25; ui_add_gadget_button( MainWindow,155,i,140, 22, "Bind to Control", bind_wall_to_control_center ); i+=25;
old_wall_num = -2; // Set to some dummy value so everything works ok on the first frame. wd->old_wall_num = -2; // Set to some dummy value so everything works ok on the first frame.
return 1; return 1;
} }
@ -395,14 +408,19 @@ void close_wall_window()
} }
} }
void do_wall_window() int wall_dialog_handler(UI_DIALOG *dlg, d_event *event, wall_dialog *wd)
{ {
int i; int i;
sbyte type; sbyte type;
fix DeltaTime; fix DeltaTime;
fix64 Temp; fix64 Temp;
int keypress = 0;
if ( MainWindow == NULL ) return; int rval = 0;
if (event->type == EVENT_KEY_COMMAND)
keypress = event_key_get(event);
Assert(MainWindow != NULL);
//------------------------------------------------------------ //------------------------------------------------------------
// Call the ui code.. // Call the ui code..
@ -413,20 +431,20 @@ void do_wall_window()
// If we change walls, we need to reset the ui code for all // If we change walls, we need to reset the ui code for all
// of the checkboxes that control the wall flags. // of the checkboxes that control the wall flags.
//------------------------------------------------------------ //------------------------------------------------------------
if (old_wall_num != Cursegp->sides[Curside].wall_num) if (wd->old_wall_num != Cursegp->sides[Curside].wall_num)
{ {
if ( Cursegp->sides[Curside].wall_num != -1) if ( Cursegp->sides[Curside].wall_num != -1)
{ {
wall *w = &Walls[Cursegp->sides[Curside].wall_num]; wall *w = &Walls[Cursegp->sides[Curside].wall_num];
ui_checkbox_check(DoorFlag[0], w->flags & WALL_DOOR_LOCKED); ui_checkbox_check(wd->doorFlag[0], w->flags & WALL_DOOR_LOCKED);
ui_checkbox_check(DoorFlag[1], w->flags & WALL_DOOR_AUTO); ui_checkbox_check(wd->doorFlag[1], w->flags & WALL_DOOR_AUTO);
ui_checkbox_check(DoorFlag[2], w->flags & WALL_ILLUSION_OFF); ui_checkbox_check(wd->doorFlag[2], w->flags & WALL_ILLUSION_OFF);
ui_radio_set_value(KeyFlag[0], w->keys & KEY_NONE); ui_radio_set_value(wd->keyFlag[0], w->keys & KEY_NONE);
ui_radio_set_value(KeyFlag[1], w->keys & KEY_BLUE); ui_radio_set_value(wd->keyFlag[1], w->keys & KEY_BLUE);
ui_radio_set_value(KeyFlag[2], w->keys & KEY_RED); ui_radio_set_value(wd->keyFlag[2], w->keys & KEY_RED);
ui_radio_set_value(KeyFlag[3], w->keys & KEY_GOLD); ui_radio_set_value(wd->keyFlag[3], w->keys & KEY_GOLD);
} }
} }
@ -436,64 +454,78 @@ void do_wall_window()
//------------------------------------------------------------ //------------------------------------------------------------
if (Walls[Cursegp->sides[Curside].wall_num].type == WALL_DOOR) { if (Walls[Cursegp->sides[Curside].wall_num].type == WALL_DOOR) {
if ( DoorFlag[0]->flag == 1 ) if (GADGET_PRESSED(wd->doorFlag[0]))
Walls[Cursegp->sides[Curside].wall_num].flags |= WALL_DOOR_LOCKED; {
else if ( wd->doorFlag[0]->flag == 1 )
Walls[Cursegp->sides[Curside].wall_num].flags &= ~WALL_DOOR_LOCKED; Walls[Cursegp->sides[Curside].wall_num].flags |= WALL_DOOR_LOCKED;
if ( DoorFlag[1]->flag == 1 ) else
Walls[Cursegp->sides[Curside].wall_num].flags |= WALL_DOOR_AUTO; Walls[Cursegp->sides[Curside].wall_num].flags &= ~WALL_DOOR_LOCKED;
else rval = 1;
Walls[Cursegp->sides[Curside].wall_num].flags &= ~WALL_DOOR_AUTO; }
else if (GADGET_PRESSED(wd->doorFlag[1]))
{
if ( wd->doorFlag[1]->flag == 1 )
Walls[Cursegp->sides[Curside].wall_num].flags |= WALL_DOOR_AUTO;
else
Walls[Cursegp->sides[Curside].wall_num].flags &= ~WALL_DOOR_AUTO;
rval = 1;
}
//------------------------------------------------------------ //------------------------------------------------------------
// If any of the radio buttons that control the mode are set, then // If any of the radio buttons that control the mode are set, then
// update the corresponding key. // update the corresponding key.
//------------------------------------------------------------ //------------------------------------------------------------
for ( i=0; i < 4; i++ ) { for ( i=0; i < 4; i++ ) {
if ( KeyFlag[i]->flag == 1 ) { if (GADGET_PRESSED(wd->keyFlag[i]))
{
Walls[Cursegp->sides[Curside].wall_num].keys = 1<<i; // Set the ai_state to the cooresponding radio button Walls[Cursegp->sides[Curside].wall_num].keys = 1<<i; // Set the ai_state to the cooresponding radio button
rval = 1;
} }
} }
} else { } else {
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
ui_checkbox_check(DoorFlag[i], 0); ui_checkbox_check(wd->doorFlag[i], 0);
for ( i=0; i < 4; i++ ) for ( i=0; i < 4; i++ )
ui_radio_set_value(KeyFlag[i], 0); ui_radio_set_value(wd->keyFlag[i], 0);
} }
if (Walls[Cursegp->sides[Curside].wall_num].type == WALL_ILLUSION) { if (Walls[Cursegp->sides[Curside].wall_num].type == WALL_ILLUSION) {
if ( DoorFlag[2]->flag == 1 ) if (GADGET_PRESSED(wd->doorFlag[2]))
Walls[Cursegp->sides[Curside].wall_num].flags |= WALL_ILLUSION_OFF; {
else if ( wd->doorFlag[2]->flag == 1 )
Walls[Cursegp->sides[Curside].wall_num].flags &= ~WALL_ILLUSION_OFF; Walls[Cursegp->sides[Curside].wall_num].flags |= WALL_ILLUSION_OFF;
else
Walls[Cursegp->sides[Curside].wall_num].flags &= ~WALL_ILLUSION_OFF;
rval = 1;
}
} else } else
for ( i=2; i < 3; i++ ) for ( i=2; i < 3; i++ )
if (DoorFlag[i]->flag == 1) { if (wd->doorFlag[i]->flag == 1) {
DoorFlag[i]->flag = 0; // Tells ui that this button isn't checked wd->doorFlag[i]->flag = 0; // Tells ui that this button isn't checked
DoorFlag[i]->status = 1; // Tells ui to redraw button wd->doorFlag[i]->status = 1; // Tells ui to redraw button
} }
//------------------------------------------------------------ //------------------------------------------------------------
// A simple frame time counter for animating the walls... // A simple frame time counter for animating the walls...
//------------------------------------------------------------ //------------------------------------------------------------
Temp = timer_query(); Temp = timer_query();
DeltaTime = Temp - Time; DeltaTime = Temp - wd->time;
//------------------------------------------------------------ //------------------------------------------------------------
// Draw the wall in the little 64x64 box // Draw the wall in the little 64x64 box
//------------------------------------------------------------ //------------------------------------------------------------
gr_set_current_canvas( WallViewBox->canvas ); gr_set_current_canvas( wd->wallViewBox->canvas );
if (Cursegp->sides[Curside].wall_num != -1) { if (Cursegp->sides[Curside].wall_num != -1) {
type = Walls[Cursegp->sides[Curside].wall_num].type; type = Walls[Cursegp->sides[Curside].wall_num].type;
if ((type == WALL_DOOR) || (type == WALL_BLASTABLE)) { if ((type == WALL_DOOR) || (type == WALL_BLASTABLE)) {
if (DeltaTime > ((F1_0*200)/1000)) { if (DeltaTime > ((F1_0*200)/1000)) {
framenum++; wd->framenum++;
Time = Temp; wd->time = Temp;
} }
if (framenum >= WallAnims[Walls[Cursegp->sides[Curside].wall_num].clip_num].num_frames) if (wd->framenum >= WallAnims[Walls[Cursegp->sides[Curside].wall_num].clip_num].num_frames)
framenum=0; wd->framenum=0;
PIGGY_PAGE_IN(Textures[WallAnims[Walls[Cursegp->sides[Curside].wall_num].clip_num].frames[framenum]]); PIGGY_PAGE_IN(Textures[WallAnims[Walls[Cursegp->sides[Curside].wall_num].clip_num].frames[wd->framenum]]);
gr_ubitmap(0,0, &GameBitmaps[Textures[WallAnims[Walls[Cursegp->sides[Curside].wall_num].clip_num].frames[framenum]].index]); gr_ubitmap(0,0, &GameBitmaps[Textures[WallAnims[Walls[Cursegp->sides[Curside].wall_num].clip_num].frames[wd->framenum]].index]);
} else { } else {
if (type == WALL_OPEN) if (type == WALL_OPEN)
gr_clear_canvas( CBLACK ); gr_clear_canvas( CBLACK );
@ -513,7 +545,7 @@ void do_wall_window()
// If anything changes in the ui system, redraw all the text that // If anything changes in the ui system, redraw all the text that
// identifies this wall. // identifies this wall.
//------------------------------------------------------------ //------------------------------------------------------------
if (ui_button_any_drawn || (old_wall_num != Cursegp->sides[Curside].wall_num) ) { if (ui_button_any_drawn || (wd->old_wall_num != Cursegp->sides[Curside].wall_num) ) {
if ( Cursegp->sides[Curside].wall_num > -1 ) { if ( Cursegp->sides[Curside].wall_num > -1 ) {
ui_dprintf_at( MainWindow, 12, 6, "Wall: %d ", Cursegp->sides[Curside].wall_num); ui_dprintf_at( MainWindow, 12, 6, "Wall: %d ", Cursegp->sides[Curside].wall_num);
switch (Walls[Cursegp->sides[Curside].wall_num].type) { switch (Walls[Cursegp->sides[Curside].wall_num].type) {
@ -553,12 +585,22 @@ void do_wall_window()
} }
Update_flags |= UF_WORLD_CHANGED; Update_flags |= UF_WORLD_CHANGED;
} }
if ( QuitButton->pressed || (last_keypress==KEY_ESC) ) {
if (event->type == EVENT_WINDOW_CLOSE)
{
d_free(wd);
return 0;
}
if ( GADGET_PRESSED(wd->quitButton) || (keypress==KEY_ESC) )
{
close_wall_window(); close_wall_window();
return; return 1;
} }
old_wall_num = Cursegp->sides[Curside].wall_num; wd->old_wall_num = Cursegp->sides[Curside].wall_num;
return rval;
} }