Changeset 729


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

build: sync with newer Lol Engine changes.

Location:
abuse/branches/lol/src
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • abuse/branches/lol/src/cache.h

    r724 r729  
    5555
    5656private:
    57     Array<CrcedFile *> m_files;
     57    array<CrcedFile *> m_files;
    5858};
    5959
  • 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));
  • abuse/branches/lol/src/game.cpp

    r727 r729  
    6363LOLFX_RESOURCE_DECLARE(blit);
    6464
    65 extern Array<uint8_t> g_screen;
     65extern array<uint8_t> g_screen;
    6666
    6767extern CrcManager *net_crcs;
     
    25062506    Thread *m_abusethread;
    25072507
    2508     Array<vec2> m_vertices;
     2508    array<vec2> m_vertices;
    25092509    Texture *m_screen, *m_palette;
    25102510    Shader *m_shader;
  • abuse/branches/lol/src/imlib/filter.h

    r724 r729  
    2929
    3030private:
    31     Array<uint8_t> m_table;
     31    array<uint8_t> m_table;
    3232};
    3333
     
    4747
    4848private:
    49     Array<uint8_t> m_table;
     49    array<uint8_t> m_table;
    5050    int m_size;
    5151};
  • abuse/branches/lol/src/imlib/image.cpp

    r724 r729  
    2020#include "imlib/image.h"
    2121
    22 Array<AImage *> image_list; // FIXME: only jwindow.cpp needs this
     22array<AImage *> image_list; // FIXME: only jwindow.cpp needs this
    2323
    2424image_descriptor::image_descriptor(ivec2 size, int keep_dirties)
     
    447447        return;
    448448
    449     Array<ADirtyRect> to_add;
     449    array<ADirtyRect> to_add;
    450450
    451451    for (int i = m_dirties.Count(); i--; )
  • abuse/branches/lol/src/imlib/image.h

    r724 r729  
    2121void image_init();
    2222void image_uninit();
    23 extern Array<class AImage *> image_list;
     23extern array<class AImage *> image_list;
    2424
    2525class ADirtyRect
     
    8686    }
    8787
    88     Array<ADirtyRect> m_dirties; /* Is public because of update_dirties() */
     88    array<ADirtyRect> m_dirties; /* Is public because of update_dirties() */
    8989
    9090private:
     
    105105
    106106private:
    107     Array<uint8_t> m_data;
     107    array<uint8_t> m_data;
    108108    ivec2 m_size;
    109109
  • abuse/branches/lol/src/imlib/input.cpp

    r724 r729  
    5151}
    5252
    53 AButtonBox::AButtonBox(ivec2 pos, int id, int MaxDown, Array<AButton *> const &buttons)
     53AButtonBox::AButtonBox(ivec2 pos, int id, int MaxDown, array<AButton *> const &buttons)
    5454{
    5555    m_pos = pos;
  • abuse/branches/lol/src/imlib/input.h

    r724 r729  
    4646{
    4747public:
    48     AButtonBox(ivec2 pos, int id, int MaxDown, Array<AButton *> const &buttons = Array<AButton *>());
     48    AButtonBox(ivec2 pos, int id, int MaxDown, array<AButton *> const &buttons = array<AButton *>());
    4949    virtual ~AButtonBox();
    5050
     
    6363
    6464private:
    65     Array<AButton *> m_buttons;
     65    array<AButton *> m_buttons;
    6666    int maxdown;
    6767};
  • abuse/branches/lol/src/imlib/palette.h

    r724 r729  
    4343
    4444private:
    45     Array<u8vec3> m_colors;
    46     Array<uint8_t> m_used;
     45    array<u8vec3> m_colors;
     46    array<uint8_t> m_used;
    4747    int bg;
    4848
  • abuse/branches/lol/src/imlib/specs.h

    r711 r729  
    199199  void delete_entries();   // if the directory was created by hand instead of by file
    200200
    201     Array<SpecEntry *> m_entries;
    202     Array<uint8_t> m_data;
     201    array<SpecEntry *> m_entries;
     202    array<uint8_t> m_data;
    203203};
    204204
  • abuse/branches/lol/src/imlib/window.h

    r724 r729  
    6060};
    6161
    62 class AWidgetList : public Array<AWidget *>
     62class AWidgetList : public array<AWidget *>
    6363{
    6464};
  • abuse/branches/lol/src/light.h

    r724 r729  
    5757
    5858    ivec2 m_p1, m_p2;
    59     Array<LightSource *> m_lights;
     59    array<LightSource *> m_lights;
    6060
    6161    /* FIXME: this should disappear */
  • abuse/branches/lol/src/property.h

    r714 r729  
    3232
    3333private:
    34     Array<AProperty *> m_props;
     34    array<AProperty *> m_props;
    3535
    3636    AProperty *find(char const *name);
  • abuse/branches/lol/src/sdlport/video.cpp

    r724 r729  
    3131#include "setup.h"
    3232
    33 Array<uint8_t> g_screen;
     33array<uint8_t> g_screen;
    3434
    3535AImage *main_screen = NULL;
  • abuse/branches/lol/src/unixnfc.cpp

    r724 r729  
    541541    int total_retry=0;
    542542    AWindow *abort=NULL;
    543     Array<Event> input;
     543    array<Event> input;
    544544    while (base->input_state!=INPUT_PROCESSING)
    545545    {
Note: See TracChangeset for help on using the changeset viewer.