Changeset 737Tweet

Timestamp:

May 1, 2015, 1:11:31 PM (8 years ago)

Author:

Sam Hocevar

Message:

build: sync with newer Lol Engine changes.

Location:

abuse/branches/lol/src

Files:

• ant.cpp (modified) (2 diffs)
• cache.cpp (modified) (10 diffs)
• cache.h (modified) (1 diff)
• demo.cpp (modified) (1 diff)
• dev.cpp (modified) (3 diffs)
• game.cpp (modified) (2 diffs)
• gui.cpp (modified) (5 diffs)
• imlib/filter.cpp (modified) (7 diffs)
• imlib/fonts.cpp (modified) (1 diff)
• imlib/image.cpp (modified) (13 diffs)
• imlib/image.h (modified) (1 diff)
• imlib/input.cpp (modified) (16 diffs)
• imlib/palette.cpp (modified) (16 diffs)
• imlib/palette.h (modified) (1 diff)
• imlib/specs.cpp (modified) (15 diffs)
• imlib/video.cpp (modified) (2 diffs)
• imlib/window.cpp (modified) (14 diffs)
• level.cpp (modified) (8 diffs)
• level.h (modified) (1 diff)
• light.cpp (modified) (4 diffs)
• loader2.cpp (modified) (4 diffs)
• netcfg.cpp (modified) (4 diffs)
• particle.cpp (modified) (1 diff)
• property.cpp (modified) (8 diffs)
• sdlport/sound.cpp (modified) (1 diff)
• sdlport/video.cpp (modified) (2 diffs)
• specache.cpp (modified) (2 diffs)
• tool/abuse-tool.cpp (modified) (10 diffs)
• unixnfc.cpp (modified) (2 diffs)

abuse/branches/lol/src/ant.cpp

@@ -459 +459 @@
 
     String const &name = g_current_level->GetOriginalName();
-    ASSERT(name.Count() > (int)strlen(".spe") + 2,
+    ASSERT(name.count() > (int)strlen(".spe") + 2,
            "invalid level name %s", name.C());
-    String digits = name.Sub(name.Count() - strlen(".spe") - 2, 2);
+    String digits = name.sub(name.count() - strlen(".spe") - 2, 2);
 
     String msg = symbol_str("lev_complete");
@@ -474 +474 @@
         msg += name;
 
-    int w = wm->font()->Size().x * msg.Count(),
+    int w = wm->font()->Size().x * msg.count(),
         h = wm->font()->Size().y;
     int x=(x1+x2)/2-w/2,y=(y1+y2)/2-h/2;

abuse/branches/lol/src/cache.cpp

@@ -52 +52 @@
 int CrcManager::write_crc_file(char const *filename)  // return 0 on failure
 {
-    String msg = String::Printf("%s", symbol_str("calc_crc"));
+    String msg = String::format("%s", symbol_str("calc_crc"));
     if (stat_man)
         stat_man->push(msg.C(), NULL);
 
     int total = 0;
-    for (int i = 0; i < m_files.Count(); ++i)
+    for (int i = 0; i < m_files.count(); ++i)
     {
         int failed = 0;
@@ -75 +75 @@
 
         if (stat_man)
-            stat_man->update(i * 100 / m_files.Count());
+            stat_man->update(i * 100 / m_files.count());
     }
     if (stat_man)
@@ -86 +86 @@
     fp.write_uint16(total);
 
-    for (int i = 0; i < m_files.Count(); ++i)
+    for (int i = 0; i < m_files.count(); ++i)
     {
         int failed = 0;
@@ -94 +94 @@
             fp.write_uint32(crc);
             String const &name = GetFileName(i);
-            fp.write_uint8(name.Count() + 1);
-            fp.write(name.C(), name.Count() + 1);
+            fp.write_uint8(name.count() + 1);
+            fp.write(name.C(), name.count() + 1);
         }
     }
@@ -113 +113 @@
         uint32_t crc = fp.read_uint32();
         uint8_t len = fp.read_uint8();
-        name.Resize(len);
+        name.resize(len);
         fp.read(name.C(), len);
         set_crc(GetFileNumber(name), crc);
@@ -123 +123 @@
 void CrcManager::clean_up()
 {
-    for (int i = 0; i < m_files.Count(); ++i)
+    for (int i = 0; i < m_files.count(); ++i)
         delete m_files[i];
-    m_files.Empty();
+    m_files.empty();
 }
 
@@ -145 +145 @@
 int CrcManager::GetFileNumber(String const &name)
 {
-    for (int i = 0; i < m_files.Count(); ++i)
+    for (int i = 0; i < m_files.count(); ++i)
         if (name == m_files[i]->m_name)
             return i;
 
-    m_files.Push(new CrcedFile(name.C()));
-    return m_files.Count() - 1;
+    m_files.push(new CrcedFile(name.C()));
+    return m_files.count() - 1;
 }
 
@@ -218 +218 @@
     size += 2;        // total filenames
     for (int i = 0; i < crc_manager.total_filenames(); i++)
-        size += crc_manager.GetFileName(i).Count() + 2;    // filename + 0 + size of string
+        size += crc_manager.GetFileName(i).count() + 2;    // filename + 0 + size of string
 
     size += 4;       // number of entries saved
@@ -245 +245 @@
       {
         String const &name = crc_manager.GetFileName(i);
-        fp->write_uint8(name.Count() + 1);
-        fp->write(name.C(), name.Count() + 1);
+        fp->write_uint8(name.count() + 1);
+        fp->write(name.C(), name.count() + 1);
       }
 
@@ -698 +698 @@
         if (fp->open_failure())
         {
-            Log::Error("Could not open file %s\n", crc_manager.GetFileName(i->file_number).C());
+            msg::error("Could not open file %s\n", crc_manager.GetFileName(i->file_number).C());
             delete fp;
             exit(0);

abuse/branches/lol/src/cache.h

@@ -50 +50 @@
     void set_crc(int filenumber, uint32_t crc);
     void clean_up();
-    int total_filenames() { return m_files.Count(); }
+    int total_filenames() { return m_files.count(); }
     int write_crc_file(char const *filename);
     int load_crc_file(char const *filename);

abuse/branches/lol/src/demo.cpp

@@ -74 +74 @@
   the_game->load_level(name.C());
   record_file->write((void const *)"DEMO,VERSION:2", 14);
-  record_file->write_uint8(name.Count() + 1);
-  record_file->write(name.C(), name.Count() + 1);
+  record_file->write_uint8(name.count() + 1);
+  record_file->write(name.C(), name.count() + 1);
 
   uint8_t difficulty = 3;

abuse/branches/lol/src/dev.cpp

@@ -154 +154 @@
     {
         screen->Bar(m_pos, m_pos + m_size - ivec2(1), wm->dark_color());
-        String st = String::Printf("%d", newx);
+        String st = String::format("%d", newx);
         wm->font()->PutString(screen, m_pos + ivec2(30, 1), st, wm->bright_color());
         if (player_list)
@@ -1346 +1346 @@
         {
             String tmp = figures[o->otype]->fields[i]->descript_name;
-            while (tmp.Count() < maxl)
+            while (tmp.count() < maxl)
                 tmp += ' ';
             widgets << new ATextField(ivec2(wl, wh), DEV_AI_FIGURES + i, tmp.C(), "######",
@@ -1994 +1994 @@
         if (g_current_level->save(g_current_level->GetName().C(), 0))
         {
-          String msg = String::Printf(symbol_str("saved_level"),
+          String msg = String::format(symbol_str("saved_level"),
                                       g_current_level->GetName().C());
           the_game->show_help(msg.C());

abuse/branches/lol/src/game.cpp

@@ -2325 +2325 @@
             m_vdecl = new VertexDeclaration(VertexStream<vec2>(VertexUsage::Position));
 
-            m_vbo = new VertexBuffer(m_vertices.Bytes());
+            m_vbo = new VertexBuffer(m_vertices.bytes());
             void *vertices = m_vbo->Lock(0, 0);
-            memcpy(vertices, &m_vertices[0], m_vertices.Bytes());
+            memcpy(vertices, &m_vertices[0], m_vertices.bytes());
             m_vbo->Unlock();
 
@@ -2333 +2333 @@
         }
 
-        if (g_screen.Count())
+        if (g_screen.count())
         {
             m_screen->Bind();
-            m_screen->SetData(g_screen.Data());
+            m_screen->SetData(g_screen.data());
         }
 

abuse/branches/lol/src/gui.cpp

@@ -29 +29 @@
 {
   m_buttons = buttons;
-  m_current = start_on < m_buttons.Count() ? start_on : -1;
+  m_current = start_on < m_buttons.count() ? start_on : -1;
   act = 0;
-  for (int i = 0; i < m_buttons.Count(); ++i)
+  for (int i = 0; i < m_buttons.count(); ++i)
       m_buttons[i]->m_pos = m_pos;
 }
@@ -37 +37 @@
 ibox2 AIconSwitchButton::GetArea()
 {
-    if (!m_buttons.Count())
+    if (!m_buttons.count())
         return ibox2(m_pos, m_pos);
 
     ibox2 ret(10000, 10000, -10000, -10000);
 
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
     {
         ibox2 tmp = m_buttons[i]->GetArea();
@@ -54 +54 @@
 AWidget *AIconSwitchButton::unlink(int id)
 {
-  for (int i = 0; i < m_buttons.Count(); ++i)
+  for (int i = 0; i < m_buttons.count(); ++i)
   {
     if (m_buttons[i]->m_id == id)
     {
       AWidget *ret = m_buttons[i];
-      m_buttons.Remove(i);
-      if (m_current >= m_buttons.Count())
+      m_buttons.remove(i);
+      if (m_current >= m_buttons.count())
         m_current = 0;
       return ret;
@@ -77 +77 @@
   {
     ++m_current;
-    if (m_current >= m_buttons.Count())
+    if (m_current >= m_buttons.count())
       m_current = 0;
     m_buttons[m_current]->Draw(act, screen);
@@ -153 +153 @@
 AIconSwitchButton::~AIconSwitchButton()
 {
-  for (int i = 0; i < m_buttons.Count(); ++i)
+  for (int i = 0; i < m_buttons.count(); ++i)
     delete m_buttons[i];
-  m_buttons.Empty();
+  m_buttons.empty();
 }
 

abuse/branches/lol/src/imlib/filter.cpp

@@ -22 +22 @@
     ASSERT(colors >= 0 && colors <= 256, "bad color count");
 
-    m_table.Resize(colors, 0);
+    m_table.resize(colors, 0);
 }
 
@@ -29 +29 @@
 {
     int size = lol::max(from->Count(), to->Count());
-    m_table.Resize(size);
+    m_table.resize(size);
 
     int dk = to->FindDarkest(1);
@@ -52 +52 @@
 void Filter::Set(int color_num, int change_to)
 {
-    ASSERT(color_num >= 0 && color_num < m_table.Count(), "Bad colors_num");
+    ASSERT(color_num >= 0 && color_num < m_table.count(), "Bad colors_num");
 
     m_table[color_num] = change_to;
@@ -106 +106 @@
     int mul = 1 << (8 - color_bits);
     m_size = 1 << color_bits;
-    m_table.Resize(m_size * m_size * m_size);
+    m_table.resize(m_size * m_size * m_size);
 
     /* For each colour in the RGB cube, find the nearest palette element. */
@@ -134 +134 @@
     fp->seek(e->offset, 0);
     m_size = fp->read_uint16();
-    m_table.Resize(m_size * m_size * m_size);
-    fp->read(m_table.Data(), m_table.Bytes());
+    m_table.resize(m_size * m_size * m_size);
+    fp->read(m_table.data(), m_table.bytes());
 }
 
@@ -144 +144 @@
 size_t ColorFilter::DiskUsage()
 {
-    return sizeof(uint16_t) + m_table.Bytes();
+    return sizeof(uint16_t) + m_table.bytes();
 }
 
@@ -150 +150 @@
 {
     fp->write_uint16(m_size);
-    return fp->write(m_table.Data(), m_table.Bytes()) == m_table.Bytes();
+    return fp->write(m_table.data(), m_table.bytes()) == m_table.bytes();
 }
 

abuse/branches/lol/src/imlib/fonts.cpp

@@ -21 +21 @@
 void JCFont::PutString(AImage *screen, ivec2 pos, String const &st, int color)
 {
-    for (int i = 0; i < st.Count(); ++i, pos.x += m_size.x)
+    for (int i = 0; i < st.count(); ++i, pos.x += m_size.x)
         PutChar(screen, pos, st[i], color);
 }

abuse/branches/lol/src/imlib/image.cpp

@@ -34 +34 @@
 {
     m_size = size;
-    m_data.Resize(m_size.x * m_size.y);
+    m_data.resize(m_size.x * m_size.y);
 }
 
 AImage::~AImage()
 {
-    for (int i = image_list.Count(); i--; )
+    for (int i = image_list.count(); i--; )
         if (image_list[i] == this)
-            image_list.RemoveSwap(i);
+            image_list.remove_swap(i);
 
     delete m_special;
@@ -70 +70 @@
     m_size = size;
     m_special = NULL;
-    m_data.Resize(m_size.x * m_size.y);
+    m_data.resize(m_size.x * m_size.y);
     if (create_descriptor)
         m_special = new image_descriptor(size, create_descriptor == 2);
-    image_list.Push(this);
+    image_list.push(this);
 }
 
@@ -83 +83 @@
     m_size.y = fp->read_uint16();
     m_special = NULL;
-    m_data.Resize(m_size.x * m_size.y);
+    m_data.resize(m_size.x * m_size.y);
     for (int i = 0; i < m_size.y; i++)
         fp->read(scan_line(i), m_size.x);
-    image_list.Push(this);
+    image_list.push(this);
 }
 
 void image_uninit()
 {
-    while (image_list.Count())
+    while (image_list.count())
         delete image_list[0];
 }
@@ -329 +329 @@
 void image_descriptor::ReduceDirties()
 {
-    if (m_dirties.Count())
-    {
-        for (int i = 1; i < m_dirties.Count(); ++i)
+    if (m_dirties.count())
+    {
+        for (int i = 1; i < m_dirties.count(); ++i)
         {
             m_dirties[0].m_aa = lol::min(m_dirties[0].m_aa, m_dirties[i].m_aa);
@@ -337 +337 @@
         }
 
-        m_dirties.Resize(1);
+        m_dirties.resize(1);
     }
 }
@@ -354 +354 @@
         return;
 
-    for (int i = m_dirties.Count(); i--; )
+    for (int i = m_dirties.count(); i--; )
     {
         ADirtyRect &rect = m_dirties[i];
@@ -366 +366 @@
         {
             if (bb.y >= rect.m_bb.y + 1 && aa.y <= rect.m_aa.y)
-                m_dirties.RemoveSwap(i);
+                m_dirties.remove_swap(i);
             else if (bb.y >= rect.m_bb.y + 1)
                 rect.m_bb.y = aa.y - 1;
@@ -430 +430 @@
                 m_dirties << ADirtyRect(ivec2(rect.m_aa.x, bb.y), rect.m_bb);
 
-            m_dirties.RemoveSwap(i);
+            m_dirties.remove_swap(i);
         }
     }
@@ -449 +449 @@
     array<ADirtyRect> to_add;
 
-    for (int i = m_dirties.Count(); i--; )
+    for (int i = m_dirties.count(); i--; )
     {
         ADirtyRect &rect = m_dirties[i];
@@ -457 +457 @@
              && bb.x >= rect.m_bb.x + 1 && bb.y >= rect.m_bb.y + 1)
         {
-            m_dirties.RemoveSwap(i);
+            m_dirties.remove_swap(i);
         }
         else if (bb.x - 1 >= rect.m_aa.x && bb.y - 1 >= rect.m_aa.y
@@ -476 +476 @@
     }
 
-    for (int i = 0; i < to_add.Count(); ++i)
+    for (int i = 0; i < to_add.count(); ++i)
         AddDirty(to_add[i].m_aa, to_add[i].m_bb);
 
@@ -482 +482 @@
     m_dirties << ADirtyRect(aa, bb - ivec2(1));
 
-    if (m_dirties.Count() >= MAX_DIRTY)
+    if (m_dirties.count() >= MAX_DIRTY)
         ReduceDirties(); // reduce to one dirty rectangle, we have too many
 }
@@ -591 +591 @@
 
     m_size = new_size; // set the new height and width
-    m_data.Resize(m_size.x * m_size.y);
+    m_data.resize(m_size.x * m_size.y);
 
     uint8_t *sl1, *sl2;

abuse/branches/lol/src/imlib/image.h

@@ -116 +116 @@
         //return &m_data[y * m_size.x];
 
-        return m_data.Data() + y * m_size.x;
+        return m_data.data() + y * m_size.x;
     }
     AImage *copy(); // makes a copy of an image

abuse/branches/lol/src/imlib/input.cpp

@@ -35 +35 @@
 void AButtonBox::remap(Filter *f)
 {
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
         m_buttons[i]->remap(f);
 }
@@ -44 +44 @@
         return this;
 
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
         if (id == m_buttons[i]->m_id)
             return m_buttons[i];
@@ -57 +57 @@
     m_buttons = buttons;
     maxdown = MaxDown;
-    if (m_buttons.Count() && maxdown)
+    if (m_buttons.count() && maxdown)
         m_buttons[0]->push();  // the first button is automatically selected!
 }
@@ -63 +63 @@
 AButtonBox::~AButtonBox()
 {
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
         delete m_buttons[i];
 }
@@ -70 +70 @@
 {
     ibox2 ret;
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
     {
         ibox2 area = m_buttons[i]->GetArea();
@@ -86 +86 @@
 void AButtonBox::draw_first(AImage *screen)
 {
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
         m_buttons[i]->draw_first(screen);
 }
@@ -97 +97 @@
 void AButtonBox::Move(ivec2 pos)
 {
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
         m_buttons[i]->Move(pos + m_buttons[i]->m_pos);
     m_pos = pos;
@@ -104 +104 @@
 char const *AButtonBox::read()
 {
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
         if (*((int const *)m_buttons[i]->read()) == 0)
             return (char const *)m_buttons[i];
@@ -117 +117 @@
     case EV_MOUSE_BUTTON:
         // see if the user clicked on a button
-        for (int i = 0, found = 0; i < m_buttons.Count() && !found; ++i)
+        for (int i = 0, found = 0; i < m_buttons.count() && !found; ++i)
         {
             ibox2 area = m_buttons[i]->GetArea();
@@ -125 +125 @@
 
                 int total = 0;
-                for (int j = 0; j < m_buttons.Count(); ++j)
+                for (int j = 0; j < m_buttons.count(); ++j)
                     if (*((int const *)m_buttons[j]->read()) == 0)
                         total++;
@@ -131 +131 @@
                 if (*((int const *)m_buttons[i]->read()) == 0)  // did the user press or release the button
                 {
-                    for (int j = 0; j < m_buttons.Count() && total > maxdown; ++j)
+                    for (int j = 0; j < m_buttons.count() && total > maxdown; ++j)
                         if ((i != j || maxdown == 0) && *((int const *)m_buttons[j]->read()) == 0)
                         {
@@ -156 +156 @@
 void AButtonBox::add_button(AButton *b)
 {
-    m_buttons.Push(b);
+    m_buttons.push(b);
 }
 
@@ -162 +162 @@
 {
     ivec2 on = m_pos;
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
     {
         ibox2 area = m_buttons[i]->GetArea();
@@ -173 +173 @@
 {
     ivec2 on = m_pos;
-    for (int i = 0; i < m_buttons.Count(); ++i)
+    for (int i = 0; i < m_buttons.count(); ++i)
     {
         ibox2 area = m_buttons[i]->GetArea();
@@ -192 +192 @@
         return ibox2(m_pos, m_pos + pressed->Size() - ivec2(1));
 
-    if (m_text.Count())
-        return ibox2(m_pos, m_pos + wm->font()->Size() * ivec2(m_text.Count(), 1) + ivec2(6));
+    if (m_text.count())
+        return ibox2(m_pos, m_pos + wm->font()->Size() * ivec2(m_text.count(), 1) + ivec2(6));
 
     return ibox2(m_pos, m_pos + visual->Size() + ivec2(6));
@@ -407 +407 @@
     }
 
-    if ((up && m_text.Count()) || (!up && !visual))
+    if ((up && m_text.count()) || (!up && !visual))
     {
         wm->font()->PutString(screen, m_pos + ivec2(4, 5), m_text, wm->black());

abuse/branches/lol/src/imlib/palette.cpp

@@ -27 +27 @@
 {
     int count = fp->read_uint16();
-    m_colors.Resize(count);
-    m_used.Resize(count, 0);
+    m_colors.resize(count);
+    m_used.resize(count, 0);
     set_all_unused();
-    fp->read(m_colors.Data(), m_colors.Bytes());
+    fp->read(m_colors.data(), m_colors.bytes());
     bg = 0;
 }
@@ -38 +38 @@
     fp->seek(e->offset,0);
     int count = fp->read_uint16();
-    m_colors.Resize(count);
-    m_used.Resize(count, 0);
+    m_colors.resize(count);
+    m_used.resize(count, 0);
     set_all_unused();
-    fp->read(m_colors.Data(), m_colors.Bytes());
+    fp->read(m_colors.data(), m_colors.bytes());
     bg = 0;
 }
@@ -47 +47 @@
 int Palette::write(bFILE *fp)
 {
-    fp->write_uint16(m_colors.Count());
-    return fp->write(m_colors.Data(), m_colors.Bytes()) == m_colors.Bytes();
+    fp->write_uint16(m_colors.count());
+    return fp->write(m_colors.data(), m_colors.bytes()) == m_colors.bytes();
 }
 
@@ -54 +54 @@
 {
      int c = 0, d = 0x100000;
-     for (int i = 0; i < m_colors.Count(); ++i)
+     for (int i = 0; i < m_colors.count(); ++i)
      {
          int nd = sqlength((ivec3)(color - m_colors[i]));
@@ -68 +68 @@
 int Palette::FindColor(u8vec3 color) const
 {
-    for (int i = 0; i < m_colors.Count(); ++i)
+    for (int i = 0; i < m_colors.count(); ++i)
         if (m_used[i] && m_colors[i] == color)
             return i;
@@ -93 +93 @@
 void Palette::make_black_white()
 {
-    for (int i = 0; i < m_colors.Count(); i++)
-    {
-        uint8_t c = (uint8_t)((double)i / m_colors.Count() * 255);
+    for (int i = 0; i < m_colors.count(); i++)
+    {
+        uint8_t c = (uint8_t)((double)i / m_colors.count() * 255);
         m_colors[i] = u8vec3(c);
     }
@@ -102 +102 @@
 void Palette::set_rgbs()
 {
-    ASSERT(m_colors.Count() == 256);
+    ASSERT(m_colors.count() == 256);
 
     for (int i = 0; i < 64; i++)
@@ -123 +123 @@
 void Palette::set_all_used()
 {
-    memset(m_used.Data(), 1, m_used.Bytes());
+    memset(m_used.data(), 1, m_used.bytes());
 }
 
 void Palette::set_all_unused()
 {
-    memset(m_used.Data(), 0, m_used.Bytes());
+    memset(m_used.data(), 0, m_used.bytes());
 }
 
 Palette *Palette::Copy() const
 {
-    Palette *p = new Palette(m_colors.Count());
+    Palette *p = new Palette(m_colors.count());
     p->m_colors = m_colors;
     p->m_used = m_used;
@@ -149 +149 @@
     m_used[0] = 1;
 
-    for (int i = 1; i < m_colors.Count(); i++)
+    for (int i = 1; i < m_colors.count(); i++)
         m_used[i] = 0;
 
-    if (m_colors.Count() == 256)
-        for (int i = 0; i < m_colors.Count(); i++)
+    if (m_colors.count() == 256)
+        for (int i = 0; i < m_colors.count(); i++)
             m_colors[i] = u8vec3(((i >> 5) & 7) * 255 / 7,
                                  ((i >> 2) & 7) * 255 / 7,
                                  (i & 3) * 255 / 7);
-    else if (m_colors.Count() == 16)
-        for (int i = 0; i < m_colors.Count(); i++)
+    else if (m_colors.count() == 16)
+        for (int i = 0; i < m_colors.count(); i++)
             m_colors[i] = u8vec3(255 - (i & 3),
                                  255 - ((i & 4) >> 2),
                                  255 - ((i & 8) >> 3));
     else
-        for (int i = 0; i < m_colors.Count(); i++)
+        for (int i = 0; i < m_colors.count(); i++)
             m_colors[i] = u8vec3(255 - (i % 3),
                                  255 - ((i + 1) % 3),
@@ -174 +174 @@
     {
         int m = -amount;
-        for (int i = 0; i < m_colors.Count(); i++)
+        for (int i = 0; i < m_colors.count(); i++)
         {
             u8vec3 c = m_colors[i];
@@ -183 +183 @@
     {
         int m = amount;
-        for (int i = 0; i < m_colors.Count(); i++)
+        for (int i = 0; i < m_colors.count(); i++)
         {
             u8vec3 c = m_colors[i];
@@ -211 +211 @@
     ASSERT(number_colors > 0, "Palette::constructor - need at least one color!");
 
-    m_colors.Resize(number_colors);
-    m_used.Resize(number_colors);
+    m_colors.resize(number_colors);
+    m_used.resize(number_colors);
     defaults();
 }
@@ -220 +220 @@
     int brv = 0, bri = 0;
 
-    for (int i = 0; i < m_colors.Count(); ++i)
+    for (int i = 0; i < m_colors.count(); ++i)
     {
         if (all || m_used[i])
@@ -240 +240 @@
     int brv = 258, bri = 0;
 
-    for (int i = 0; i < m_colors.Count(); ++i)
+    for (int i = 0; i < m_colors.count(); ++i)
     {
         if (all || m_used[i])
@@ -260 +260 @@
     // Force to only 256 colours.
     // Shouldn't be needed, but best to be safe.
-    if (m_colors.Count() > 256)
-        m_colors.Resize(256);
+    if (m_colors.count() > 256)
+        m_colors.resize(256);
 
     delete lastl;
@@ -274 +274 @@
 void Palette::FadeTo(int total_fades, int fade_on, u8vec3 dest)
 {
-    for (int i = 0; i < m_colors.Count(); i++)
+    for (int i = 0; i < m_colors.count(); i++)
         m_colors[i] += u8vec3(ivec3(dest - m_colors[i]) * fade_on / total_fades);
 }

abuse/branches/lol/src/imlib/palette.h

@@ -27 +27 @@
     Palette *Copy() const;
 
-    int Count() const { return m_colors.Count(); }
-    u8vec3 *Data() { return m_colors.Data(); }
-    u8vec3 const *Data() const { return m_colors.Data(); }
+    int Count() const { return m_colors.count(); }
+    u8vec3 *Data() { return m_colors.data(); }
+    u8vec3 const *Data() const { return m_colors.data(); }
 
     u8vec3 GetColor(int x) const;

abuse/branches/lol/src/imlib/specs.cpp

@@ -573 +573 @@
 void SpecDir::FullyLoad(bFILE *fp)
 {
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
     {
         SpecEntry *se = m_entries[i];
@@ -610 +610 @@
 
     // calculate the size of directory info
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
         o += 1 + 1 + strlen(m_entries[i]->name) + 1 + 1 + 8;
 
     // calculate offset for each entry
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
     {
         m_entries[i]->offset = o;
@@ -623 +623 @@
 SpecEntry *SpecDir::find(char const *name, int type)
 {
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
         if (!strcmp(m_entries[i]->name, name) && m_entries[i]->type == type)
             return m_entries[i];
@@ -643 +643 @@
 int SpecDir::find_number(char const *name)
 {
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
         if (!strcmp(m_entries[i]->name, name))
             return i;
@@ -651 +651 @@
 int SpecDir::find_number(int type)
 {
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
         if (m_entries[i]->type == type)
             return i;
@@ -660 +660 @@
 {
     int ret = 0;
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
         if (m_entries[i]->type == type)
             ++ret;
@@ -669 +669 @@
 {
     printf("[   Entry type   ][   Entry name   ][  Size  ][ Offset ]\n");
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
         m_entries[i]->Print();
 }
@@ -684 +684 @@
     {
         int total = fp->read_uint16();
-        m_entries.Resize(total);
+        m_entries.resize(total);
         long start = fp->tell();
 
@@ -698 +698 @@
         }
 
-        m_data.Resize(data_size);
-        uint8_t *dp = m_data.Data();
+        m_data.resize(data_size);
+        uint8_t *dp = m_data.data();
 
         fp->seek(start, SEEK_SET);
@@ -724 +724 @@
     else
     {
-        m_data.Empty();
-        m_entries.Empty();
+        m_data.empty();
+        m_entries.empty();
     }
 }
@@ -772 +772 @@
 long SpecDir::data_start_offset()
 {
-    if (m_entries.Count())
+    if (m_entries.count())
         return m_entries[0]->offset;
 
@@ -781 +781 @@
 long SpecDir::data_end_offset()
 {
-    if (m_entries.Count())
-        return m_entries.Last()->offset + m_entries.Last()->size;
+    if (m_entries.count())
+        return m_entries.last()->offset + m_entries.last()->size;
 
   return SPEC_SIG_SIZE + 2;
@@ -795 +795 @@
         return 0;
 
-    fp->write_uint16(m_entries.Count());
-
-    for (int i = 0; i < m_entries.Count(); ++i)
+    fp->write_uint16(m_entries.count());
+
+    for (int i = 0; i < m_entries.count(); ++i)
     {
         if (fp->write(&m_entries[i]->type, 1) != 1)
@@ -867 +867 @@
 void SpecDir::remove(SpecEntry *e)
 {
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
     {
         if (m_entries[i] == e)
         {
             delete e;
-            m_entries.Remove(i);
+            m_entries.remove(i);
             return;
         }
@@ -881 +881 @@
 void SpecDir::add_by_hand(SpecEntry *e)
 {
-    m_entries.Push(e);
+    m_entries.push(e);
 }
 
 void SpecDir::delete_entries()   // if the directory was created by hand instead of by file
 {
-    for (int i = 0; i < m_entries.Count(); ++i)
+    for (int i = 0; i < m_entries.count(); ++i)
         delete m_entries[i];
-    m_entries.Empty();
+    m_entries.empty();
 }
 

abuse/branches/lol/src/imlib/video.cpp

@@ -31 +31 @@
     else
     {
-        for (int i = 0; i < im->m_special->m_dirties.Count(); ++i)
+        for (int i = 0; i < im->m_special->m_dirties.count(); ++i)
         {
             ADirtyRect &rect = im->m_special->m_dirties[i];
@@ -40 +40 @@
         }
 
-        im->m_special->m_dirties.Resize(0);
+        im->m_special->m_dirties.resize(0);
     }
 

abuse/branches/lol/src/imlib/window.cpp

@@ -388 +388 @@
 
     _x1 = left_border();
-    _y1 = name.Count() ? top_border() : jw_top + 5;
+    _y1 = name.count() ? top_border() : jw_top + 5;
 
     m_surf = nullptr;
@@ -411 +411 @@
     m_surf = new AImage(m_size, 2);
     // Keep this from getting destroyed when image list is cleared
-    image_list.Pop();
+    image_list.pop();
     m_surf->clear(backg);
     inm->m_surf = m_surf;
@@ -438 +438 @@
     m_size = ivec2(2);
 
-    for (int i = 0; i < inm->m_fields.Count(); ++i)
+    for (int i = 0; i < inm->m_fields.count(); ++i)
     {
         inm->m_fields[i]->set_owner(this);
@@ -531 +531 @@
 AWidget *InputManager::unlink(int id)
 {
-    for (int i = 0; i < m_fields.Count(); ++i)
+    for (int i = 0; i < m_fields.count(); ++i)
     {
         /* Does this item match the ID? */
@@ -537 +537 @@
         {
             AWidget *ret = m_fields[i];
-            m_fields.Remove(i);
+            m_fields.remove(i);
 
             if (m_active == i)
-                m_active = m_fields.Count() ? 0 : -1;
+                m_active = m_fields.count() ? 0 : -1;
 
             return ret;
@@ -556 +556 @@
 InputManager::~InputManager()
 {
-    for (int i = 0; i < m_fields.Count(); ++i)
+    for (int i = 0; i < m_fields.count(); ++i)
         delete m_fields[i];
-    m_fields.Empty();
+    m_fields.empty();
 }
 
@@ -587 +587 @@
     if ((ev.type==EV_MOUSE_BUTTON && ev.mouse_button==1) || ev.type==EV_MOUSE_MOVE)
     {
-      for (int i = 0; i < m_fields.Count(); ++i)
+      for (int i = 0; i < m_fields.count(); ++i)
       {
         ibox2 area = m_fields[i]->GetArea();
@@ -610 +610 @@
       {
         ++m_active;
-      } while (m_active < m_fields.Count() && !m_fields[m_active]->selectable());
-
-      if (m_active >= m_fields.Count())
+      } while (m_active < m_fields.count() && !m_fields[m_active]->selectable());
+
+      if (m_active >= m_fields.count())
         m_active = -1;
       if (m_active >= 0)
@@ -646 +646 @@
     if (m_owner)
         m_surf = m_owner->m_surf;
-    for (int i = 0; i < m_fields.Count(); ++i)
+    for (int i = 0; i < m_fields.count(); ++i)
         m_fields[i]->draw_first(m_surf);
     if (m_active >= 0)
@@ -661 +661 @@
     m_fields = fields;
     m_active = -1;
-    for (int i = 0; i < m_fields.Count(); ++i)
+    for (int i = 0; i < m_fields.count(); ++i)
         if (m_fields[i]->selectable())
         {
@@ -681 +681 @@
     m_fields = fields;
     m_active = -1;
-    for (int i = 0; i < m_fields.Count(); ++i)
+    for (int i = 0; i < m_fields.count(); ++i)
         if (m_fields[i]->selectable())
         {
@@ -691 +691 @@
 void InputManager::grab_focus(AWidget *f)
 {
-    for (int i = 0; i < m_fields.Count(); ++i)
+    for (int i = 0; i < m_fields.count(); ++i)
         if (f == m_fields[i])
             m_grab = i;
@@ -707 +707 @@
 void InputManager::remap(Filter *f)
 {
-    for (int i = 0; i < m_fields.Count(); ++i)
+    for (int i = 0; i < m_fields.count(); ++i)
         m_fields[i]->remap(f);
     redraw();
@@ -720 +720 @@
 AWidget *InputManager::get(int id)
 {
-    for (int i = 0; i < m_fields.Count(); ++i)
+    for (int i = 0; i < m_fields.count(); ++i)
     {
         AWidget *ret = m_fields[i]->find(id);

abuse/branches/lol/src/level.cpp

@@ -844 +844 @@
   bg_width=nbw;
 
-  String msg = String::Printf("Level %s size now %d %d\n", GetName().C(),
+  String msg = String::format("Level %s size now %d %d\n", GetName().C(),
                               foreground_width(), foreground_height());
   the_game->show_help(msg.C());
@@ -1266 +1266 @@
     fp->seek(e->offset, 0);
     int len = fp->read_uint8(); // read the length of the string
-    m_first_name.Resize(len);
+    m_first_name.resize(len);
     fp->read(m_first_name.C(), len); // read the string
   }
@@ -1424 +1424 @@
 String get_prof_assoc_filename(String const &filename)
 {
-    int dot = filename.LastIndexOf('.');
-    return (dot == -1 ? filename : filename.Sub(0, dot)) + ".cpf";
+    int dot = filename.last_index_of('.');
+    return (dot == -1 ? filename : filename.sub(0, dot)) + ".cpf";
 }
 
 void Level::level_loaded_notify()
 {
-  String n = m_first_name.Count() ? m_first_name : m_name;
-  if (n.Sub(0, 12) == "levels/level")
+  String n = m_first_name.count() ? m_first_name : m_name;
+  if (n.sub(0, 12) == "levels/level")
   {
     char nm[100];
@@ -1470 +1470 @@
   SpecDir sd;
   sd.add_by_hand(new SpecEntry(SPEC_DATA_ARRAY, "Copyright 1995 Crack dot Com, All Rights reserved", NULL, 0, 0));
-  if (m_first_name.Count())
+  if (m_first_name.count())
     sd.add_by_hand(new SpecEntry(SPEC_DATA_ARRAY, "first name",
-                                 NULL, m_first_name.Count() + 2, 0));
+                                 NULL, m_first_name.count() + 2, 0));
 
 
@@ -1587 +1587 @@
   i->clear();
   scale_put(im,i,0,0,160,100);
-  if (m_first_name.Count())
-    wm->font()->PutString(i, ivec2(80 - m_first_name.Count() * wm->font()->Size().x / 2, 100), m_first_name.C());
+  if (m_first_name.count())
+    wm->font()->PutString(i, ivec2(80 - m_first_name.count() * wm->font()->Size().x / 2, 100), m_first_name.C());
 
   time_t t;
@@ -2093 +2093 @@
   if (cache.prof_is_on())
   {
-    String pf_name = get_prof_assoc_filename(m_first_name.Count()
+    String pf_name = get_prof_assoc_filename(m_first_name.count()
                                               ? m_name : m_first_name);
 
@@ -2117 +2117 @@
   {
     // get cache info from orignal filename if this is a savegame
-    String pf_name = get_prof_assoc_filename(m_first_name.Count()
+    String pf_name = get_prof_assoc_filename(m_first_name.count()
                                               ? m_name : m_first_name);
 
@@ -2181 +2181 @@
         if( !fp->open_failure() )
         {
-            if( m_first_name.Count() )
+            if( m_first_name.count() )
             {
-                fp->write_uint8(m_first_name.Count() + 1);
-                fp->write(m_first_name.C(), m_first_name.Count() + 1);
+                fp->write_uint8(m_first_name.count() + 1);
+                fp->write(m_first_name.C(), m_first_name.count() + 1);
             }
             else

abuse/branches/lol/src/level.h

@@ -79 +79 @@
     String const & GetOriginalName() const
     {
-        if (m_first_name.Count())
+        if (m_first_name.count())
             return m_first_name;
         return m_name;

abuse/branches/lol/src/light.cpp

@@ -408 +408 @@
              && p2.x <= p->m_p2.x && p2.y <= p->m_p2.y)
         {
-            if (p->m_lights.Count() == MAX_LP)
+            if (p->m_lights.count() == MAX_LP)
                 return;
 
@@ -454 +454 @@
             InsertLight(first, p);
 
-            p->m_lights.Push(who);
+            p->m_lights.push(who);
             return;
         }
@@ -470 +470 @@
                 AddLight(first, ivec2(p->m_p1.x, p->m_p2.y + 1), ivec2(p->m_p2.x, p2.y), who);
 
-            if (p->m_lights.Count() < MAX_LP)
-                p->m_lights.Push(who);
+            if (p->m_lights.count() < MAX_LP)
+                p->m_lights.push(who);
 
             return;
@@ -536 +536 @@
     int lv = min_light_level;
 
-    for (int i = 0; i < lp->m_lights.Count(); ++i)
+    for (int i = 0; i < lp->m_lights.count(); ++i)
     {
         LightSource *l = lp->m_lights[i];

abuse/branches/lol/src/loader2.cpp

@@ -120 +120 @@
     delete fp;
 
-    for (int i = 0; i < sd.m_entries.Count(); i++)
+    for (int i = 0; i < sd.m_entries.count(); i++)
     {
       SpecEntry *se = sd.m_entries[i];
@@ -144 +144 @@
         backtiles=(int *)realloc(backtiles,sizeof(int)*(nbacktiles+bt));
 
-      for (int i = 0; i < sd.m_entries.Count(); i++)
+      for (int i = 0; i < sd.m_entries.count(); i++)
       {
     if (sd.m_entries[i]->type==SPEC_FORETILE)
@@ -185 +185 @@
       SpecDir sd(fp);
       delete fp;
-      for (int i = 0; i < sd.m_entries.Count(); i++)
+      for (int i = 0; i < sd.m_entries.count(); i++)
       {
         SpecEntry *spe = sd.m_entries[i];
@@ -231 +231 @@
       delete fp;
 
-      for (int i = 0; i < sd.m_entries.Count(); i++)
+      for (int i = 0; i < sd.m_entries.count(); i++)
       {
         SpecEntry *spe = sd.m_entries[i];

abuse/branches/lol/src/netcfg.cpp

@@ -341 +341 @@
   {
     list << center_ifield(new ATextField(ivec2(x, y + 30), NET_NAME, symbol_str("your_name"), "************************", name), x, x + ns_w, nullptr);
-    list << center_ifield(new ATextField(ivec2(0, 0), NET_SERVER_NAME, symbol_str("server_name"), "************************", game_name), x, x + ns_w, list.Last());
-    list << center_ifield(new AInfoField(ivec2(0, 0), 0, symbol_str("min_play")), x, x + ns_w, list.Last());
+    list << center_ifield(new ATextField(ivec2(0, 0), NET_SERVER_NAME, symbol_str("server_name"), "************************", game_name), x, x + ns_w, list.last());
+    list << center_ifield(new AInfoField(ivec2(0, 0), 0, symbol_str("min_play")), x, x + ns_w, list.last());
 
     AButtonBox *b = new AButtonBox(ivec2(0, 0), NET_MIN, 1);
@@ -356 +356 @@
     b->add_button(new AButton(ivec2(0, 0), MIN_1,"1"));
     b->arrange_left_right();
-    center_ifield(b, x, x + ns_w, list.Last());
+    center_ifield(b, x, x + ns_w, list.last());
     b->arrange_left_right();
     list << b;
 
-    list << center_ifield(new AInfoField(ivec2(0, 0), 0, symbol_str("max_play")), x, x + ns_w, list.Last());
+    list << center_ifield(new AInfoField(ivec2(0, 0), 0, symbol_str("max_play")), x, x + ns_w, list.last());
 
     b = new AButtonBox(ivec2(0, 0), NET_MAX, 1);
@@ -373 +373 @@
     b->add_button(new AButton(ivec2(0, 0), MAX_2, "2"));
     b->arrange_left_right();
-    center_ifield(b, x, x + ns_w, list.Last());
+    center_ifield(b, x, x + ns_w, list.last());
     b->arrange_left_right();
     list << b;
 
-    list << center_ifield(new AInfoField(ivec2(0, 0), 0, symbol_str("level_size")), x, x + ns_w, list.Last());
+    list << center_ifield(new AInfoField(ivec2(0, 0), 0, symbol_str("level_size")), x, x + ns_w, list.last());
 
     b = new AButtonBox(ivec2(0, 0), LEVEL_BOX, 1);
@@ -386 +386 @@
     b->add_button(q);
     b->arrange_left_right();
-    center_ifield(b, x, x + ns_w, list.Last());
+    center_ifield(b, x, x + ns_w, list.last());
     b->arrange_left_right();
     list << b;
 
-    list << center_ifield(new ATextField(ivec2(0, 0), NET_KILLS, symbol_str("kills_to_win"), "***", "25"), x, x + ns_w, list.Last());
+    list << center_ifield(new ATextField(ivec2(0, 0), NET_KILLS, symbol_str("kills_to_win"), "***", "25"), x, x + ns_w, list.last());
   }
   else

abuse/branches/lol/src/particle.cpp

@@ -107 +107 @@
   frames=(int *)malloc(sizeof(int)*tframes);
 
-  for (int i = 0, j = 0; i < sd.m_entries.Count(); i++)
+  for (int i = 0, j = 0; i < sd.m_entries.count(); i++)
     if (sd.m_entries[i]->type == SPEC_PARTICLE)
       frames[j++] = cache.reg(fn, sd.m_entries[i]->name, SPEC_PARTICLE, 1);

abuse/branches/lol/src/property.cpp

@@ -44 +44 @@
     void Set(int x)
     {
-        if (m_string.Count())
-            m_string.Resize(0);
+        // FIXME: would empty() work here?
+        if (m_string.count())
+            m_string.resize(0);
         m_num = x;
     }
@@ -62 +63 @@
 APropertyManager::~APropertyManager()
 {
-    for (int i = 0; i < m_props.Count(); ++i)
+    for (int i = 0; i < m_props.count(); ++i)
         delete m_props[i];
 }
@@ -68 +69 @@
 AProperty *APropertyManager::find(char const *name)
 {
-    for (int i = 0; i < m_props.Count(); ++i)
+    for (int i = 0; i < m_props.count(); ++i)
         if (m_props[i]->m_name == name)
             return m_props[i];
@@ -77 +78 @@
 {
     AProperty *f = find(name);
-    if (!f || f->m_string.Count())
+    if (!f || f->m_string.count())
         return def;
     return f->m_num;
@@ -85 +86 @@
 {
     AProperty *f = find(name);
-    if (!f || !f->m_string.Count())
+    if (!f || !f->m_string.count())
         return def;
     return f->m_string.C();
@@ -96 +97 @@
         f->Set((int)def);
     else
-        m_props.Push(new AProperty(name, (int)def));
+        m_props.push(new AProperty(name, (int)def));
 }
 
@@ -105 +106 @@
         f->Set(def);
     else
-        m_props.Push(new AProperty(name, def));
+        m_props.push(new AProperty(name, def));
 }
 
@@ -117 +118 @@
     }
 
-    for (int i = 0; i < m_props.Count(); ++i)
+    for (int i = 0; i < m_props.count(); ++i)
     {
         fprintf(fp, "%s = ", m_props[i]->m_name.C());
-        if (m_props[i]->m_string.Count())
+        if (m_props[i]->m_string.count())
             fprintf(fp, "\"%s\"\n", m_props[i]->m_string.C());
         else

abuse/branches/lol/src/sdlport/sound.cpp

@@ -188 +188 @@
     music = NULL;
 
-    String realname = String::Printf("%s%s", get_filename_prefix(), m_name.C());
+    String realname = String::format("%s%s", get_filename_prefix(), m_name.C());
 
     uint32_t data_size;

abuse/branches/lol/src/sdlport/video.cpp

@@ -50 +50 @@
 
     /* Temporary screen buffer */
-    g_screen.Resize(xres * yres);
+    g_screen.resize(xres * yres);
 
     // Create the screen image
@@ -124 +124 @@
     int h = ye - srcy;
 
-    dpixel = g_screen.Data() + x + y * xres;
+    dpixel = g_screen.data() + x + y * xres;
 
     // Update surface part

abuse/branches/lol/src/specache.cpp

@@ -39 +39 @@
     for (FileNode *f = m_list; f; f = f->m_next)
     {
-        uint8_t len = f->m_name.Count() + 1;
+        uint8_t len = f->m_name.count() + 1;
         fp->write(&len, 1);
         fp->write(f->m_name.C(), len);
@@ -74 +74 @@
     m_list = f;
 
-    m_size += f->m_sd->m_data.Count();
+    m_size += f->m_sd->m_data.count();
     if (parent)
         *parent = f;

abuse/branches/lol/src/tool/abuse-tool.cpp

@@ -131 +131 @@
         dir.FullyLoad(&fp);
 
-        for (int i = 0; i < dir.m_entries.Count(); i++)
+        for (int i = 0; i < dir.m_entries.count(); i++)
         {
             SpecEntry *se = dir.m_entries[i];
@@ -210 +210 @@
         int id = atoi(argv[3]);
 
-        if (id < 0 || id >= dir.m_entries.Count())
+        if (id < 0 || id >= dir.m_entries.count())
         {
             fprintf(stderr, "abuse-tool: id %i not found in %s\n", id, file);
@@ -235 +235 @@
         int palid = argc > 4 ? atoi(argv[4]) : -1;
 
-        for (int i = 0; palid == -1 && i < dir.m_entries.Count(); i++)
+        for (int i = 0; palid == -1 && i < dir.m_entries.count(); i++)
             if (dir.m_entries[i]->type == SPEC_PALETTE)
                 palid = i;
@@ -255 +255 @@
         int dst = atoi(argv[4]);
 
-        if (src < 0 || src >= dir.m_entries.Count()
-             || dst < 0 || dst >= dir.m_entries.Count())
+        if (src < 0 || src >= dir.m_entries.count()
+             || dst < 0 || dst >= dir.m_entries.count())
         {
             fprintf(stderr, "abuse-tool: ids %i/%i out of range\n", src, dst);
@@ -273 +273 @@
         int id = atoi(argv[3]);
 
-        if (id < 0 || id >= dir.m_entries.Count())
+        if (id < 0 || id >= dir.m_entries.count())
         {
             fprintf(stderr, "abuse-tool: id %i out of range\n", id);
@@ -289 +289 @@
         int id = atoi(argv[3]);
 
-        if (id < 0 || id >= dir.m_entries.Count())
+        if (id < 0 || id >= dir.m_entries.count())
         {
             fprintf(stderr, "abuse-tool: id %i out of range\n", id);
@@ -295 +295 @@
         }
 
-        dir.m_entries.Remove(id);
+        dir.m_entries.remove(id);
         dir.FullyLoad(&fp);
     }
@@ -304 +304 @@
 
         if (id == -1)
-            id = dir.m_entries.Count();
-
-        if (id < 0 || id > dir.m_entries.Count())
+            id = dir.m_entries.count();
+
+        if (id < 0 || id > dir.m_entries.count())
         {
             fprintf(stderr, "abuse-tool: id %i out of range\n", id);
@@ -314 +314 @@
         dir.FullyLoad(&fp);
 
-        dir.m_entries.Resize(dir.m_entries.Count() + 1);
-        for (int i = dir.m_entries.Count() - 1; i-- > id; )
+        // FIXME: use insert() here!
+        dir.m_entries.resize(dir.m_entries.count() + 1);
+        for (int i = dir.m_entries.count() - 1; i-- > id; )
             dir.m_entries[i + 1] = dir.m_entries[i];
 
@@ -368 +369 @@
     fp.seek(0, SEEK_SET); // FIXME: create a new file
     dir.write(&fp);
-    for (int i = 0; i < dir.m_entries.Count(); i++)
+    for (int i = 0; i < dir.m_entries.count(); i++)
         fp.write(dir.m_entries[i]->data, dir.m_entries[i]->size);
 

abuse/branches/lol/src/unixnfc.cpp

@@ -583 +583 @@
         else if (ev.type!=EV_MOUSE_MOVE)  // no need to save mouse move events (likely to be a lot)
         {
-          input.Push(ev);
+          input.push(ev);
         }
       } while (wm->event_waiting());
@@ -595 +595 @@
     {
       wm->close_window(abort);
-      while (input.Count())               // push all the key events
-        wm->push_event(input.Pop());
+      while (input.count())               // push all the key events
+        wm->push_event(input.pop());
     }
   }