Changeset 719Tweet

Timestamp:

Sep 23, 2013, 11:03:03 PM (9 years ago)

Author:

Sam Hocevar

Message:

core: use vec2::zero and ivec2::zero in a few places.

Location:

abuse/branches/lol/src

Files:

• automap.cpp (modified) (2 diffs)
• chars.h (modified) (1 diff)
• cop.cpp (modified) (1 diff)
• game.cpp (modified) (2 diffs)
• gui.cpp (modified) (1 diff)
• imlib/filesel.cpp (modified) (1 diff)
• imlib/filter.cpp (modified) (3 diffs)
• imlib/fonts.cpp (modified) (1 diff)
• imlib/image.cpp (modified) (8 diffs)
• imlib/palette.cpp (modified) (1 diff)
• imlib/sprite.cpp (modified) (2 diffs)
• imlib/transimage.cpp (modified) (10 diffs)
• imlib/window.cpp (modified) (5 diffs)
• light.cpp (modified) (2 diffs)
• loadgame.cpp (modified) (1 diff)
• menu.cpp (modified) (2 diffs)
• sdlport/hmi.cpp (modified) (1 diff)
• transp.cpp (modified) (1 diff)
• view.cpp (modified) (2 diffs)

abuse/branches/lol/src/automap.cpp

@@ -145 +145 @@
 
   // set the clip back to full window size because soemthing else could mess with the area
-  automap_window->m_surf->SetClip(ivec2(0), screen->Size());
+  automap_window->m_surf->SetClip(ivec2::zero, screen->Size());
 }
 
@@ -160 +160 @@
         old_dy = -1000;
 
-        automap_window = wm->CreateWindow(ivec2(0), ivec2(w * AUTOTILE_WIDTH,
+        automap_window = wm->CreateWindow(ivec2::zero, ivec2(w * AUTOTILE_WIDTH,
                                           h * AUTOTILE_HEIGHT), "Map");
         automap_window->m_surf->Bar(ivec2(17, 1), ivec2(17 + 8 * 6 + 3, 6),

abuse/branches/lol/src/chars.h

@@ -90 +90 @@
     ~CharacterType();
 
-  uint16_t ts,tiv,tv; // total states, total index vars, total local vars
-  sequence **seq;   // [0..ts-1]
+  int ts, tiv, tv; // total states, total index vars, total local vars
+  sequence **seq;  // [0..ts-1]
   LSymbol **seq_syms;  // symbol describing what this state is [0..ts-1]
 

abuse/branches/lol/src/cop.cpp

@@ -587 +587 @@
       o->set_state((character_state)S_climbing);
       o->set_gravity(0);
-      o->m_vel = ivec2(0);
-      o->m_accel = ivec2(0);
+      o->m_vel = ivec2::zero;
+      o->m_accel = ivec2::zero;
       return 0;
     } else

abuse/branches/lol/src/game.cpp

@@ -120 +120 @@
     widgets << new AButton(ivec2(0, 0), ID_QUIT_OK, "Quit");
     widgets << new AInfoField(ivec2(0, wm->font()->Size().y * 2), ID_NULL, no_space_msg);
-    AWindow *no_space = wm->CreateWindow(ivec2(0), ivec2(-1), "ERROR", widgets);
+    AWindow *no_space = wm->CreateWindow(ivec2::zero, ivec2(-1), "ERROR", widgets);
 
     Event ev;
@@ -1969 +1969 @@
 void Game::draw(int scene_mode)
 {
-    main_screen->AddDirty(ivec2(0), ivec2(xres, yres));
+    main_screen->AddDirty(ivec2::zero, ivec2(xres, yres));
 
     main_screen->clear();

abuse/branches/lol/src/gui.cpp

@@ -103 +103 @@
         int g = 80;
         screen->Bar(ivec2(0, 0), ivec2(144, 20), 0);
-        wm->font()->PutString(screen, ivec2(0), symbol_str(key),
+        wm->font()->PutString(screen, ivec2::zero, symbol_str(key),
                               color_table->Lookup(u8vec3(g >> 3, g >> 3, g >> 3)));
     }

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

@@ -141 +141 @@
     widgets << new AButton(ivec2(100, wh3), cancel_id, cancel_name);
     widgets << new AFilePicker(ivec2(15, wh3 + wm->font()->Size().y + 10), filename_id, 8);
-    return wm->CreateWindow(ivec2(0), ivec2(-1), FILENAME_str, widgets);
+    return wm->CreateWindow(ivec2::zero, ivec2(-1), FILENAME_str, widgets);
 }
 

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

@@ -39 +39 @@
 
         // Make sure non-blacks don't get remapped to the transparency
-        if (color != u8vec3(0) && to->GetColor(n) == u8vec3(0))
+        if (color != u8vec3::zero && to->GetColor(n) == u8vec3::zero)
             n = dk;
 
@@ -72 +72 @@
 void Filter::PutImage(AImage *screen, AImage *im, ivec2 pos)
 {
-    ivec2 aa = ivec2(0), bb = im->Size(), caa, cbb;
+    ivec2 aa = ivec2::zero, bb = im->Size(), caa, cbb;
     screen->GetClip(caa, cbb);
 
@@ -79 +79 @@
         return;
 
-    aa += lol::max(caa - pos, ivec2(0));
+    aa += lol::max(caa - pos, ivec2::zero);
     pos = lol::max(pos, caa);
     bb = lol::min(bb, cbb - pos + aa);

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

@@ -45 +45 @@
     {
         tmp.clear();
-        tmp.PutPart(letters, ivec2(0),
+        tmp.PutPart(letters, ivec2::zero,
                     ivec2(ch % 32, ch / 32) * m_size,
                     ivec2(ch % 32 + 1, ch / 32 + 1) * m_size, 1);

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

@@ -24 +24 @@
 image_descriptor::image_descriptor(ivec2 size, int keep_dirties)
 {
-    m_aa = ivec2(0);
+    m_aa = ivec2::zero;
     m_bb = size;
     m_size = size;
@@ -115 +115 @@
         for(int j = 0; j < m_size.y; j++)
             memset(scan_line(j), color, m_size.x);
-    AddDirty(ivec2(0), m_size);
+    AddDirty(ivec2::zero, m_size);
 }
 
@@ -198 +198 @@
 void AImage::PutImage(AImage *im, ivec2 pos, int transparent)
 {
-    PutPart(im, pos, ivec2(0), im->m_size, transparent);
+    PutPart(im, pos, ivec2::zero, im->m_size, transparent);
 }
 
@@ -210 +210 @@
     // see if the are to be put is outside of actual image, if so adjust
     // to fit in the image
-    pos += lol::min(aa, ivec2(0));
-    aa += lol::min(aa, ivec2(0));
+    pos += lol::min(aa, ivec2::zero);
+    aa += lol::min(aa, ivec2::zero);
     bb = lol::min(bb, im->m_size);
     // return if it was adjusted so that nothing will be put
@@ -221 +221 @@
         return;
 
-    aa += lol::max(caa - pos, ivec2(0));
-    pos += lol::max(caa - pos, ivec2(0));
+    aa += lol::max(caa - pos, ivec2::zero);
+    pos += lol::max(caa - pos, ivec2::zero);
     bb = lol::min(bb, cbb - pos + aa);
     if (!(aa < bb))
@@ -272 +272 @@
     else
     {
-        aa = ivec2(0);
+        aa = ivec2::zero;
         bb = m_size;
     }
@@ -348 +348 @@
         return;
 
-    aa = lol::max(aa, ivec2(0));
+    aa = lol::max(aa, ivec2::zero);
     bb = lol::min(bb, m_size);
 
@@ -441 +441 @@
         return;
 
-    aa = lol::max(aa, ivec2(0));
+    aa = lol::max(aa, ivec2::zero);
     bb = lol::min(bb, m_size);
 

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

@@ -146 +146 @@
 void Palette::defaults()
 {
-    m_colors[0] = u8vec3(0);
+    m_colors[0] = u8vec3::zero;
     m_used[0] = 1;
 

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

@@ -32 +32 @@
     m_save = new AImage(visual->Size());
 
-    if (m_pos + visual->Size() >= ivec2(0) && m_pos < ivec2(xres, yres))
-        m_save->PutPart(m_screen, ivec2(0), m_pos, m_pos + m_save->Size());
+    if (m_pos + visual->Size() >= ivec2::zero && m_pos < ivec2(xres, yres))
+        m_save->PutPart(m_screen, ivec2::zero, m_pos, m_pos + m_save->Size());
 }
 
@@ -52 +52 @@
     }
 
-    if (m_pos + visual->Size() >= ivec2(0) && m_pos < ivec2(xres, yres))
-        m_save->PutPart(m_screen, ivec2(0), m_pos, m_pos + m_save->Size());
+    if (m_pos + visual->Size() >= ivec2::zero && m_pos < ivec2(xres, yres))
+        m_save->PutPart(m_screen, ivec2::zero, m_pos, m_pos + m_save->Size());
 }
 

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

@@ -102 +102 @@
     memset(im->scan_line(0), 0, m_size.x * m_size.y);
 
-    PutImage(im, ivec2(0));
+    PutImage(im, ivec2::zero);
     return im;
 }
@@ -265 +265 @@
 void TransImage::PutImage(AImage *screen, ivec2 pos)
 {
-    PutImageGeneric<NORMAL>(screen, pos, 0, NULL, ivec2(0), NULL, NULL,
+    PutImageGeneric<NORMAL>(screen, pos, 0, NULL, ivec2::zero, NULL, NULL,
                             0, 1, NULL, NULL, NULL);
 }
@@ -271 +271 @@
 void TransImage::PutRemap(AImage *screen, ivec2 pos, uint8_t *map)
 {
-    PutImageGeneric<REMAP>(screen, pos, 0, NULL, ivec2(0), map, NULL,
+    PutImageGeneric<REMAP>(screen, pos, 0, NULL, ivec2::zero, map, NULL,
                            0, 1, NULL, NULL, NULL);
 }
@@ -278 +278 @@
                             uint8_t *map, uint8_t *map2)
 {
-    PutImageGeneric<REMAP2>(screen, pos, 0, NULL, ivec2(0), map, map2,
+    PutImageGeneric<REMAP2>(screen, pos, 0, NULL, ivec2::zero, map, map2,
                             0, 1, NULL, NULL, NULL);
 }
@@ -286 +286 @@
                          ColorFilter *f, Palette *pal)
 {
-    PutImageGeneric<FADE>(screen, pos, 0, NULL, ivec2(0), NULL, NULL,
+    PutImageGeneric<FADE>(screen, pos, 0, NULL, ivec2::zero, NULL, NULL,
                           amount, nframes, NULL, f, pal);
 }
@@ -293 +293 @@
                              uint8_t *tint, ColorFilter *f, Palette *pal)
 {
-    PutImageGeneric<FADE_TINT>(screen, pos, 0, NULL, ivec2(0), NULL, NULL,
+    PutImageGeneric<FADE_TINT>(screen, pos, 0, NULL, ivec2::zero, NULL, NULL,
                                amount, nframes, tint, f, pal);
 }
@@ -299 +299 @@
 void TransImage::PutColor(AImage *screen, ivec2 pos, uint8_t color)
 {
-    PutImageGeneric<COLOR>(screen, pos, color, NULL, ivec2(0), NULL, NULL,
+    PutImageGeneric<COLOR>(screen, pos, color, NULL, ivec2::zero, NULL, NULL,
                            0, 1, NULL, NULL, NULL);
 }
@@ -314 +314 @@
 void TransImage::PutFilled(AImage *screen, ivec2 pos, uint8_t color)
 {
-    PutImageGeneric<FILLED>(screen, pos, color, NULL, ivec2(0), NULL, NULL,
+    PutImageGeneric<FILLED>(screen, pos, color, NULL, ivec2::zero, NULL, NULL,
                             0, 1, NULL, NULL, NULL);
 }
@@ -320 +320 @@
 void TransImage::PutPredator(AImage *screen, ivec2 pos)
 {
-    PutImageGeneric<PREDATOR>(screen, pos, 0, NULL, ivec2(0), NULL, NULL,
+    PutImageGeneric<PREDATOR>(screen, pos, 0, NULL, ivec2::zero, NULL, NULL,
                               0, 1, NULL, NULL, NULL);
 }
@@ -326 +326 @@
 void TransImage::PutScanLine(AImage *screen, ivec2 pos, int line)
 {
-    PutImageGeneric<SCANLINE>(screen, pos, 0, NULL, ivec2(0), NULL, NULL,
+    PutImageGeneric<SCANLINE>(screen, pos, 0, NULL, ivec2::zero, NULL, NULL,
                               line, 1, NULL, NULL, NULL);
 }

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

@@ -101 +101 @@
     {
         j->show();
-        j->m_surf->AddDirty(ivec2(0), j->m_size);
+        j->m_surf->AddDirty(ivec2::zero, j->m_size);
     }
 }
@@ -180 +180 @@
       for (p=m_first; p!=j; p=p->next)
         p->m_surf->AddDirty(j->x-p->x,j->y-p->y,j->x+j->l-p->x,j->y+j->h-p->y); */
-                    j->m_surf->AddDirty(ivec2(0), j->m_size);
+                    j->m_surf->AddDirty(ivec2::zero, j->m_size);
                     flush_screen();
                 }
@@ -240 +240 @@
     j->m_pos.x = x;
     j->m_pos.y = y;
-    j->m_surf->AddDirty(ivec2(0), j->m_size);
+    j->m_surf->AddDirty(ivec2::zero, j->m_size);
 }
 
@@ -250 +250 @@
     m_surf = screen;
     hi = Hi; low = Low; med = Med; m_first = NULL; m_pal = pal; m_grab = NULL;
-    bk = pal->FindClosest(u8vec3(0));
+    bk = pal->FindClosest(u8vec3::zero);
     state = inputing; fnt = Font;  wframe_fnt = Font;
     memset(key_state, 0, sizeof(key_state));
@@ -383 +383 @@
 AWindow::AWindow(ivec2 pos, ivec2 size, String const &name, AWidgetList const &widgets)
 {
-    m_size = ivec2(0);
+    m_size = ivec2::zero;
     _hidden = false;
     _moveable = true;

abuse/branches/lol/src/light.cpp

@@ -253 +253 @@
             for (int intensity = 63; intensity >= 0; intensity--)
             {
-                if (rgb != u8vec3(0))
+                if (rgb != u8vec3::zero)
                     white_light[intensity*256+color] = pal->FindClosest(rgb);
                 else
@@ -501 +501 @@
 LightPatch *MakePatchList(ivec2 size, ivec2 screen)
 {
-    LightPatch *first = new LightPatch(ivec2(0), size - ivec2(1), nullptr);
+    LightPatch *first = new LightPatch(ivec2::zero, size - ivec2(1), nullptr);
 
     // determine which lights will have effect
     for (LightSource *f = first_light_source; f; f = f->m_next)
     {
-        ivec2 p1 = lol::max(f->m_p1 - screen, ivec2(0));
+        ivec2 p1 = lol::max(f->m_p1 - screen, ivec2::zero);
         ivec2 p2 = lol::min(f->m_p2 - screen, size - ivec2(1));
 

abuse/branches/lol/src/loadgame.cpp

@@ -201 +201 @@
             thumbnails[start_num] = new AImage(ivec2(160, 100));
             thumbnails[start_num]->clear();
-            console_font->PutString(thumbnails[start_num], ivec2(0), symbol_str("no_saved"));
+            console_font->PutString(thumbnails[start_num], ivec2::zero, symbol_str("no_saved"));
             total_saved++;
             if (!first) first=thumbnails[start_num];

abuse/branches/lol/src/menu.cpp

@@ -76 +76 @@
     main_screen->Line(ivec2(bb.x - 1, aa.y + 1), bb - ivec2(1), dr);
     main_screen->Line(ivec2(aa.x + 1, bb.y - 1), bb - ivec2(1), dr);
-    TintArea(aa + ivec2(1), bb, u8vec3(0), amount);
+    TintArea(aa + ivec2(1), bb, u8vec3::zero, amount);
 }
 
@@ -612 +612 @@
     inm->clear_current();
 
-    main_screen->AddDirty(ivec2(0), ivec2(320, 200));
+    main_screen->AddDirty(ivec2::zero, ivec2(320, 200));
 
     Event ev;

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

@@ -300 +300 @@
 
     // Write Midi file header
-    uint8_t midi_header[] = { 0x4D, 0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, (num_tracks + 1), 0x00, 0xC0 };
+    uint8_t midi_header[] = { 0x4D, 0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, (uint8_t)(num_tracks + 1), 0x00, 0xC0 };
     memcpy(output_buffer_ptr, midi_header, 14);
     output_buffer_ptr += 14;

abuse/branches/lol/src/transp.cpp

@@ -25 +25 @@
     ivec2 pos(x, y);
 
-    aa += lol::max(caa - pos, ivec2(0));
-    bb -= lol::max(caa - pos, ivec2(0));
+    aa += lol::max(caa - pos, ivec2::zero);
+    bb -= lol::max(caa - pos, ivec2::zero);
     pos = lol::max(caa, pos);
 
     bb = lol::min(bb, cbb - ivec2(1) - pos);
 
-    if (!(bb >= ivec2(0)))
+    if (!(bb >= ivec2::zero))
         return;
     screen->AddDirty(pos, pos + bb);

abuse/branches/lol/src/view.cpp

@@ -196 +196 @@
   no_ytop=0;
   no_ybottom=0;
-    m_lastlastpos = m_lastpos = focus ? focus->m_pos : ivec2(0);
+    m_lastlastpos = m_lastpos = focus ? focus->m_pos : ivec2::zero;
   last_hp=last_ammo=-1;
   last_type=-1;
@@ -215 +215 @@
 
   player_number=number;
-    m_aa = ivec2(0);
+    m_aa = ivec2::zero;
     m_bb = ivec2(100);
     m_focus = focus;