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.124 by root, Tue Jul 4 23:23:31 2006 UTC vs.
Revision 1.174 by root, Fri Apr 6 07:45:34 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
15#include <stdlib.h> 23#include <stdlib.h>
16 24
… …
31# include <sys/types.h> 39# include <sys/types.h>
32# include <sys/socket.h> 40# include <sys/socket.h>
33# include <netinet/in.h> 41# include <netinet/in.h>
34# include <netinet/tcp.h> 42# include <netinet/tcp.h>
35# include <inttypes.h> 43# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 44#endif
44 45
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 47
49#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
50 49
51#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
53 52
54#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
55 54
56#if 1 55#if 0
57# define PARACHUTE SDL_INIT_NOPARACHUTE 56# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 57#else
59# define PARACHUTE 0 58# define PARACHUTE 0
60#endif 59#endif
61 60
… …
80 79
81#include "pango-font.c" 80#include "pango-font.c"
82#include "pango-fontmap.c" 81#include "pango-fontmap.c"
83#include "pango-render.c" 82#include "pango-render.c"
84 83
85typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
87 86
88typedef PangoFontDescription *CFClient__Font; 87typedef PangoFontDescription *CFPlus__Font;
89 88
90static int 89static int
91shape_attr_p (PangoLayoutRun *run) 90shape_attr_p (PangoLayoutRun *run)
92{ 91{
93 GSList *attrs = run->item->analysis.extra_attrs; 92 GSList *attrs = run->item->analysis.extra_attrs;
… …
107 106
108typedef struct cf_layout { 107typedef struct cf_layout {
109 PangoLayout *pl; 108 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
111 int base_height; 110 int base_height;
112 CFClient__Font font; 111 CFPlus__Font font;
113} *CFClient__Layout; 112} *CFPlus__Layout;
114 113
115static CFClient__Font default_font; 114static CFPlus__Font default_font;
116static PangoContext *opengl_context; 115static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 116static PangoFontMap *opengl_fontmap;
118 117
119static void 118static void
120substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
121{ 120{
122 FcPatternAddBool (pattern, FC_HINTING, 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
123#ifdef FC_HINT_STYLE 122#ifdef FC_HINT_STYLE
124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
125#endif 124#endif
126#ifdef _WIN32
127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
128#else
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130#endif
131} 126}
132 127
133static void 128static void
134layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
135{ 130{
136 /* use a random scale factor to account for unknown descenders, 0.8 works 131 /* use a random scale factor to account for unknown descenders, 0.8 works
137 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
138 */ 133 */
139 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
… …
143 138
144 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
145} 140}
146 141
147static void 142static void
148layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
149{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
150 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
151 149
152 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
153 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
154 152
155 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
156} 154 if (!rect.height) rect.height = 1;
157 155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
158typedef uint16_t mapface; 161typedef uint16_t faceid;
159 162
160typedef struct { 163typedef struct {
161 GLint name; 164 int name;
162 int w, h; 165 int w, h;
163 float s, t; 166 float s, t;
164 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
165} maptex; 168} maptex;
166 169
167typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
168 int16_t darkness; 173 uint16_t darkness;
169 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
170} mapcell; 175} mapcell;
171 176
172typedef struct { 177typedef struct {
173 int32_t c0, c1; 178 int32_t c0, c1;
174 mapcell *col; 179 mapcell *col;
175} maprow; 180} maprow;
176 181
177typedef struct map { 182typedef struct map {
178 int x, y, w, h; 183 int x, y, w, h;
179 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
180 int faces; 185 int faces; tileid *face2tile; // [faceid]
181 mapface *face; 186 int texs; maptex *tex; // [tileid]
182
183 int texs;
184 maptex *tex;
185 187
186 int32_t rows; 188 int32_t rows;
187 maprow *row; 189 maprow *row;
188} *CFClient__Map; 190} *CFPlus__Map;
189 191
190static char * 192static char *
191prepend (char *ptr, int sze, int inc) 193prepend (char *ptr, int sze, int inc)
192{ 194{
193 char *p; 195 char *p;
… …
210} 212}
211 213
212#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 214#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
214 216
217static void
218need_facenum (struct map *self, faceid face)
219{
220 while (self->faces <= face)
221 {
222 Append (tileid, self->face2tile, self->faces, self->faces);
223 self->faces *= 2;
224 }
225}
226
227static void
228need_texid (struct map *self, int texid)
229{
230 while (self->texs <= texid)
231 {
232 Append (maptex, self->tex, self->texs, self->texs);
233 self->texs *= 2;
234 }
235}
236
215static maprow * 237static maprow *
216map_get_row (CFClient__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
217{ 239{
218 if (0 > y) 240 if (0 > y)
219 { 241 {
220 int extend = - y + MAP_EXTEND_Y; 242 int extend = - y + MAP_EXTEND_Y;
221 Prepend (maprow, self->row, self->rows, extend); 243 Prepend (maprow, self->row, self->rows, extend);
… …
259 281
260 return row->col + (x - row->c0); 282 return row->col + (x - row->c0);
261} 283}
262 284
263static mapcell * 285static mapcell *
264map_get_cell (CFClient__Map self, int x, int y) 286map_get_cell (CFPlus__Map self, int x, int y)
265{ 287{
266 return row_get_cell (map_get_row (self, y), x); 288 return row_get_cell (map_get_row (self, y), x);
267} 289}
268 290
269static void 291static void
270map_clear (CFClient__Map self) 292map_clear (CFPlus__Map self)
271{ 293{
272 int r; 294 int r;
273 295
274 for (r = 0; r < self->rows; r++) 296 for (r = 0; r < self->rows; r++)
275 Safefree (self->row[r].col); 297 Safefree (self->row[r].col);
… …
283 self->row = 0; 305 self->row = 0;
284 self->rows = 0; 306 self->rows = 0;
285} 307}
286 308
287static void 309static void
288map_blank (CFClient__Map self, int x0, int y0, int w, int h) 310map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
289{ 311{
290 int x, y; 312 int x, y;
291 maprow *row; 313 maprow *row;
314 mapcell *cell;
292 315
293 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
294 if (y >= 0) 317 if (y >= 0)
295 { 318 {
296 if (y >= self->rows) 319 if (y >= self->rows)
… …
302 if (x >= row->c0) 325 if (x >= row->c0)
303 { 326 {
304 if (x >= row->c1) 327 if (x >= row->c1)
305 break; 328 break;
306 329
307 row->col[x - row->c0].darkness = -1; 330 cell = row->col + x - row->c0;
331
332 cell->darkness = 0;
333 cell->stat_hp = 0;
334 cell->flags = 0;
335 cell->player = 0;
308 } 336 }
309 } 337 }
310} 338}
311 339
312static void 340static void
… …
350 n |= n >> 16; 378 n |= n >> 16;
351 379
352 return n + 1; 380 return n + 1;
353} 381}
354 382
383/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314
386
355MODULE = CFClient PACKAGE = CFClient 387MODULE = CFPlus PACKAGE = CFPlus
356 388
357PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
358 390
359BOOT: 391BOOT:
360{ 392{
361 HV *stash = gv_stashpv ("CFClient", 1); 393 HV *stash = gv_stashpv ("CFPlus", 1);
362 static const struct { 394 static const struct {
363 const char *name; 395 const char *name;
364 IV iv; 396 IV iv;
365 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
366# define const_iv(name) { # name, (IV)name } 398# define const_iv(name) { # name, (IV)name }
399 const_iv (SDLK_MODIFIER_MIN),
400 const_iv (SDLK_MODIFIER_MAX),
401
367 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
368 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
369 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
370 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
371 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
… …
380 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
381 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
382 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
383 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
384 const_iv (SDL_USEREVENT), 419 const_iv (SDL_USEREVENT),
420
421 const_iv (SDL_APPINPUTFOCUS),
422 const_iv (SDL_APPMOUSEFOCUS),
423 const_iv (SDL_APPACTIVE),
424
385 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
386 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
387 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
388 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
389 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
… …
444 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
445 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
446 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
447 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
448 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
449 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
450 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
451 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
452 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
453 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
454 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
455 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
456 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
457 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
458 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
459 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
460 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
461 const_iv (KMOD_CTRL),
462 const_iv (KMOD_SHIFT),
463 const_iv (KMOD_ALT),
464 const_iv (KMOD_META)
465# undef const_iv 506# undef const_iv
466 }; 507 };
467 508
468 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 509 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 510 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
511
512 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
513 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
470} 514}
515
516void
517weaken (SV *rv)
518 PROTOTYPE: $
519 CODE:
520 sv_rvweaken (rv);
521
522int
523in_destruct ()
524 CODE:
525 RETVAL = PL_main_cv == Nullcv;
526 OUTPUT:
527 RETVAL
471 528
472NV floor (NV x) 529NV floor (NV x)
473 530
474NV ceil (NV x) 531NV ceil (NV x)
475 532
… …
506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
509 566
510 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 567 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568#if SDL_VERSION_ATLEAST(1,2,10)
569 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
570 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571#endif
511 572
512 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
513 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
514 575
515 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
567 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
568 case SDL_KEYUP: 629 case SDL_KEYUP:
569 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
570 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
571 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 632 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
633 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
572 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
573 break; 635 break;
574 636
575 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
576 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
602 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
603 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
604 break; 666 break;
605 } 667 }
606 668
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 669 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
608 } 670 }
609} 671}
610 672
611int 673int
612Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 674Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
626#ifndef _WIN32 688#ifndef _WIN32
627 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
628#endif 690#endif
629 691
630void 692void
693win32_proxy_info ()
694 PPCODE:
695{
696#ifdef _WIN32
697 char buffer[2048];
698 DWORD buflen;
699
700 EXTEND (SP, 3);
701
702 buflen = sizeof (buffer);
703 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
704 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
705 {
706 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
707
708 buflen = sizeof (buffer);
709 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
710 {
711 PUSHs (newSVpv (buffer, 0));
712
713 buflen = sizeof (buffer);
714 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
715 PUSHs (newSVpv (buffer, 0));
716 }
717 }
718#endif
719}
720
721void
631add_font (char *file) 722add_font (char *file)
632 CODE: 723 CODE:
633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
634 725
635void 726void
636load_image_inline (SV *image_) 727load_image_inline (SV *image_)
637 ALIAS: 728 ALIAS:
638 load_image_file = 1 729 load_image_file = 1
… …
680 771
681 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 772 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
682 773
683 assert (surface2->pitch == surface2->w * 4); 774 assert (surface2->pitch == surface2->w * 4);
684 775
776 SDL_LockSurface (surface2);
685 EXTEND (SP, 5); 777 EXTEND (SP, 6);
686 PUSHs (sv_2mortal (newSViv (surface2->w))); 778 PUSHs (sv_2mortal (newSViv (surface2->w)));
687 PUSHs (sv_2mortal (newSViv (surface2->h))); 779 PUSHs (sv_2mortal (newSViv (surface2->h)));
688 SDL_LockSurface (surface2);
689 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 780 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
690 SDL_UnlockSurface (surface2);
691 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 781 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
692 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 782 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
693 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 783 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
784 SDL_UnlockSurface (surface2);
694 785
695 SDL_FreeSurface (surface); 786 SDL_FreeSurface (surface);
696 SDL_FreeSurface (surface2); 787 SDL_FreeSurface (surface2);
697} 788}
698 789
… …
737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
738#endif 829#endif
739 _exit (1); 830 _exit (1);
740 831
741void 832void
742_exit (int retval) 833_exit (int retval = 0)
743 CODE: 834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
837#else
744 _exit (retval); 838 _exit (retval);
839#endif
745 840
746MODULE = CFClient PACKAGE = CFClient::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
747 842
748CFClient::Font 843CFPlus::Font
749new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
750 CODE: 845 CODE:
751{ 846{
752 int count; 847 int count;
753 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
756} 851}
757 OUTPUT: 852 OUTPUT:
758 RETVAL 853 RETVAL
759 854
760void 855void
761DESTROY (CFClient::Font self) 856DESTROY (CFPlus::Font self)
762 CODE: 857 CODE:
763 pango_font_description_free (self); 858 pango_font_description_free (self);
764 859
765void 860void
766make_default (CFClient::Font self) 861make_default (CFPlus::Font self)
767 CODE: 862 CODE:
768 default_font = self; 863 default_font = self;
769 864
770MODULE = CFClient PACKAGE = CFClient::Layout 865MODULE = CFPlus PACKAGE = CFPlus::Layout
771 866
772void 867void
773clear_font_cache () 868reset_glyph_cache ()
774 CODE: 869 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear (); 870 tc_clear ();
777 871
778CFClient::Layout 872CFPlus::Layout
779new (SV *class, int type = 0) 873new (SV *class)
780 CODE: 874 CODE:
781 New (0, RETVAL, 1, struct cf_layout); 875 New (0, RETVAL, 1, struct cf_layout);
782 876
783 RETVAL->pl = pango_layout_new (opengl_context); 877 RETVAL->pl = pango_layout_new (opengl_context);
784 RETVAL->r = 1.; 878 RETVAL->r = 1.;
… …
792 layout_update_font (RETVAL); 886 layout_update_font (RETVAL);
793 OUTPUT: 887 OUTPUT:
794 RETVAL 888 RETVAL
795 889
796void 890void
797DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
798 CODE: 892 CODE:
799 g_object_unref (self->pl); 893 g_object_unref (self->pl);
800 Safefree (self); 894 Safefree (self);
801 895
802void 896void
803set_text (CFClient::Layout self, SV *text_) 897set_text (CFPlus::Layout self, SV *text_)
804 CODE: 898 CODE:
805{ 899{
806 STRLEN textlen; 900 STRLEN textlen;
807 char *text = SvPVutf8 (text_, textlen); 901 char *text = SvPVutf8 (text_, textlen);
808 902
809 pango_layout_set_text (self->pl, text, textlen); 903 pango_layout_set_text (self->pl, text, textlen);
810} 904}
811 905
812void 906void
813set_markup (CFClient::Layout self, SV *text_) 907set_markup (CFPlus::Layout self, SV *text_)
814 CODE: 908 CODE:
815{ 909{
816 STRLEN textlen; 910 STRLEN textlen;
817 char *text = SvPVutf8 (text_, textlen); 911 char *text = SvPVutf8 (text_, textlen);
818 912
819 pango_layout_set_markup (self->pl, text, textlen); 913 pango_layout_set_markup (self->pl, text, textlen);
820} 914}
821 915
822void 916void
823set_shapes (CFClient::Layout self, ...) 917set_shapes (CFPlus::Layout self, ...)
824 CODE: 918 CODE:
825{ 919{
826 PangoAttrList *attrs = 0; 920 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl); 921 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text; 922 const char *pos = text;
… …
863 if (attrs) 957 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs); 958 pango_layout_set_attributes (self->pl, attrs);
865} 959}
866 960
867void 961void
868get_shapes (CFClient::Layout self) 962get_shapes (CFPlus::Layout self)
869 PPCODE: 963 PPCODE:
870{ 964{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 965 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872 966
873 do 967 do
… …
877 if (run && shape_attr_p (run)) 971 if (run && shape_attr_p (run))
878 { 972 {
879 PangoRectangle extents; 973 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents); 974 pango_layout_iter_get_run_extents (iter, 0, &extents);
881 975
976 EXTEND (SP, 2);
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 977 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 978 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 } 979 }
885 } 980 }
886 while (pango_layout_iter_next_run (iter)); 981 while (pango_layout_iter_next_run (iter));
887 982
888 pango_layout_iter_free (iter); 983 pango_layout_iter_free (iter);
889} 984}
890 985
891int 986int
892has_wrapped (CFClient::Layout self) 987has_wrapped (CFPlus::Layout self)
893 CODE: 988 CODE:
894{ 989{
895 int lines = 1; 990 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl); 991 const char *text = pango_layout_get_text (self->pl);
897 992
… …
902} 997}
903 OUTPUT: 998 OUTPUT:
904 RETVAL 999 RETVAL
905 1000
906SV * 1001SV *
907get_text (CFClient::Layout self) 1002get_text (CFPlus::Layout self)
908 CODE: 1003 CODE:
909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
910 sv_utf8_decode (RETVAL); 1005 sv_utf8_decode (RETVAL);
911 OUTPUT: 1006 OUTPUT:
912 RETVAL 1007 RETVAL
913 1008
914void 1009void
915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1010set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
916 CODE: 1011 CODE:
917 self->r = r; 1012 self->r = r;
918 self->g = g; 1013 self->g = g;
919 self->b = b; 1014 self->b = b;
920 self->a = a; 1015 self->a = a;
921 1016
922void 1017void
923set_font (CFClient::Layout self, CFClient::Font font = 0) 1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
924 CODE: 1019 CODE:
925 if (self->font != font) 1020 if (self->font != font)
926 { 1021 {
927 self->font = font; 1022 self->font = font;
928 layout_update_font (self); 1023 layout_update_font (self);
929 } 1024 }
930 1025
931void 1026void
932set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
933 CODE: 1028 CODE:
934 if (self->base_height != base_height) 1029 if (self->base_height != base_height)
935 { 1030 {
936 self->base_height = base_height; 1031 self->base_height = base_height;
937 layout_update_font (self); 1032 layout_update_font (self);
938 } 1033 }
939 1034
940void 1035void
941set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
942 CODE: 1037 CODE:
943 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1038 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
944 1039
945void 1040void
946set_indent (CFClient::Layout self, int indent) 1041set_indent (CFPlus::Layout self, int indent)
947 CODE: 1042 CODE:
948 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
949 1044
950void 1045void
951set_spacing (CFClient::Layout self, int spacing) 1046set_spacing (CFPlus::Layout self, int spacing)
952 CODE: 1047 CODE:
953 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
954 1049
955void 1050void
956set_ellipsise (CFClient::Layout self, int ellipsise) 1051set_ellipsise (CFPlus::Layout self, int ellipsise)
957 CODE: 1052 CODE:
958 pango_layout_set_ellipsize (self->pl, 1053 pango_layout_set_ellipsize (self->pl,
959 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START
960 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
961 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
962 : PANGO_ELLIPSIZE_NONE 1057 : PANGO_ELLIPSIZE_NONE
963 ); 1058 );
964 1059
965void 1060void
966set_single_paragraph_mode (CFClient::Layout self, int spm) 1061set_single_paragraph_mode (CFPlus::Layout self, int spm)
967 CODE: 1062 CODE:
968 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
969 1064
970void 1065void
971size (CFClient::Layout self) 1066size (CFPlus::Layout self)
972 PPCODE: 1067 PPCODE:
973{ 1068{
974 int w, h; 1069 int w, h;
975 1070
976 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
… …
979 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
980 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
981} 1076}
982 1077
983int 1078int
984descent (CFClient::Layout self) 1079descent (CFPlus::Layout self)
985 CODE: 1080 CODE:
986{ 1081{
987 PangoRectangle rect; 1082 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1083 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect); 1084 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
991} 1086}
992 OUTPUT: 1087 OUTPUT:
993 RETVAL 1088 RETVAL
994 1089
995int 1090int
996xy_to_index (CFClient::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
997 CODE: 1092 CODE:
998{ 1093{
999 int index, trailing; 1094 int index, trailing;
1000 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1095 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1001 RETVAL = index; 1096 RETVAL = index + trailing;
1002} 1097}
1003 OUTPUT: 1098 OUTPUT:
1004 RETVAL 1099 RETVAL
1005 1100
1006void 1101void
1007cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
1008 PPCODE: 1103 PPCODE:
1009{ 1104{
1010 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
1011 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1012 1107
… …
1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1017} 1112}
1018 1113
1019void 1114void
1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1116 PPCODE:
1117{
1118 int line, x;
1119
1120 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1121 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1122
1123 EXTEND (SP, 2);
1124 PUSHs (sv_2mortal (newSViv (line - 1)));
1125 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1126}
1127
1128void
1129line_x_to_index (CFPlus::Layout self, int line, int x)
1130 PPCODE:
1131{
1132 PangoLayoutLine *lp;
1133 int index, trailing;
1134
1135 if (line < 0)
1136 XSRETURN_EMPTY;
1137
1138 if (!(lp = pango_layout_get_line (self->pl, line)))
1139 XSRETURN_EMPTY; /* do better */
1140
1141 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1142
1143 EXTEND (SP, 2);
1144 if (GIMME_V == G_SCALAR)
1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
1146 else
1147 {
1148 PUSHs (sv_2mortal (newSViv (index)));
1149 PUSHs (sv_2mortal (newSViv (trailing)));
1150 }
1151}
1152
1153void
1020render (CFClient::Layout self, float x, float y) 1154render (CFPlus::Layout self, float x, float y, int flags = 0)
1021 PPCODE: 1155 PPCODE:
1022 pango_opengl_render_layout_subpixel ( 1156 pango_opengl_render_layout_subpixel (
1023 self->pl, 1157 self->pl,
1024 x * PANGO_SCALE, y * PANGO_SCALE, 1158 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a 1159 self->r, self->g, self->b, self->a,
1160 flags
1026 ); 1161 );
1027 1162
1028MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
1029 1164
1030void 1165void
1031pad2pot (SV *data_, SV *w_, SV *h_) 1166pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE: 1167 CODE:
1033{ 1168{
… …
1111 glDisable (GL_ALPHA_TEST); 1246 glDisable (GL_ALPHA_TEST);
1112 glDisable (GL_BLEND); 1247 glDisable (GL_BLEND);
1113 } 1248 }
1114} 1249}
1115 1250
1116MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1117 1252
1118CFClient::Map 1253CFPlus::Map
1119new (SV *class, int map_width, int map_height) 1254new (SV *class)
1120 CODE: 1255 CODE:
1121 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1122 RETVAL->x = 0; 1257 RETVAL->x = 0;
1123 RETVAL->y = 0; 1258 RETVAL->y = 0;
1124 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1125 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1126 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1127 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1128 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1129 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1130 RETVAL->texs = 8192;
1131 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1132 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1133 RETVAL->row = 0; 1266 RETVAL->row = 0;
1134 OUTPUT: 1267 OUTPUT:
1135 RETVAL 1268 RETVAL
1136 1269
1137void 1270void
1138DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
1139 CODE: 1272 CODE:
1140{ 1273{
1141 map_clear (self); 1274 map_clear (self);
1142 Safefree (self->face); 1275 Safefree (self->face2tile);
1143 Safefree (self->tex); 1276 Safefree (self->tex);
1144 Safefree (self); 1277 Safefree (self);
1145} 1278}
1146 1279
1147void 1280void
1281resize (CFPlus::Map self, int map_width, int map_height)
1282 CODE:
1283 self->w = map_width;
1284 self->h = map_height;
1285
1286void
1148clear (CFClient::Map self) 1287clear (CFPlus::Map self)
1149 CODE: 1288 CODE:
1150 map_clear (self); 1289 map_clear (self);
1151 1290
1152void 1291void
1153set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1154 CODE: 1293 CODE:
1155{ 1294{
1156 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1157 { 1296 need_texid (self, tile);
1158 Append (mapface, self->face, self->faces, self->faces);
1159 self->faces *= 2;
1160 }
1161
1162 self->face [face] = texid;
1163} 1297}
1164 1298
1165void 1299void
1166set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1300set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1167 CODE: 1301 CODE:
1168{ 1302{
1169 while (self->texs <= texid) 1303 need_texid (self, texid);
1170 {
1171 Append (maptex, self->tex, self->texs, self->texs);
1172 self->texs *= 2;
1173 }
1174 1304
1175 { 1305 {
1176 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1177 1307
1178 tex->name = name; 1308 tex->name = name;
… …
1195 // from transparent color bleeding and ugly wrapping effects. 1325 // from transparent color bleeding and ugly wrapping effects.
1196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1197} 1327}
1198 1328
1199int 1329int
1200ox (CFClient::Map self) 1330ox (CFPlus::Map self)
1201 ALIAS: 1331 ALIAS:
1202 oy = 1 1332 oy = 1
1203 x = 2 1333 x = 2
1204 y = 3 1334 y = 3
1205 w = 4 1335 w = 4
… …
1216 } 1346 }
1217 OUTPUT: 1347 OUTPUT:
1218 RETVAL 1348 RETVAL
1219 1349
1220void 1350void
1221scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1222 CODE: 1352 CODE:
1223{ 1353{
1224 if (dx > 0) 1354 if (dx > 0)
1225 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1226 else if (dx < 0) 1356 else if (dx < 0)
1227 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1357 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1228 1358
1229 if (dy > 0) 1359 if (dy > 0)
1230 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1231 else if (dy < 0) 1361 else if (dy < 0)
1232 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1362 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1233 1363
1234 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1235 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1236 1366
1237 while (self->y < 0) 1367 while (self->y < 0)
… …
1242 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
1243 } 1373 }
1244} 1374}
1245 1375
1246void 1376void
1247map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
1248 CODE: 1378 CODE:
1249{ 1379{
1250 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1251 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1252 mapcell *cell; 1382 mapcell *cell;
1253 int x, y, flags; 1383 int x, y, flags;
1254 1384
1255 while (data < data_end) 1385 while (data < data_end - 1)
1256 { 1386 {
1257 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1258 1388
1259 x = self->x + ((flags >> 10) & 63); 1389 x = self->x + ((flags >> 10) & 63);
1260 y = self->y + ((flags >> 4) & 63); 1390 y = self->y + ((flags >> 4) & 63);
1261 1391
1262 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
1263 1393
1264 if (flags & 15) 1394 if (flags & 15)
1265 { 1395 {
1266 if (cell->darkness < 0) 1396 if (!cell->darkness)
1267 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1268 cell->darkness = 0; 1399 cell->darkness = 256;
1269 cell->face [0] = 0;
1270 cell->face [1] = 0;
1271 cell->face [2] = 0;
1272 } 1400 }
1273 1401
1274 cell->darkness = flags & 8 ? *data++ : 255;
1275
1276 //TODO: don't trust server data to be in-range(!) 1402 //TODO: don't trust server data to be in-range(!)
1403
1404 if (flags & 8)
1405 {
1406 if (extmap)
1407 {
1408 uint8_t ext, cmd;
1409
1410 do
1411 {
1412 ext = *data++;
1413 cmd = ext & 0x3f;
1414
1415 if (cmd < 4)
1416 cell->darkness = 255 - ext * 64 + 1;
1417 else if (cmd == 5) // health
1418 {
1419 cell->stat_width = 1;
1420 cell->stat_hp = *data++;
1421 }
1422 else if (cmd == 6) // monster width
1423 cell->stat_width = *data++ + 1;
1424 else if (cmd == 0x47)
1425 {
1426 if (*data == 8)
1427 ; // decode player uuid
1428
1429 data += *data + 1;
1430 }
1431 else if (cmd == 8) // cell flags
1432 cell->flags = *data++;
1433 else if (ext & 0x40) // unknown, multibyte => skip
1434 data += *data + 1;
1435 else
1436 data++;
1437 }
1438 while (ext & 0x80);
1439 }
1440 else
1441 cell->darkness = *data++ + 1;
1442 }
1277 1443
1278 if (flags & 4) 1444 if (flags & 4)
1279 { 1445 {
1280 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1446 faceid face = (data [0] << 8) + data [1]; data += 2;
1447 need_facenum (self, face);
1448 cell->tile [0] = self->face2tile [face];
1281 } 1449 }
1282 1450
1283 if (flags & 2) 1451 if (flags & 2)
1284 { 1452 {
1285 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1453 faceid face = (data [0] << 8) + data [1]; data += 2;
1454 need_facenum (self, face);
1455 cell->tile [1] = self->face2tile [face];
1286 } 1456 }
1287 1457
1288 if (flags & 1) 1458 if (flags & 1)
1289 { 1459 {
1290 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1460 faceid face = (data [0] << 8) + data [1]; data += 2;
1461 need_facenum (self, face);
1462 cell->tile [2] = self->face2tile [face];
1291 } 1463 }
1292 } 1464 }
1293 else 1465 else
1294 cell->darkness = -1; 1466 cell->darkness = 0;
1295 } 1467 }
1296} 1468}
1297 1469
1298SV * 1470SV *
1299mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1300 CODE: 1472 CODE:
1301{ 1473{
1302 int x1, x; 1474 int x1, x;
1303 int y1, y; 1475 int y1, y;
1304 int z; 1476 int z;
… …
1325 { 1497 {
1326 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1327 1499
1328 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1329 { 1501 {
1330 mapface face = cell->face [z];
1331
1332 if (face)
1333 {
1334 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1335 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1336 int a1 = tex.a; 1504 int a1 = tex.a;
1337 1505
1338 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1339 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1340 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1341 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1342 }
1343 } 1510 }
1344 } 1511 }
1345 1512
1346 *map++ = (r ) 1513 *map++ = (r )
1347 | (g << 8) 1514 | (g << 8)
… …
1354} 1521}
1355 OUTPUT: 1522 OUTPUT:
1356 RETVAL 1523 RETVAL
1357 1524
1358void 1525void
1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1526draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1360 CODE: 1527 CODE:
1361{ 1528{
1362 int vx, vy;
1363 int x, y, z; 1529 int x, y, z;
1364 int last_name; 1530 int last_name;
1365 mapface face;
1366
1367 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1368 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1369
1370 /*
1371 int vx = self->vx = self->w >= sw
1372 ? self->x + (self->w - sw) / 2
1373 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1374
1375 int vy = self->vy = self->h >= sh
1376 ? self->y + (self->h - sh) / 2
1377 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1378 */
1379 1531
1380 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1381 1533
1382 glEnable (GL_BLEND); 1534 glEnable (GL_BLEND);
1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1386 1538
1387 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1388 1540
1389 last_name = 0; 1541 last_name = 0;
1390 1542
1543 mx += self->x;
1544 my += self->y;
1545
1391 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1392 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1393 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1394 { 1549 {
1395 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1396 1551
1397 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1398 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1399 { 1554 {
1400 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1401
1402 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1403 1557
1404 if (face) 1558 if (tile)
1405 { 1559 {
1406 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1407
1408 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1409 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1410 1563
1411 if (last_name != tex.name) 1564 if (last_name != tex.name)
1412 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1413 glEnd (); 1569 glEnd ();
1414 last_name = tex.name;
1415 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1416 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1417 } 1572 }
1418 1573
1419 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1420 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1421 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1576 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1422 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1577 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579 if (cell->flags && z == 2)
1580 {
1581 if (cell->flags & 1)
1582 {
1583 maptex tex = self->tex [1];
1584 int px = x * T + T * 2 / 32;
1585 int py = y * T - T * 6 / 32;
1586
1587 glEnd ();
1588 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589 glBegin (GL_QUADS);
1590
1591 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1592 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1593 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1594 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1595 }
1596 }
1423 } 1597 }
1424 } 1598 }
1425 } 1599 }
1426 1600
1427 glEnd (); 1601 glEnd ();
1428 1602
1429 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1430 glDisable (GL_BLEND); 1604 glDisable (GL_BLEND);
1431}
1432 1605
1606 // top layer: overlays such as the health bar
1607 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows)
1609 {
1610 maprow *row = self->row + (y + my);
1611
1612 for (x = 0; x < sw; x++)
1613 if (row->c0 <= x + mx && x + mx < row->c1)
1614 {
1615 mapcell *cell = row->col + (x + mx - row->c0);
1616
1617 int px = x * T;
1618 int py = y * T;
1619
1620 if (cell->stat_hp)
1621 {
1622 int width = cell->stat_width * T;
1623 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1624
1625 glColor3ub (0, 0, 0);
1626 glRectf (px + 1, py - thick - 2,
1627 px + width - 1, py);
1628
1629 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1630 glRectf (px + 2,
1631 py - thick - 1,
1632 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1633 }
1634 }
1635 }
1636}
1637
1433void 1638void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1639draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE: 1640 CODE:
1436{ 1641{
1437 static float color[16][3] = { 1642 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F }, 1643 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F }, 1644 { 1.00F, 1.00F, 1.00F },
… …
1489 glDisable (GL_BLEND); 1694 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D); 1695 glDisable (GL_TEXTURE_2D);
1491} 1696}
1492 1697
1493void 1698void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1699fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1495 PPCODE: 1700 PPCODE:
1496{ 1701{
1497 int vx, vy;
1498 int x, y; 1702 int x, y;
1499 int sw4 = (sw + 3) & ~3; 1703 int sw4 = (sw + 3) & ~3;
1500 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1501 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1502 1706
1503 memset (darkness, 255, sw4 * sh); 1707 memset (darkness, 255, sw4 * sh);
1504 SvPOK_only (darkness_sv); 1708 SvPOK_only (darkness_sv);
1505 SvCUR_set (darkness_sv, sw4 * sh); 1709 SvCUR_set (darkness_sv, sw4 * sh);
1506 1710
1507 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1711 mx += self->x;
1508 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1712 my += self->y;
1509 1713
1510 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1511 if (0 <= y + vy && y + vy < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1512 { 1716 {
1513 maprow *row = self->row + (y + vy); 1717 maprow *row = self->row + (y + my);
1514 1718
1515 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1517 { 1721 {
1518 mapcell *cell = row->col + (x + vx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1519 1723
1520 darkness[y * sw4 + x] = cell->darkness < 0 1724 darkness[y * sw4 + x] = cell->darkness
1725 ? 255 - (cell->darkness - 1)
1521 ? 255 - FOW_DARKNESS 1726 : 255 - FOW_DARKNESS;
1522 : 255 - cell->darkness;
1523 } 1727 }
1524 } 1728 }
1525 1729
1526 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1527 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1528 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1529 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1530} 1734}
1531 1735
1532SV * 1736SV *
1533get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1737get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1534 CODE: 1738 CODE:
1535{ 1739{
1536 int x, y, x1, y1; 1740 int x, y, x1, y1;
1537 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1538 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1563 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1564 { 1768 {
1565 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1566 uint8_t flags = 0; 1770 uint8_t flags = 0;
1567 1771
1568 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1569 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1570 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1571 1775
1572 *data++ = flags; 1776 *data++ = flags;
1573 1777
1574 if (flags & 1) 1778 if (flags & 1)
1575 { 1779 {
1780 tileid tile = cell->tile [0];
1576 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1577 *data++ = cell->face [0]; 1782 *data++ = tile;
1578 } 1783 }
1579 1784
1580 if (flags & 2) 1785 if (flags & 2)
1581 { 1786 {
1787 tileid tile = cell->tile [1];
1582 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1583 *data++ = cell->face [1]; 1789 *data++ = tile;
1584 } 1790 }
1585 1791
1586 if (flags & 4) 1792 if (flags & 4)
1587 { 1793 {
1794 tileid tile = cell->tile [2];
1588 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1589 *data++ = cell->face [2]; 1796 *data++ = tile;
1590 } 1797 }
1591 } 1798 }
1592 else 1799 else
1593 *data++ = 0; 1800 *data++ = 0;
1594 } 1801 }
… …
1600} 1807}
1601 OUTPUT: 1808 OUTPUT:
1602 RETVAL 1809 RETVAL
1603 1810
1604void 1811void
1605set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1606 PPCODE: 1813 PPCODE:
1607{ 1814{
1608 int x, y, z; 1815 int x, y, z;
1609 int w, h; 1816 int w, h;
1610 int x1, y1; 1817 int x1, y1;
… …
1634 { 1841 {
1635 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1636 1843
1637 if (flags) 1844 if (flags)
1638 { 1845 {
1639 mapface face[3] = { 0, 0, 0 };
1640
1641 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1642 1848
1643 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1644 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1645 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1646 1852
1647 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1648 { 1854 {
1649 cell->darkness = -1; 1855 cell->darkness = 0;
1650 1856
1651 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1652 { 1858 {
1653 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1654 1860
1655 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || !self->tex [t].name)
1862 {
1656 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1657 } 1868 }
1658 } 1869 }
1659 } 1870 }
1660 } 1871 }
1661 } 1872 }
1662} 1873}
1663 1874
1664MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1665 1876
1666CFClient::MixChunk 1877CFPlus::MixChunk
1667new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1668 CODE: 1879 CODE:
1669 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1670 OUTPUT: 1881 OUTPUT:
1671 RETVAL 1882 RETVAL
1672 1883
1673void 1884void
1674DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1675 CODE: 1886 CODE:
1676 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1677 1888
1678int 1889int
1679volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1680 CODE: 1891 CODE:
1681 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1682 OUTPUT: 1893 OUTPUT:
1683 RETVAL 1894 RETVAL
1684 1895
1685int 1896int
1686play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1897play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1687 CODE: 1898 CODE:
1688 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1689 OUTPUT: 1900 OUTPUT:
1690 RETVAL 1901 RETVAL
1691 1902
1692MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1693 1904
1694int 1905int
1695volume (int volume = -1) 1906volume (int volume = -1)
1696 CODE: 1907 CODE:
1697 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1698 OUTPUT: 1909 OUTPUT:
1699 RETVAL 1910 RETVAL
1700 1911
1701CFClient::MixMusic 1912CFPlus::MixMusic
1702new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1703 CODE: 1914 CODE:
1704 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1705 OUTPUT: 1916 OUTPUT:
1706 RETVAL 1917 RETVAL
1707 1918
1708void 1919void
1709DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1710 CODE: 1921 CODE:
1711 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1712 1923
1713int 1924int
1714play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1715 CODE: 1926 CODE:
1716 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1717 OUTPUT: 1928 OUTPUT:
1718 RETVAL 1929 RETVAL
1719 1930
1720MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1721 1932
1722BOOT: 1933BOOT:
1723{ 1934{
1724 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1725 static const struct { 1936 static const struct {
1726 const char *name; 1937 const char *name;
1727 IV iv; 1938 IV iv;
1728 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1729# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
… …
1792 const_iv (GL_SEPARABLE_2D), 2003 const_iv (GL_SEPARABLE_2D),
1793 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1794 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1795 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1796 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
1797 const_iv (GL_LINE_LOOP), 2009 const_iv (GL_LINE_LOOP),
1798 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1799 const_iv (GL_QUAD_STRIP), 2011 const_iv (GL_QUAD_STRIP),
1800 const_iv (GL_TRIANGLES), 2012 const_iv (GL_TRIANGLES),
1801 const_iv (GL_TRIANGLE_STRIP), 2013 const_iv (GL_TRIANGLE_STRIP),
… …
1911 r *= a; 2123 r *= a;
1912 g *= a; 2124 g *= a;
1913 b *= a; 2125 b *= a;
1914 } 2126 }
1915 // microsoft visual "c" rounds instead of truncating... 2127 // microsoft visual "c" rounds instead of truncating...
1916 glColor4ub (MIN ((int)(r * 256.f), 255), 2128 glColor4f (r, g, b, a);
1917 MIN ((int)(g * 256.f), 255),
1918 MIN ((int)(b * 256.f), 255),
1919 MIN ((int)(a * 256.f), 255));
1920 2129
1921void glInterleavedArrays (int format, int stride, char *data) 2130void glInterleavedArrays (int format, int stride, char *data)
1922 2131
1923void glDrawElements (int mode, int count, int type, char *indices) 2132void glDrawElements (int mode, int count, int type, char *indices)
1924 2133
… …
2001 2210
2002void glEndList () 2211void glEndList ()
2003 2212
2004void glCallList (int list) 2213void glCallList (int list)
2005 2214
2006

Diff Legend

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