Ignore:
Timestamp:
Jul 3, 2014, 5:28:39 PM (8 years ago)
Author:
Sam Hocevar
Message:

build: sync with newer Lol Engine changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/branches/lol/src/dev.cpp

    r728 r729  
    13021302
    13031303    int bh = 16 + 6, bw = 20 + 6, th = wm->font()->Size().y + 4;
    1304     Array<AButton *> buttons;
     1304    array<AButton *> buttons;
    13051305    buttons << new AButton(ivec2(bw * 0, bh * 0), DEV_LIGHT0, cache.img(light_buttons[0]));
    13061306    buttons << new AButton(ivec2(bw * 1, bh * 0), DEV_LIGHT1, cache.img(light_buttons[1]));
     
    18401840        int bw=20+6, bh=16+6;
    18411841
    1842         Array<AButton *> but1;
     1842        array<AButton *> but1;
    18431843        but1 << new AButton(ivec2(bw * 0, 0), DEV_OEDIT_OK, cache.img(dev_ok));
    18441844        but1 << new AButton(ivec2(bw * 1, 0), DEV_OEDIT_MOVE, cache.img(dev_move));
     
    18481848        but1 << new AButton(ivec2(bw * 0, bh * 1), DEV_OEDIT_DELETE, cache.img(dev_del));
    18491849
    1850         Array<AButton *> but2;
     1850        array<AButton *> but2;
    18511851        but2 << new AButton(ivec2(bw * 1, bh * 1), DEV_OEDIT_LEFT, cache.img(dev_char_left));
    18521852        but2 << new AButton(ivec2(bw * 2, bh * 1), DEV_OEDIT_RIGHT, cache.img(dev_char_right));
     
    18801880          edit_light->known=1;
    18811881        }
    1882         Array<AButton *> buttons;
     1882        array<AButton *> buttons;
    18831883        buttons << new AButton(ivec2(bw * 0, 0), DEV_LEDIT_OK, cache.img(dev_ok));
    18841884        buttons << new AButton(ivec2(bw * 1, 0), DEV_LEDIT_MOVE, cache.img(dev_move));
Note: See TracChangeset for help on using the changeset viewer.