[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

 #ifdef _WIN32
+# define WIN32_LEAN_AND_MEAN
 # define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
 # include <malloc.h>
 # include <windows.h>
 # pragma warning(disable:4244)
 #endif
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
+#ifdef _WIN32
+# undef pipe
+#endif
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
  typedef   signed char  int8_t;
  typedef   signed short int16_t;
  typedef   signed int   int32_t;
 #endif
-#include "glext.h"
 #define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
 #define FOW_DARKNESS 32
 #define MAP_EXTEND_X  32
 #include "pango-font.c"
 #include "pango-fontmap.c"
 #include "pango-render.c"
-typedef Mix_Chunk *CFClient__MixChunk;
+typedef Mix_Chunk *CFPlus__MixChunk;
-typedef Mix_Music *CFClient__MixMusic;
+typedef Mix_Music *CFPlus__MixMusic;
-typedef PangoFontDescription *CFClient__Font;
+typedef PangoFontDescription *CFPlus__Font;
 static int
 shape_attr_p (PangoLayoutRun *run)
 {
   GSList *attrs = run->item->analysis.extra_attrs;
 typedef struct cf_layout {
   PangoLayout *pl;
   float r, g, b, a; // default color for rgba mode
   int base_height;
-  CFClient__Font font;
+  CFPlus__Font font;
-} *CFClient__Layout;
+} *CFPlus__Layout;
-static CFClient__Font default_font;
+static CFPlus__Font default_font;
 static PangoContext *opengl_context;
 static PangoFontMap *opengl_fontmap;
 static void
 substitute_func (FcPattern *pattern, gpointer data)
 #endif
   FcPatternAddBool (pattern, FC_AUTOHINT, 0);
 }
 static void
-layout_update_font (CFClient__Layout self)
+layout_update_font (CFPlus__Layout self)
 {
   /* use a random scale factor to account for unknown descenders, 0.8 works
    * reasonably well with bitstream vera
    */
   PangoFontDescription *font = self->font ? self->font : default_font;
   pango_layout_set_font_description (self->pl, font);
 }
 static void
-layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
+layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
 {
+  PangoRectangle rect;
+  // get_pixel_* wrongly rounds down
-  pango_layout_get_pixel_size (self->pl, w, h);
+  pango_layout_get_extents (self->pl, 0, &rect);
-  if (!*w) *w = 1;
+  rect.width  = (rect.width  + PANGO_SCALE - 1) / PANGO_SCALE;
-  if (!*h) *h = 1;
+  rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
-  *w = (*w + 3) & ~3;
+  if (!rect.width)  rect.width  = 1;
+  if (!rect.height) rect.height = 1;
+  *w = rect.width;
+  *h = rect.height;
 }
 typedef uint16_t mapface;
 typedef struct {
   float s, t;
   uint8_t r, g, b, a;
 } maptex;
 typedef struct {
-  int16_t darkness;
+  uint32_t player;
   mapface face[3];
+  uint16_t darkness;
+  uint8_t stat_width, stat_hp, flags;
 } mapcell;
 typedef struct {
   int32_t c0, c1;
   mapcell *col;
   int texs;
   maptex *tex;
   int32_t rows;
   maprow *row;
-} *CFClient__Map;
+} *CFPlus__Map;
 static char *
 prepend (char *ptr, int sze, int inc)
 {
   char *p;
 #define Append(type,ptr,sze,inc)  (ptr) = (type *)append  ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
 #define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
 static maprow *
-map_get_row (CFClient__Map self, int y)
+map_get_row (CFPlus__Map self, int y)
 {
   if (0 > y)
     {
       int extend = - y + MAP_EXTEND_Y;
       Prepend (maprow, self->row, self->rows, extend);
   return row->col + (x - row->c0);
 }
 static mapcell *
-map_get_cell (CFClient__Map self, int x, int y)
+map_get_cell (CFPlus__Map self, int x, int y)
 {
   return row_get_cell (map_get_row (self, y), x);
 }
 static void
-map_clear (CFClient__Map self)
+map_clear (CFPlus__Map self)
 {
   int r;
   for (r = 0; r < self->rows; r++)
     Safefree (self->row[r].col);
   self->row  = 0;
   self->rows = 0;
 }
 static void
-map_blank (CFClient__Map self, int x0, int y0, int w, int h)
+map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
 {
   int x, y;
   maprow *row;
+  mapcell *cell;
   for (y = y0; y < y0 + h; y++)
     if (y >= 0)
       {
         if (y >= self->rows)
           if (x >= row->c0)
             {
               if (x >= row->c1)
                 break;
-              row->col[x - row->c0].darkness = -1;
+              cell = row->col + x - row->c0;
+              cell->darkness = 0;
+              cell->stat_hp  = 0;
             }
       }
 }
 static void
   n |= n >> 16;
   return n + 1;
 }
-MODULE = CFClient	PACKAGE = CFClient
+MODULE = CFPlus	PACKAGE = CFPlus
 PROTOTYPES: ENABLE
 BOOT:
 {
-  HV *stash = gv_stashpv ("CFClient", 1);
+  HV *stash = gv_stashpv ("CFPlus", 1);
   static const struct {
     const char *name;
     IV iv;
   } *civ, const_iv[] = {
 #	define const_iv(name) { # name, (IV)name }
         SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
         SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
         SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
         SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
+#if SDL_VERSION_ATLEAST(1,2,10)
+        SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
+        SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
+#endif
         SDL_EnableUNICODE (1);
         SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
                   hv_store (hv, "data1",  5, newSViv ((IV)ev.user.data1), 0);
                   hv_store (hv, "data2",  5, newSViv ((IV)ev.user.data2), 0);
                   break;
               }
-            XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
+            XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
           }
 }
 int
 Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
 void
 _exit (int retval)
 	CODE:
         _exit (retval);
-MODULE = CFClient	PACKAGE = CFClient::Font
+MODULE = CFPlus	PACKAGE = CFPlus::Font
-CFClient::Font
+CFPlus::Font
 new_from_file (SV *class, char *path, int id = 0)
 	CODE:
 {
         int count;
         FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
 }
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFClient::Font self)
+DESTROY (CFPlus::Font self)
 	CODE:
         pango_font_description_free (self);
 void
-make_default (CFClient::Font self)
+make_default (CFPlus::Font self)
 	CODE:
         default_font = self;
-MODULE = CFClient	PACKAGE = CFClient::Layout
+MODULE = CFPlus	PACKAGE = CFPlus::Layout
 void
 reset_glyph_cache ()
 	CODE:
         tc_clear ();
-CFClient::Layout
+CFPlus::Layout
 new (SV *class)
 	CODE:
         New (0, RETVAL, 1, struct cf_layout);
         RETVAL->pl          = pango_layout_new (opengl_context);
         layout_update_font (RETVAL);
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFClient::Layout self)
+DESTROY (CFPlus::Layout self)
 	CODE:
         g_object_unref (self->pl);
         Safefree (self);
 void
-set_text (CFClient::Layout self, SV *text_)
+set_text (CFPlus::Layout self, SV *text_)
 	CODE:
 {
 	STRLEN textlen;
         char *text = SvPVutf8 (text_, textlen);
         pango_layout_set_text (self->pl, text, textlen);
 }
 void
-set_markup (CFClient::Layout self, SV *text_)
+set_markup (CFPlus::Layout self, SV *text_)
 	CODE:
 {
 	STRLEN textlen;
         char *text = SvPVutf8 (text_, textlen);
         pango_layout_set_markup (self->pl, text, textlen);
 }
 void
-set_shapes (CFClient::Layout self, ...)
+set_shapes (CFPlus::Layout self, ...)
 	CODE:
 {
         PangoAttrList *attrs = 0;
         const char *text = pango_layout_get_text (self->pl);
         const char *pos = text;
         if (attrs)
           pango_layout_set_attributes (self->pl, attrs);
 }
 void
-get_shapes (CFClient::Layout self)
+get_shapes (CFPlus::Layout self)
 	PPCODE:
 {
         PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
         do
         pango_layout_iter_free (iter);
 }
 int
-has_wrapped (CFClient::Layout self)
+has_wrapped (CFPlus::Layout self)
 	CODE:
 {
 	int lines = 1;
         const char *text = pango_layout_get_text (self->pl);
 }
 	OUTPUT:
         RETVAL
 SV *
-get_text (CFClient::Layout self)
+get_text (CFPlus::Layout self)
 	CODE:
         RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
         sv_utf8_decode (RETVAL);
 	OUTPUT:
         RETVAL
 void
-set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
+set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
 	CODE:
         self->r = r;
         self->g = g;
         self->b = b;
         self->a = a;
 void
-set_font (CFClient::Layout self, CFClient::Font font = 0)
+set_font (CFPlus::Layout self, CFPlus::Font font = 0)
 	CODE:
         if (self->font != font)
 	  {
             self->font = font;
             layout_update_font (self);
           }
 void
-set_height (CFClient::Layout self, int base_height)
+set_height (CFPlus::Layout self, int base_height)
 	CODE:
         if (self->base_height != base_height)
   	  {
             self->base_height = base_height;
             layout_update_font (self);
           }
 void
-set_width (CFClient::Layout self, int max_width = -1)
+set_width (CFPlus::Layout self, int max_width = -1)
 	CODE:
         pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
 void
-set_indent (CFClient::Layout self, int indent)
+set_indent (CFPlus::Layout self, int indent)
 	CODE:
         pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
 void
-set_spacing (CFClient::Layout self, int spacing)
+set_spacing (CFPlus::Layout self, int spacing)
 	CODE:
         pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
 void
-set_ellipsise (CFClient::Layout self, int ellipsise)
+set_ellipsise (CFPlus::Layout self, int ellipsise)
 	CODE:
         pango_layout_set_ellipsize (self->pl,
             ellipsise == 1 ? PANGO_ELLIPSIZE_START
           : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
           : ellipsise == 3 ? PANGO_ELLIPSIZE_END
           :                  PANGO_ELLIPSIZE_NONE
         );
 void
-set_single_paragraph_mode (CFClient::Layout self, int spm)
+set_single_paragraph_mode (CFPlus::Layout self, int spm)
 	CODE:
         pango_layout_set_single_paragraph_mode (self->pl, !!spm);
 void
-size (CFClient::Layout self)
+size (CFPlus::Layout self)
 	PPCODE:
 {
 	int w, h;
         layout_get_pixel_size (self, &w, &h);
         PUSHs (sv_2mortal (newSViv (w)));
         PUSHs (sv_2mortal (newSViv (h)));
 }
 int
-descent (CFClient::Layout self)
+descent (CFPlus::Layout self)
 	CODE:
 {
 	PangoRectangle rect;
         PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
 	pango_layout_line_get_pixel_extents (line, 0, &rect);
 }
 	OUTPUT:
         RETVAL
 int
-xy_to_index (CFClient::Layout self, int x, int y)
+xy_to_index (CFPlus::Layout self, int x, int y)
 	CODE:
 {
 	int index, trailing;
         pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
         RETVAL = index;
 }
 	OUTPUT:
         RETVAL
 void
-cursor_pos (CFClient::Layout self, int index)
+cursor_pos (CFPlus::Layout self, int index)
 	PPCODE:
 {
 	PangoRectangle strong_pos;
         pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
         PUSHs (sv_2mortal (newSViv (strong_pos.y      / PANGO_SCALE)));
         PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
 }
 void
-render (CFClient::Layout self, float x, float y)
+render (CFPlus::Layout self, float x, float y, int flags = 0)
 	PPCODE:
         pango_opengl_render_layout_subpixel (
           self->pl,
           x * PANGO_SCALE, y * PANGO_SCALE,
-          self->r, self->g, self->b, self->a
+          self->r, self->g, self->b, self->a,
+          flags
         );
-MODULE = CFClient	PACKAGE = CFClient::Texture
+MODULE = CFPlus	PACKAGE = CFPlus::Texture
 void
 pad2pot (SV *data_, SV *w_, SV *h_)
 	CODE:
 {
             glDisable (GL_ALPHA_TEST);
             glDisable (GL_BLEND);
           }
 }
-MODULE = CFClient	PACKAGE = CFClient::Map
+MODULE = CFPlus	PACKAGE = CFPlus::Map
-CFClient::Map
+CFPlus::Map
 new (SV *class, int map_width, int map_height)
 	CODE:
         New (0, RETVAL, 1, struct map);
         RETVAL->x  = 0;
         RETVAL->y  = 0;
         RETVAL->row = 0;
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFClient::Map self)
+DESTROY (CFPlus::Map self)
 	CODE:
 {
         map_clear (self);
         Safefree (self->face);
         Safefree (self->tex);
         Safefree (self);
 }
 void
-clear (CFClient::Map self)
+clear (CFPlus::Map self)
 	CODE:
         map_clear (self);
 void
-set_face (CFClient::Map self, int face, int texid)
+set_face (CFPlus::Map self, int face, int texid)
 	CODE:
 {
         while (self->faces <= face)
           {
             Append (mapface, self->face, self->faces, self->faces);
         self->face [face] = texid;
 }
 void
-set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
+set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
 	CODE:
 {
         while (self->texs <= texid)
           {
             Append (maptex, self->tex, self->texs, self->texs);
        // from transparent color bleeding and ugly wrapping effects.
        glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 }
 int
-ox (CFClient::Map self)
+ox (CFPlus::Map self)
 	ALIAS:
            oy = 1
            x  = 2
            y  = 3
            w  = 4
           }
 	OUTPUT:
         RETVAL
 void
-scroll (CFClient::Map self, int dx, int dy)
+scroll (CFPlus::Map self, int dx, int dy)
 	CODE:
 {
         if (dx > 0)
           map_blank (self, self->x, self->y, dx - 1, self->h);
         else if (dx < 0)
             self->y    += MAP_EXTEND_Y;
           }
 }
 void
-map1a_update (CFClient::Map self, SV *data_)
+map1a_update (CFPlus::Map self, SV *data_, int extmap)
 	CODE:
 {
         uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
         uint8_t *data_end = (uint8_t *)SvEND (data_);
         mapcell *cell;
         int x, y, flags;
-        while (data < data_end)
+        while (data < data_end - 1)
           {
             flags = (data [0] << 8) + data [1]; data += 2;
             x = self->x + ((flags >> 10) & 63);
             y = self->y + ((flags >>  4) & 63);
 	    cell = map_get_cell (self, x, y);
             if (flags & 15)
               {
-                if (cell->darkness < 0)
+                if (!cell->darkness)
                   {
-                    cell->darkness = 0;
+                    cell->darkness = 256;
                     cell->face [0] = 0;
                     cell->face [1] = 0;
                     cell->face [2] = 0;
                   }
-                cell->darkness = flags & 8 ? *data++ : 255;
                 //TODO: don't trust server data to be in-range(!)
+                if (flags & 8)
+                  {
+                    if (extmap)
+                      {
+                        uint8_t ext, cmd;
+                        do
+                          {
+                            ext = *data++;
+                            cmd = ext & 0x3f;
+                            if (cmd < 4)
+                              cell->darkness = 255 - ext * 64 + 1;
+                            else if (cmd == 5) // health
+                              {
+                                cell->stat_width = 1;
+                                cell->stat_hp = *data++;
+                              }
+                            else if (cmd == 6) // monster width
+                              cell->stat_width = *data++ + 1;
+                            else if (cmd == 0x47) // monster width
+                              {
+                                if (*data == 4)
+                                  ; // decode player tag
+                                data += *data + 1;
+                              }
+                            else if (cmd == 8) // cell flags
+                              cell->flags = *data++;
+                            else if (ext & 0x40) // unknown, multibyte => skip
+                              data += *data + 1;
+                            else
+                              data++;
+                          }
+                        while (ext & 0x80);
+                      }
+                    else
+                      cell->darkness = *data++ + 1;
+                  }
                 if (flags & 4)
                   {
                     cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
                   }
                   {
                     cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
                   }
               }
             else
+              {
-              cell->darkness = -1;
+                cell->darkness = 0;
+                cell->stat_hp = 0;
+              }
           }
 }
 SV *
-mapmap (CFClient::Map self, int x0, int y0, int w, int h)
+mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
 	CODE:
 {
 	int x1, x;
 	int y1, y;
         int z;
 }
 	OUTPUT:
         RETVAL
 void
-draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
+draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
 	CODE:
 {
 	int vx, vy;
         int x, y, z;
         int last_name;
                     {
                       mapcell *cell = row->col + (x + vx - row->c0);
                       face = cell->face [z];
-                      if (face)
+                      if (face && face < self->texs)
                         {
                           maptex tex = self->tex [face];
                           int px = (x + 1) * 32 - tex.w;
                           int py = (y + 1) * 32 - tex.h;
                           if (last_name != tex.name)
                             {
                               glEnd ();
-                              last_name = tex.name;
-                              glBindTexture (GL_TEXTURE_2D, last_name);
+                              glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
                               glBegin (GL_QUADS);
                             }
                           glTexCoord2f (0    , 0    ); glVertex2f (px        , py        );
                           glTexCoord2f (0    , tex.t); glVertex2f (px        , py + tex.h);
                           glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
                           glTexCoord2f (tex.s, 0    ); glVertex2f (px + tex.w, py        );
                         }
+                      if (cell->flags && z == 2)
+                        {
+                          if (cell->flags & 1)
+                            {
+                              maptex tex = self->tex [1];
+                              int px = (x + 1) * 32 - tex.w + 2;
+                              int py = (y + 1) * 32 - tex.h - 6;
+                              glEnd ();
+                              glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
+                              glBegin (GL_QUADS);
+                              glTexCoord2f (0    , 0    ); glVertex2f (px        , py        );
+                              glTexCoord2f (0    , tex.t); glVertex2f (px        , py + tex.h);
+                              glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
+                              glTexCoord2f (tex.s, 0    ); glVertex2f (px + tex.w, py        );
+                            }
+                        }
                     }
               }
 	glEnd ();
         glDisable (GL_TEXTURE_2D);
         glDisable (GL_BLEND);
-}
+        // top layer: overlays such as the health bar
+        for (y = 0; y < sh; y++)
+          if (0 <= y + vy && y + vy < self->rows)
+            {
+              maprow *row = self->row + (y + vy);
+              for (x = 0; x < sw; x++)
+                if (row->c0 <= x + vx && x + vx < row->c1)
+                  {
+                    mapcell *cell = row->col + (x + vx - row->c0);
+                    int px = x * 32;
+                    int py = y * 32;
+                    if (cell->stat_hp)
+                      {
+                        int width = cell->stat_width * 32;
+                        int thick = sh / 28 + 1 + cell->stat_width;
+                        glColor3ub (0,  0,  0);
+                        glRectf (px + 1, py - thick - 2,
+                                 px + width - 1, py);
+                        glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
+                        glRectf (px + 2,
+                                 py - thick - 1,
+                                 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
+                      }
+                  }
+            }
+}
 void
-draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
+draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
 	CODE:
 {
 	static float color[16][3] = {
            { 0.00F, 0.00F, 0.00F },
            { 1.00F, 1.00F, 1.00F },
         glDisable (GL_BLEND);
         glDisable (GL_TEXTURE_2D);
 }
 void
-fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
+fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
 	PPCODE:
 {
 	int vx, vy;
         int x, y;
         int sw4 = (sw + 3) & ~3;
               for (x = 0; x < sw; x++)
                 if (row->c0 <= x + vx && x + vx < row->c1)
                   {
                     mapcell *cell = row->col + (x + vx - row->c0);
-                    darkness[y * sw4 + x] = cell->darkness < 0
+                    darkness[y * sw4 + x] = cell->darkness
+                      ? 255 - (cell->darkness - 1)
-                      ? 255 - FOW_DARKNESS
+                      : 255 - FOW_DARKNESS;
-                      : 255 - cell->darkness;
                   }
             }
         EXTEND (SP, 3);
         PUSHs (sv_2mortal (newSViv (sw4)));
         PUSHs (sv_2mortal (newSViv (sh)));
         PUSHs (darkness_sv);
 }
 SV *
-get_rect (CFClient::Map self, int x0, int y0, int w, int h)
+get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
 	CODE:
 {
 	int x, y, x1, y1;
 	SV *data_sv = newSV (w * h * 7 + 5);
         uint8_t *data = (uint8_t *)SvPVX (data_sv);
 }
 	OUTPUT:
         RETVAL
 void
-set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)
+set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
 	PPCODE:
 {
 	int x, y, z;
         int w, h;
         int x1, y1;
                     if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
                     if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
                     if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
-                    if (cell->darkness <= 0)
+                    if (cell->darkness == 0)
                       {
-                        cell->darkness = -1;
+                        cell->darkness = 0;
                         for (z = 0; z <= 2; z++)
                           {
                             cell->face[z] = face[z];
                   }
               }
           }
 }
-MODULE = CFClient	PACKAGE = CFClient::MixChunk
+MODULE = CFPlus	PACKAGE = CFPlus::MixChunk
-CFClient::MixChunk
+CFPlus::MixChunk
 new_from_file (SV *class, char *path)
 	CODE:
         RETVAL = Mix_LoadWAV (path);
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFClient::MixChunk self)
+DESTROY (CFPlus::MixChunk self)
 	CODE:
         Mix_FreeChunk (self);
 int
-volume (CFClient::MixChunk self, int volume = -1)
+volume (CFPlus::MixChunk self, int volume = -1)
 	CODE:
         RETVAL = Mix_VolumeChunk (self, volume);
 	OUTPUT:
         RETVAL
 int
-play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
+play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
 	CODE:
         RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
 	OUTPUT:
         RETVAL
-MODULE = CFClient	PACKAGE = CFClient::MixMusic
+MODULE = CFPlus	PACKAGE = CFPlus::MixMusic
 int
 volume (int volume = -1)
 	CODE:
         RETVAL = Mix_VolumeMusic (volume);
 	OUTPUT:
         RETVAL
-CFClient::MixMusic
+CFPlus::MixMusic
 new_from_file (SV *class, char *path)
 	CODE:
         RETVAL = Mix_LoadMUS (path);
 	OUTPUT:
         RETVAL
 void
-DESTROY (CFClient::MixMusic self)
+DESTROY (CFPlus::MixMusic self)
 	CODE:
         Mix_FreeMusic (self);
 int
-play (CFClient::MixMusic self, int loops = -1)
+play (CFPlus::MixMusic self, int loops = -1)
 	CODE:
         RETVAL = Mix_PlayMusic (self, loops);
 	OUTPUT:
         RETVAL
-MODULE = CFClient	PACKAGE = CFClient::OpenGL
+MODULE = CFPlus	PACKAGE = CFPlus::OpenGL
 BOOT:
 {
-  HV *stash = gv_stashpv ("CFClient::OpenGL", 1);
+  HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
   static const struct {
     const char *name;
     IV iv;
   } *civ, const_iv[] = {
 #	define const_iv(name) { # name, (IV)name }
 	const_iv (GL_SEPARABLE_2D),
 	const_iv (GL_CONVOLUTION_2D),
 	const_iv (GL_CONVOLUTION_BORDER_MODE),
 	const_iv (GL_CONSTANT_BORDER),
 	const_iv (GL_LINES),
+	const_iv (GL_LINE_STRIP),
 	const_iv (GL_LINE_LOOP),
 	const_iv (GL_QUADS),
 	const_iv (GL_QUAD_STRIP),
 	const_iv (GL_TRIANGLES),
 	const_iv (GL_TRIANGLE_STRIP),
             r *= a;
             g *= a;
             b *= a;
           }
         // microsoft visual "c" rounds instead of truncating...
-        glColor4ub (MIN ((int)(r * 256.f), 255),
+        glColor4f (r, g, b, a);
-                    MIN ((int)(g * 256.f), 255),
-                    MIN ((int)(b * 256.f), 255),
-                    MIN ((int)(a * 256.f), 255));
 void glInterleavedArrays (int format, int stride, char *data)
 void glDrawElements (int mode, int count, int type, char *indices)
 void glEndList ()
 void glCallList (int list)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC vs. Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC