Ignore:
Timestamp:
Mar 16, 2008, 2:17:43 AM (11 years ago)
Author:
Sam Hocevar
Message:
  • Simplified the window creation arguments. Got rid of a lot of macros and hid stuff in private namespaces.

Inspired by Win32 Abuse changelog for January 28, 2001:

  • Well, in the process of adding changes necessary to

handle recovery from alt-tabbing away from Abuse
(which is why I was updating jwindow::redraw()),
the entire windowing system is getting an overhaul.
It's gonna be sweet when I'm done, though.

  • jwindow::redraw() has been changed to a virtual

function requiring no parameters. This'll make
it much easier to implement special specific-
purpose windows.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/game.cpp

    r106 r111  
    107107    }
    108108
    109     info_field *inf = new info_field(WINDOW_FRAME_LEFT, WINDOW_FRAME_TOP +
    110                                        wm->font()->height() * 2, ID_NULL,
     109    info_field *inf = new info_field(0, wm->font()->height() * 2, ID_NULL,
    111110                                     no_space_msg, NULL);
    112     button *b = new button(WINDOW_FRAME_LEFT, WINDOW_FRAME_TOP,
    113                            ID_QUIT_OK, "Quit", inf);
     111    button *b = new button(0, 0, ID_QUIT_OK, "Quit", inf);
    114112    jwindow *no_space = wm->new_window(0, 0, -1, -1, b, "ERROR");
    115113
     
    471469        if(y > 0) y = 1; else if(y < 0) y = -1;
    472470        if(but) but = 1;
    473         int dx = WINDOW_FRAME_LEFT + 20, dy = WINDOW_FRAME_TOP + 5;
     471        int dx = 20, dy = 5;
    474472        image *jim = cash.img(joy_picts[but * 9+(y + 1)*3 + x + 1]);
    475473        joy_win->screen->bar(dx, dy, dx + jim->width()+6, dy + jim->height()+6, wm->black());
     
    17791777                        if(!joy_win)
    17801778                        {
    1781                             int wx = WINDOW_FRAME_LEFT, wy = WINDOW_FRAME_TOP;
    1782 
    17831779                            joy_win = wm->new_window(80, 50, -1, -1,
    1784                                     new button(wx + 70, wy + 9, JOY_OK, "OK",
    1785                                     new info_field(wx, wy + 30, DEV_NULL,
     1780                                    new button(70, 9, JOY_OK, "OK",
     1781                                    new info_field(0, 30, DEV_NULL,
    17861782                                    " Center joystick and\n"
    17871783                                    "press the fire button", NULL)),
Note: See TracChangeset for help on using the changeset viewer.