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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC

 #include <cstring>
 #include <cstdio>
 #include <cstdlib>
 #include <utility>
+#include <bitset>
 #define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
 #include <SDL.h>
 #include <SDL_thread.h>
     }
   return 0;
 }
-typedef struct cf_layout {
+struct cf_layout {
   PangoLayout *pl;
   float r, g, b, a; // default color for rgba mode
   int base_height;
   DC__Font font;
   rc_t *rc;
-} *DC__Layout;
+};
+typedef cf_layout *DC__Layout;
 static DC__Font default_font;
 static PangoContext *opengl_context;
 static PangoFontMap *opengl_fontmap;
 }
 typedef uint16_t tileid;
 typedef uint16_t faceid;
-typedef struct {
+struct maptex
+{
   GLuint name;
   int w, h;
   float s, t;
   uint8_t r, g, b, a;
   tileid smoothtile;
   uint8_t smoothlevel;
   uint8_t unused; /* set to zero on use */
-} maptex;
+};
-typedef struct {
+struct mapcell
+{
   uint32_t player;
   tileid tile[3];
   uint16_t darkness;
   uint8_t stat_width, stat_hp, flags, smoothmax;
-} mapcell;
+};
-typedef struct {
+struct maprow
+{
   int32_t c0, c1;
   mapcell *col;
-} maprow;
+};
-typedef struct map {
+struct mapgrid {
   int x, y, w, h;
   int ox, oy; /* offset to virtual global coordinate system */
   int faces; tileid *face2tile; // [faceid]
   int texs;  maptex *tex;       // [tileid]
   int32_t rows;
   maprow *row;
-} *DC__Map;
+};
+typedef mapgrid *DC__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 void
-need_facenum (struct map *self, faceid face)
+need_facenum (struct mapgrid *self, faceid face)
 {
   while (self->faces <= face)
     {
       Append (tileid, self->face2tile, self->faces, self->faces);
       self->faces *= 2;
     }
 }
 static void
-need_texid (struct map *self, int texid)
+need_texid (struct mapgrid *self, int texid)
 {
   while (self->texs <= texid)
     {
       Append (maptex, self->tex, self->texs, self->texs);
       self->texs *= 2;
     }
 }
 static maprow *
-map_get_row (DC__Map self, int y)
+map_get_row (mapgrid *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 (DC__Map self, int x, int y)
+map_get_cell (mapgrid *self, int x, int y)
 {
   return row_get_cell (map_get_row (self, y), x);
 }
 static void
-map_clear (DC__Map self)
+map_clear (mapgrid *self)
 {
   int r;
   for (r = 0; r < self->rows; r++)
     Safefree (self->row[r].col);
     (cell)->flags    = 0;	\
     (cell)->player   = 0;	\
   } while (0)
 static void
-map_blank (DC__Map self, int x0, int y0, int w, int h)
+map_blank (mapgrid *self, int x0, int y0, int w, int h)
 {
   int x, y;
   maprow *row;
   mapcell *cell;
 PROTOTYPES: DISABLE
 DC::Map
 new (SV *klass)
 	CODE:
-        New (0, RETVAL, 1, struct map);
+        New (0, RETVAL, 1, mapgrid);
         RETVAL->x  = 0;
         RETVAL->y  = 0;
         RETVAL->w  = 0;
         RETVAL->h  = 0;
         RETVAL->ox = 0;
 draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
 	CODE:
 {
         int x, y, z;
-        uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
-        static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
+        static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
-        smooth_key skey;
         int pl_x, pl_y;
         maptex pl_tex;
         rc_t *rc    = rc_alloc ();
         rc_t *rc_ov = rc_alloc ();
         rc_key_t key;
         pl_tex.name = 0;
         // that's current max. sorry.
         if (sw > 255) sw = 255;
         if (sh > 255) sh = 255;
-        // clear key, in case of extra padding
-        memset (&skey, 0, sizeof (skey));
         memset (&key, 0, sizeof (key));
         key.r       = 255;
         key.g       = 255;
         key.b       = 255;
         my += self->y;
         // first pass: determine smooth_max
         // rather ugly, if you ask me
         // could also be stored inside mapcell and updated on change
-        memset (smooth_max, 0, sizeof (smooth_max));
+        memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
         for (y = 0; y < sh; y++)
           if (0 <= y + my && y + my < self->rows)
             {
               maprow *row = self->row + (y + my);
         glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
         for (z = 0; z <= 2; z++)
           {
+            uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
+            smooth_key skey;
 	    smooth_hash smooth;
             memset (smooth_level, 0, sizeof (smooth_level));
             key.texname = -1;
             for (y = 0; y < sh; y++)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC vs. Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC