--- deliantra/Deliantra-Client/Client.xs	2008/08/28 00:53:53	1.275
+++ deliantra/Deliantra-Client/Client.xs	2008/11/26 23:08:34	1.280
@@ -93,6 +93,8 @@
 /* mask out modifiers we are not interested in */
 #define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
 
+#define KMOD_LRAM 0x10000 // our extension
+
 static AV *texture_av;
 
 static struct
@@ -233,6 +235,7 @@
   uint8_t r, g, b, a;
   tileid smoothtile;
   uint8_t smoothlevel;
+  uint8_t unused; /* set to zero on use */
 } maptex;
 
 typedef struct {
@@ -529,6 +532,20 @@
   return 1;
 }
 
+/******************************************************************************/
+
+/* process keyboard modifiers */
+static int
+mod_munge (int mod)
+{
+  mod &= MOD_MASK;
+
+  if (mod & (KMOD_META | KMOD_ALT))
+    mod |= KMOD_LRAM;
+
+  return mod;
+}
+
 static void
 deliantra_main ()
 {
@@ -739,6 +756,8 @@
 	const_iv (KMOD_CAPS),
 	const_iv (KMOD_MODE),
 
+        const_iv (KMOD_LRAM),
+
         const_iv (MIX_DEFAULT_FORMAT),
 
 	const_iv (SDL_INIT_TIMER),
@@ -935,8 +954,8 @@
                 case SDL_KEYUP:
                   hv_store (hv, "state",   5, newSViv (ev.key.state), 0);
                   hv_store (hv, "sym",     3, newSViv (ev.key.keysym.sym), 0);
-                  hv_store (hv, "mod",     3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
-                  hv_store (hv, "cmod",    4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
+                  hv_store (hv, "mod",     3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
+                  hv_store (hv, "cmod",    4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
                   hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
                   break;
 
@@ -964,7 +983,7 @@
                         SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
                       }
 
-                    hv_store (hv, "mod",    3, newSViv (SDL_GetModState () & MOD_MASK), 0);
+                    hv_store (hv, "mod",    3, newSViv (mod_munge (SDL_GetModState ())), 0);
                     hv_store (hv, "state",  5, newSViv (state), 0);
                     hv_store (hv, "x",      1, newSViv (x), 0);
                     hv_store (hv, "y",      1, newSViv (y), 0);
@@ -1190,6 +1209,13 @@
 #endif
 }
 
+int
+SvREFCNT (SV *sv)
+	CODE:
+        RETVAL = SvREFCNT (sv);
+	OUTPUT:
+	RETVAL
+
 MODULE = Deliantra::Client	PACKAGE = DC::Font
 
 PROTOTYPES: DISABLE
@@ -1744,6 +1770,26 @@
        glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 }
 
+void
+expire_textures (DC::Map self, int texid, int count)
+	PPCODE:
+  	for (; texid < self->texs && count; ++texid, --count)
+          {
+            maptex *tex = self->tex + texid;
+
+            if (tex->name)
+              {
+                if (tex->unused)
+                  {
+                    tex->name   = 0;
+                    tex->unused = 0,
+                    XPUSHs (sv_2mortal (newSViv (texid)));
+                  }
+                else
+                  tex->unused = 1;
+              }
+          }
+
 int
 ox (DC::Map self)
 	ALIAS:
@@ -1873,12 +1919,14 @@
                       if (cell->tile [z])
                         {
                           maptex *tex = self->tex + cell->tile [z];
+                          tex->unused = 0;
                           if (!tex->name)
                             av_push (missing, newSViv (cell->tile [z]));
 
                           if (tex->smoothtile)
                             {
                               maptex *smooth = self->tex + tex->smoothtile;
+                              smooth->unused = 0;
                               if (!smooth->name)
                                 av_push (missing, newSViv (tex->smoothtile));
                             }
@@ -2033,6 +2081,8 @@
 
                             if (key.texname != tex.name)
                               {
+                                self->tex [tile].unused = 0;
+
                                 if (!tex.name)
                                   tex = self->tex [2]; /* missing, replace by noface */
 
@@ -2164,6 +2214,8 @@
                                       // save gobs of state changes.
                                       if (key.texname != tex.name)
                                         {
+                                          self->tex [skey->tile].unused = 0;
+
                                           glEnd ();
                                           glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
                                           glBegin (GL_QUADS);
@@ -2236,6 +2288,12 @@
                     int px = x * T;
                     int py = y * T;
 
+                    if (expect_false (cell->player == player))
+                      {
+                        px += sdx;
+                        py += sdy;
+                      }
+
                     if (cell->stat_hp)
                       {
                         int width = cell->stat_width * T;
@@ -2985,6 +3043,7 @@
         glRotatef (angle, x, y, z);
 
 void glColor (float r, float g, float b, float a = 1.0)
+        PROTOTYPE: @
         ALIAS:
            glColor_premultiply = 1
         CODE: