ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.180 by root, Fri Apr 13 18:11:26 2007 UTC vs.
Revision 1.191 by root, Thu Apr 26 23:51:02 2007 UTC

… …
55#if 0 55#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE 56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 57#else
58# define PARACHUTE 0 58# define PARACHUTE 0
59#endif 59#endif
60
61static AV *texture_av;
60 62
61static struct 63static struct
62{ 64{
63#define GL_FUNC(ptr,name) ptr name; 65#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 66#include "glfunc.h"
… …
345} smooth_key; 347} smooth_key;
346 348
347static void 349static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 350smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 351{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 352 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 353
352 if (SvIOK (*sv)) 354 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 355 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 356 else
355 sv_setiv (*sv, bits); 357 sv_setiv (*sv, bits);
… …
614 RETVAL = !!SDL_SetVideoMode ( 616 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 617 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 618 );
617 if (RETVAL) 619 if (RETVAL)
618 { 620 {
621 av_clear (texture_av);
622
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 623 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 624# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621# include "glfunc.h" 625# include "glfunc.h"
622# undef GL_FUNC 626# undef GL_FUNC
627
623 } 628 }
624 OUTPUT: 629 OUTPUT:
625 RETVAL 630 RETVAL
626 631
627void 632void
… …
1391 CODE: 1396 CODE:
1392{ 1397{
1393 if (dx > 0) 1398 if (dx > 0)
1394 map_blank (self, self->x, self->y, dx, self->h); 1399 map_blank (self, self->x, self->y, dx, self->h);
1395 else if (dx < 0) 1400 else if (dx < 0)
1396 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1401 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1397 1402
1398 if (dy > 0) 1403 if (dy > 0)
1399 map_blank (self, self->x, self->y, self->w, dy); 1404 map_blank (self, self->x, self->y, self->w, dy);
1400 else if (dy < 0) 1405 else if (dy < 0)
1401 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1406 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1402 1407
1403 self->ox += dx; self->x += dx; 1408 self->ox += dx; self->x += dx;
1404 self->oy += dy; self->y += dy; 1409 self->oy += dy; self->y += dy;
1405 1410
1406 while (self->y < 0) 1411 while (self->y < 0)
… …
1460 } 1465 }
1461 else if (cmd == 6) // monster width 1466 else if (cmd == 6) // monster width
1462 cell->stat_width = *data++ + 1; 1467 cell->stat_width = *data++ + 1;
1463 else if (cmd == 0x47) 1468 else if (cmd == 0x47)
1464 { 1469 {
1465 if (*data == 8) 1470 if (*data == 4)
1466 ; // decode player uuid 1471 ; // decode player count
1467 1472
1468 data += *data + 1; 1473 data += *data + 1;
1469 } 1474 }
1470 else if (cmd == 8) // cell flags 1475 else if (cmd == 8) // cell flags
1471 cell->flags = *data++; 1476 cell->flags = *data++;
… …
1712 } 1717 }
1713 } 1718 }
1714 } 1719 }
1715 } 1720 }
1716 1721
1717 // go through all smoothlevels, lowest to highest, then draw 1722 // go through all smoothlevels, lowest to highest, then draw.
1718 // this is basically counting sort 1723 // this is basically counting sort
1719 { 1724 {
1720 int w, b; 1725 int w, b;
1721 1726
1722 for (w = 0; w < 256 / 32; ++w) 1727 for (w = 0; w < 256 / 32; ++w)
… …
1735 smooth_key *skey = (smooth_key *)HeKEY (he); 1740 smooth_key *skey = (smooth_key *)HeKEY (he);
1736 IV bits = SvIVX (HeVAL (he)); 1741 IV bits = SvIVX (HeVAL (he));
1737 1742
1738 if (!(bits & 0x1000) 1743 if (!(bits & 0x1000)
1739 && skey->level == level 1744 && skey->level == level
1740 && level >= smooth_max [skey->x][skey->y]) 1745 && level > smooth_max [skey->x][skey->y])
1741 { 1746 {
1742 maptex tex = self->tex [skey->tile]; 1747 maptex tex = self->tex [skey->tile];
1743 int px = (((int)skey->x) - 1) * T; 1748 int px = (((int)skey->x) - 1) * T;
1744 int py = (((int)skey->y) - 1) * T; 1749 int py = (((int)skey->y) - 1) * T;
1745 int border = bits & 15; 1750 int border = bits & 15;
… …
2210# undef const_iv 2215# undef const_iv
2211 }; 2216 };
2212 2217
2213 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2218 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2214 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2219 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2220
2221 texture_av = newAV ();
2222 AvREAL_off (texture_av);
2215} 2223}
2216 2224
2217char * 2225char *
2218gl_vendor () 2226gl_vendor ()
2219 CODE: 2227 CODE:
… …
2370 2378
2371int glGenTexture () 2379int glGenTexture ()
2372 CODE: 2380 CODE:
2373{ 2381{
2374 GLuint name; 2382 GLuint name;
2383 if (AvFILL (texture_av) >= 0)
2384 name = (GLuint)(size_t)av_pop (texture_av);
2385 else
2375 glGenTextures (1, &name); 2386 glGenTextures (1, &name);
2376 RETVAL = name; 2387 RETVAL = name;
2377} 2388}
2378 OUTPUT: 2389 OUTPUT:
2379 RETVAL 2390 RETVAL
2380 2391
2381void glDeleteTexture (int name) 2392void glDeleteTexture (int name)
2382 CODE: 2393 CODE:
2383{ 2394{
2384 GLuint name_ = name; 2395 /* make a half-assed attempt at returning the memory used by the texture */
2385 glDeleteTextures (1, &name_); 2396 /* textures are frequently being reused by cfplus anyway */
2397 /*glBindTexture (GL_TEXTURE_2D, name);*/
2398 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
2399 av_push (texture_av, (SV *)(size_t)name);
2400 { GLuint name_ = name; glDeleteTextures (1, &name_); }
2386} 2401}
2387 2402
2388int glGenList () 2403int glGenList ()
2389 CODE: 2404 CODE:
2390 RETVAL = glGenLists (1); 2405 RETVAL = glGenLists (1);

Diff Legend

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