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.125 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.175 by root, Fri Apr 6 08:09:42 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)
… …
125#endif 124#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 126}
128 127
129static void 128static void
130layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
131{ 130{
132 /* 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
133 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
134 */ 133 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
… …
139 138
140 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
141} 140}
142 141
143static void 142static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
145{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
147 149
148 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 152
151 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
152} 154 if (!rect.height) rect.height = 1;
153 155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
154typedef uint16_t mapface; 161typedef uint16_t faceid;
155 162
156typedef struct { 163typedef struct {
157 GLint name; 164 int name;
158 int w, h; 165 int w, h;
159 float s, t; 166 float s, t;
160 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
161} maptex; 168} maptex;
162 169
163typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
164 int16_t darkness; 173 uint16_t darkness;
165 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
166} mapcell; 175} mapcell;
167 176
168typedef struct { 177typedef struct {
169 int32_t c0, c1; 178 int32_t c0, c1;
170 mapcell *col; 179 mapcell *col;
171} maprow; 180} maprow;
172 181
173typedef struct map { 182typedef struct map {
174 int x, y, w, h; 183 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 185 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 186 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 187
182 int32_t rows; 188 int32_t rows;
183 maprow *row; 189 maprow *row;
184} *CFClient__Map; 190} *CFPlus__Map;
185 191
186static char * 192static char *
187prepend (char *ptr, int sze, int inc) 193prepend (char *ptr, int sze, int inc)
188{ 194{
189 char *p; 195 char *p;
… …
206} 212}
207 213
208#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))
209#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))
210 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
211static maprow * 237static maprow *
212map_get_row (CFClient__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
213{ 239{
214 if (0 > y) 240 if (0 > y)
215 { 241 {
216 int extend = - y + MAP_EXTEND_Y; 242 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 243 Prepend (maprow, self->row, self->rows, extend);
… …
255 281
256 return row->col + (x - row->c0); 282 return row->col + (x - row->c0);
257} 283}
258 284
259static mapcell * 285static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 286map_get_cell (CFPlus__Map self, int x, int y)
261{ 287{
262 return row_get_cell (map_get_row (self, y), x); 288 return row_get_cell (map_get_row (self, y), x);
263} 289}
264 290
265static void 291static void
266map_clear (CFClient__Map self) 292map_clear (CFPlus__Map self)
267{ 293{
268 int r; 294 int r;
269 295
270 for (r = 0; r < self->rows; r++) 296 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 297 Safefree (self->row[r].col);
… …
279 self->row = 0; 305 self->row = 0;
280 self->rows = 0; 306 self->rows = 0;
281} 307}
282 308
283static void 309static void
284map_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)
285{ 311{
286 int x, y; 312 int x, y;
287 maprow *row; 313 maprow *row;
314 mapcell *cell;
288 315
289 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 317 if (y >= 0)
291 { 318 {
292 if (y >= self->rows) 319 if (y >= self->rows)
… …
298 if (x >= row->c0) 325 if (x >= row->c0)
299 { 326 {
300 if (x >= row->c1) 327 if (x >= row->c1)
301 break; 328 break;
302 329
303 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;
304 } 336 }
305 } 337 }
306} 338}
307 339
308static void 340static void
… …
346 n |= n >> 16; 378 n |= n >> 16;
347 379
348 return n + 1; 380 return n + 1;
349} 381}
350 382
383/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314
386
351MODULE = CFClient PACKAGE = CFClient 387MODULE = CFPlus PACKAGE = CFPlus
352 388
353PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
354 390
355BOOT: 391BOOT:
356{ 392{
357 HV *stash = gv_stashpv ("CFClient", 1); 393 HV *stash = gv_stashpv ("CFPlus", 1);
358 static const struct { 394 static const struct {
359 const char *name; 395 const char *name;
360 IV iv; 396 IV iv;
361 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
362# 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
363 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
… …
376 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
380 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
381 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
… …
440 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
445 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
457 const_iv (KMOD_CTRL),
458 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_ALT),
460 const_iv (KMOD_META)
461# undef const_iv 506# undef const_iv
462 }; 507 };
463 508
464 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; )
465 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);
466} 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
467 528
468NV floor (NV x) 529NV floor (NV x)
469 530
470NV ceil (NV x) 531NV ceil (NV x)
471 532
… …
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 566
506 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
507 572
508 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
510 575
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
563 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
564 case SDL_KEYUP: 629 case SDL_KEYUP:
565 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567 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 */
568 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569 break; 635 break;
570 636
571 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 666 break;
601 } 667 }
602 668
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 669 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
604 } 670 }
605} 671}
606 672
607int 673int
608Mix_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)
… …
622#ifndef _WIN32 688#ifndef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
624#endif 690#endif
625 691
626void 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
627add_font (char *file) 722add_font (char *file)
628 CODE: 723 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 725
631void 726void
632load_image_inline (SV *image_) 727load_image_inline (SV *image_)
633 ALIAS: 728 ALIAS:
634 load_image_file = 1 729 load_image_file = 1
… …
676 771
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 772 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 773
679 assert (surface2->pitch == surface2->w * 4); 774 assert (surface2->pitch == surface2->w * 4);
680 775
776 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 777 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 778 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 779 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 780 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 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)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 782 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 783 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
784 SDL_UnlockSurface (surface2);
690 785
691 SDL_FreeSurface (surface); 786 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 787 SDL_FreeSurface (surface2);
693} 788}
694 789
… …
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
734#endif 829#endif
735 _exit (1); 830 _exit (1);
736 831
737void 832void
738_exit (int retval) 833_exit (int retval = 0)
739 CODE: 834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
837#else
740 _exit (retval); 838 _exit (retval);
839#endif
741 840
742MODULE = CFClient PACKAGE = CFClient::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
743 842
744CFClient::Font 843CFPlus::Font
745new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
746 CODE: 845 CODE:
747{ 846{
748 int count; 847 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
752} 851}
753 OUTPUT: 852 OUTPUT:
754 RETVAL 853 RETVAL
755 854
756void 855void
757DESTROY (CFClient::Font self) 856DESTROY (CFPlus::Font self)
758 CODE: 857 CODE:
759 pango_font_description_free (self); 858 pango_font_description_free (self);
760 859
761void 860void
762make_default (CFClient::Font self) 861make_default (CFPlus::Font self)
763 CODE: 862 CODE:
764 default_font = self; 863 default_font = self;
765 864
766MODULE = CFClient PACKAGE = CFClient::Layout 865MODULE = CFPlus PACKAGE = CFPlus::Layout
767 866
768void 867void
769clear_font_cache () 868reset_glyph_cache ()
770 CODE: 869 CODE:
771 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
772 tc_clear (); 870 tc_clear ();
773 871
774CFClient::Layout 872CFPlus::Layout
775new (SV *class, int type = 0) 873new (SV *class)
776 CODE: 874 CODE:
777 New (0, RETVAL, 1, struct cf_layout); 875 New (0, RETVAL, 1, struct cf_layout);
778 876
779 RETVAL->pl = pango_layout_new (opengl_context); 877 RETVAL->pl = pango_layout_new (opengl_context);
780 RETVAL->r = 1.; 878 RETVAL->r = 1.;
… …
788 layout_update_font (RETVAL); 886 layout_update_font (RETVAL);
789 OUTPUT: 887 OUTPUT:
790 RETVAL 888 RETVAL
791 889
792void 890void
793DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
794 CODE: 892 CODE:
795 g_object_unref (self->pl); 893 g_object_unref (self->pl);
796 Safefree (self); 894 Safefree (self);
797 895
798void 896void
799set_text (CFClient::Layout self, SV *text_) 897set_text (CFPlus::Layout self, SV *text_)
800 CODE: 898 CODE:
801{ 899{
802 STRLEN textlen; 900 STRLEN textlen;
803 char *text = SvPVutf8 (text_, textlen); 901 char *text = SvPVutf8 (text_, textlen);
804 902
805 pango_layout_set_text (self->pl, text, textlen); 903 pango_layout_set_text (self->pl, text, textlen);
806} 904}
807 905
808void 906void
809set_markup (CFClient::Layout self, SV *text_) 907set_markup (CFPlus::Layout self, SV *text_)
810 CODE: 908 CODE:
811{ 909{
812 STRLEN textlen; 910 STRLEN textlen;
813 char *text = SvPVutf8 (text_, textlen); 911 char *text = SvPVutf8 (text_, textlen);
814 912
815 pango_layout_set_markup (self->pl, text, textlen); 913 pango_layout_set_markup (self->pl, text, textlen);
816} 914}
817 915
818void 916void
819set_shapes (CFClient::Layout self, ...) 917set_shapes (CFPlus::Layout self, ...)
820 CODE: 918 CODE:
821{ 919{
822 PangoAttrList *attrs = 0; 920 PangoAttrList *attrs = 0;
823 const char *text = pango_layout_get_text (self->pl); 921 const char *text = pango_layout_get_text (self->pl);
824 const char *pos = text; 922 const char *pos = text;
… …
859 if (attrs) 957 if (attrs)
860 pango_layout_set_attributes (self->pl, attrs); 958 pango_layout_set_attributes (self->pl, attrs);
861} 959}
862 960
863void 961void
864get_shapes (CFClient::Layout self) 962get_shapes (CFPlus::Layout self)
865 PPCODE: 963 PPCODE:
866{ 964{
867 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 965 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
868 966
869 do 967 do
… …
873 if (run && shape_attr_p (run)) 971 if (run && shape_attr_p (run))
874 { 972 {
875 PangoRectangle extents; 973 PangoRectangle extents;
876 pango_layout_iter_get_run_extents (iter, 0, &extents); 974 pango_layout_iter_get_run_extents (iter, 0, &extents);
877 975
976 EXTEND (SP, 2);
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 977 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
879 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 978 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
880 } 979 }
881 } 980 }
882 while (pango_layout_iter_next_run (iter)); 981 while (pango_layout_iter_next_run (iter));
883 982
884 pango_layout_iter_free (iter); 983 pango_layout_iter_free (iter);
885} 984}
886 985
887int 986int
888has_wrapped (CFClient::Layout self) 987has_wrapped (CFPlus::Layout self)
889 CODE: 988 CODE:
890{ 989{
891 int lines = 1; 990 int lines = 1;
892 const char *text = pango_layout_get_text (self->pl); 991 const char *text = pango_layout_get_text (self->pl);
893 992
… …
898} 997}
899 OUTPUT: 998 OUTPUT:
900 RETVAL 999 RETVAL
901 1000
902SV * 1001SV *
903get_text (CFClient::Layout self) 1002get_text (CFPlus::Layout self)
904 CODE: 1003 CODE:
905 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
906 sv_utf8_decode (RETVAL); 1005 sv_utf8_decode (RETVAL);
907 OUTPUT: 1006 OUTPUT:
908 RETVAL 1007 RETVAL
909 1008
910void 1009void
911set_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.)
912 CODE: 1011 CODE:
913 self->r = r; 1012 self->r = r;
914 self->g = g; 1013 self->g = g;
915 self->b = b; 1014 self->b = b;
916 self->a = a; 1015 self->a = a;
917 1016
918void 1017void
919set_font (CFClient::Layout self, CFClient::Font font = 0) 1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
920 CODE: 1019 CODE:
921 if (self->font != font) 1020 if (self->font != font)
922 { 1021 {
923 self->font = font; 1022 self->font = font;
924 layout_update_font (self); 1023 layout_update_font (self);
925 } 1024 }
926 1025
927void 1026void
928set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
929 CODE: 1028 CODE:
930 if (self->base_height != base_height) 1029 if (self->base_height != base_height)
931 { 1030 {
932 self->base_height = base_height; 1031 self->base_height = base_height;
933 layout_update_font (self); 1032 layout_update_font (self);
934 } 1033 }
935 1034
936void 1035void
937set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
938 CODE: 1037 CODE:
939 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);
940 1039
941void 1040void
942set_indent (CFClient::Layout self, int indent) 1041set_indent (CFPlus::Layout self, int indent)
943 CODE: 1042 CODE:
944 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
945 1044
946void 1045void
947set_spacing (CFClient::Layout self, int spacing) 1046set_spacing (CFPlus::Layout self, int spacing)
948 CODE: 1047 CODE:
949 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
950 1049
951void 1050void
952set_ellipsise (CFClient::Layout self, int ellipsise) 1051set_ellipsise (CFPlus::Layout self, int ellipsise)
953 CODE: 1052 CODE:
954 pango_layout_set_ellipsize (self->pl, 1053 pango_layout_set_ellipsize (self->pl,
955 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START
956 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
957 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
958 : PANGO_ELLIPSIZE_NONE 1057 : PANGO_ELLIPSIZE_NONE
959 ); 1058 );
960 1059
961void 1060void
962set_single_paragraph_mode (CFClient::Layout self, int spm) 1061set_single_paragraph_mode (CFPlus::Layout self, int spm)
963 CODE: 1062 CODE:
964 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
965 1064
966void 1065void
967size (CFClient::Layout self) 1066size (CFPlus::Layout self)
968 PPCODE: 1067 PPCODE:
969{ 1068{
970 int w, h; 1069 int w, h;
971 1070
972 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
… …
975 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
976 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
977} 1076}
978 1077
979int 1078int
980descent (CFClient::Layout self) 1079descent (CFPlus::Layout self)
981 CODE: 1080 CODE:
982{ 1081{
983 PangoRectangle rect; 1082 PangoRectangle rect;
984 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1083 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
985 pango_layout_line_get_pixel_extents (line, 0, &rect); 1084 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
987} 1086}
988 OUTPUT: 1087 OUTPUT:
989 RETVAL 1088 RETVAL
990 1089
991int 1090int
992xy_to_index (CFClient::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
993 CODE: 1092 CODE:
994{ 1093{
995 int index, trailing; 1094 int index, trailing;
996 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);
997 RETVAL = index; 1096 RETVAL = index + trailing;
998} 1097}
999 OUTPUT: 1098 OUTPUT:
1000 RETVAL 1099 RETVAL
1001 1100
1002void 1101void
1003cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
1004 PPCODE: 1103 PPCODE:
1005{ 1104{
1006 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
1007 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1008 1107
… …
1011 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1012 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1013} 1112}
1014 1113
1015void 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
1016render (CFClient::Layout self, float x, float y) 1154render (CFPlus::Layout self, float x, float y, int flags = 0)
1017 PPCODE: 1155 PPCODE:
1018 pango_opengl_render_layout_subpixel ( 1156 pango_opengl_render_layout_subpixel (
1019 self->pl, 1157 self->pl,
1020 x * PANGO_SCALE, y * PANGO_SCALE, 1158 x * PANGO_SCALE, y * PANGO_SCALE,
1021 self->r, self->g, self->b, self->a 1159 self->r, self->g, self->b, self->a,
1160 flags
1022 ); 1161 );
1023 1162
1024MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
1025 1164
1026void 1165void
1027pad2pot (SV *data_, SV *w_, SV *h_) 1166pad2pot (SV *data_, SV *w_, SV *h_)
1028 CODE: 1167 CODE:
1029{ 1168{
… …
1107 glDisable (GL_ALPHA_TEST); 1246 glDisable (GL_ALPHA_TEST);
1108 glDisable (GL_BLEND); 1247 glDisable (GL_BLEND);
1109 } 1248 }
1110} 1249}
1111 1250
1112MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1113 1252
1114CFClient::Map 1253CFPlus::Map
1115new (SV *class, int map_width, int map_height) 1254new (SV *class)
1116 CODE: 1255 CODE:
1117 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1118 RETVAL->x = 0; 1257 RETVAL->x = 0;
1119 RETVAL->y = 0; 1258 RETVAL->y = 0;
1120 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1121 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1122 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1123 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1124 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1125 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1126 RETVAL->texs = 8192;
1127 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1128 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1129 RETVAL->row = 0; 1266 RETVAL->row = 0;
1130 OUTPUT: 1267 OUTPUT:
1131 RETVAL 1268 RETVAL
1132 1269
1133void 1270void
1134DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
1135 CODE: 1272 CODE:
1136{ 1273{
1137 map_clear (self); 1274 map_clear (self);
1138 Safefree (self->face); 1275 Safefree (self->face2tile);
1139 Safefree (self->tex); 1276 Safefree (self->tex);
1140 Safefree (self); 1277 Safefree (self);
1141} 1278}
1142 1279
1143void 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
1144clear (CFClient::Map self) 1287clear (CFPlus::Map self)
1145 CODE: 1288 CODE:
1146 map_clear (self); 1289 map_clear (self);
1147 1290
1148void 1291void
1149set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1150 CODE: 1293 CODE:
1151{ 1294{
1152 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1153 { 1296 need_texid (self, tile);
1154 Append (mapface, self->face, self->faces, self->faces);
1155 self->faces *= 2;
1156 }
1157
1158 self->face [face] = texid;
1159} 1297}
1160 1298
1161void 1299void
1162set_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)
1163 CODE: 1301 CODE:
1164{ 1302{
1165 while (self->texs <= texid) 1303 need_texid (self, texid);
1166 {
1167 Append (maptex, self->tex, self->texs, self->texs);
1168 self->texs *= 2;
1169 }
1170 1304
1171 { 1305 {
1172 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1173 1307
1174 tex->name = name; 1308 tex->name = name;
… …
1191 // from transparent color bleeding and ugly wrapping effects. 1325 // from transparent color bleeding and ugly wrapping effects.
1192 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1193} 1327}
1194 1328
1195int 1329int
1196ox (CFClient::Map self) 1330ox (CFPlus::Map self)
1197 ALIAS: 1331 ALIAS:
1198 oy = 1 1332 oy = 1
1199 x = 2 1333 x = 2
1200 y = 3 1334 y = 3
1201 w = 4 1335 w = 4
… …
1212 } 1346 }
1213 OUTPUT: 1347 OUTPUT:
1214 RETVAL 1348 RETVAL
1215 1349
1216void 1350void
1217scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1218 CODE: 1352 CODE:
1219{ 1353{
1220 if (dx > 0) 1354 if (dx > 0)
1221 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1222 else if (dx < 0) 1356 else if (dx < 0)
1223 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);
1224 1358
1225 if (dy > 0) 1359 if (dy > 0)
1226 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1227 else if (dy < 0) 1361 else if (dy < 0)
1228 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);
1229 1363
1230 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1231 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1232 1366
1233 while (self->y < 0) 1367 while (self->y < 0)
… …
1238 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
1239 } 1373 }
1240} 1374}
1241 1375
1242void 1376void
1243map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
1244 CODE: 1378 CODE:
1245{ 1379{
1246 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1247 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1248 mapcell *cell; 1382 mapcell *cell;
1249 int x, y, flags; 1383 int x, y, flags;
1250 1384
1251 while (data < data_end) 1385 while (data < data_end - 1)
1252 { 1386 {
1253 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1254 1388
1255 x = self->x + ((flags >> 10) & 63); 1389 x = self->x + ((flags >> 10) & 63);
1256 y = self->y + ((flags >> 4) & 63); 1390 y = self->y + ((flags >> 4) & 63);
1257 1391
1258 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
1259 1393
1260 if (flags & 15) 1394 if (flags & 15)
1261 { 1395 {
1262 if (cell->darkness < 0) 1396 if (!cell->darkness)
1263 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1264 cell->darkness = 0; 1399 cell->darkness = 256;
1265 cell->face [0] = 0;
1266 cell->face [1] = 0;
1267 cell->face [2] = 0;
1268 } 1400 }
1269 1401
1270 cell->darkness = flags & 8 ? *data++ : 255;
1271
1272 //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 }
1273 1443
1274 if (flags & 4) 1444 if (flags & 4)
1275 { 1445 {
1276 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];
1277 } 1449 }
1278 1450
1279 if (flags & 2) 1451 if (flags & 2)
1280 { 1452 {
1281 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];
1282 } 1456 }
1283 1457
1284 if (flags & 1) 1458 if (flags & 1)
1285 { 1459 {
1286 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];
1287 } 1463 }
1288 } 1464 }
1289 else 1465 else
1290 cell->darkness = -1; 1466 cell->darkness = 0;
1291 } 1467 }
1292} 1468}
1293 1469
1294SV * 1470SV *
1295mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1296 CODE: 1472 CODE:
1297{ 1473{
1298 int x1, x; 1474 int x1, x;
1299 int y1, y; 1475 int y1, y;
1300 int z; 1476 int z;
… …
1321 { 1497 {
1322 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1323 1499
1324 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1325 { 1501 {
1326 mapface face = cell->face [z];
1327
1328 if (face)
1329 {
1330 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1331 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1332 int a1 = tex.a; 1504 int a1 = tex.a;
1333 1505
1334 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1335 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1336 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1337 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1338 }
1339 } 1510 }
1340 } 1511 }
1341 1512
1342 *map++ = (r ) 1513 *map++ = (r )
1343 | (g << 8) 1514 | (g << 8)
… …
1350} 1521}
1351 OUTPUT: 1522 OUTPUT:
1352 RETVAL 1523 RETVAL
1353 1524
1354void 1525void
1355draw (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)
1356 CODE: 1527 CODE:
1357{ 1528{
1358 int vx, vy;
1359 int x, y, z; 1529 int x, y, z;
1360 int last_name; 1530 int last_name;
1361 mapface face;
1362
1363 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1364 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1365
1366 /*
1367 int vx = self->vx = self->w >= sw
1368 ? self->x + (self->w - sw) / 2
1369 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1370
1371 int vy = self->vy = self->h >= sh
1372 ? self->y + (self->h - sh) / 2
1373 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1374 */
1375 1531
1376 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1377 1533
1378 glEnable (GL_BLEND); 1534 glEnable (GL_BLEND);
1379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1382 1538
1383 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1384 1540
1385 last_name = 0; 1541 last_name = 0;
1386 1542
1543 mx += self->x;
1544 my += self->y;
1545
1387 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1388 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1389 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1390 { 1549 {
1391 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1392 1551
1393 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1394 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1395 { 1554 {
1396 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1397
1398 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1399 1557
1400 if (face) 1558 if (tile)
1401 { 1559 {
1402 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1403
1404 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1405 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1406 1563
1407 if (last_name != tex.name) 1564 if (last_name != tex.name)
1408 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1409 glEnd (); 1569 glEnd ();
1410 last_name = tex.name;
1411 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1412 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1413 } 1572 }
1414 1573
1415 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1416 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1417 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);
1418 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 }
1419 } 1597 }
1420 } 1598 }
1421 } 1599 }
1422 1600
1423 glEnd (); 1601 glEnd ();
1424 1602
1425 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1426 glDisable (GL_BLEND); 1604 glDisable (GL_BLEND);
1427}
1428 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
1429void 1638void
1430draw_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)
1431 CODE: 1640 CODE:
1432{ 1641{
1433 static float color[16][3] = { 1642 static float color[16][3] = {
1434 { 0.00F, 0.00F, 0.00F }, 1643 { 0.00F, 0.00F, 0.00F },
1435 { 1.00F, 1.00F, 1.00F }, 1644 { 1.00F, 1.00F, 1.00F },
… …
1485 glDisable (GL_BLEND); 1694 glDisable (GL_BLEND);
1486 glDisable (GL_TEXTURE_2D); 1695 glDisable (GL_TEXTURE_2D);
1487} 1696}
1488 1697
1489void 1698void
1490fow_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)
1491 PPCODE: 1700 PPCODE:
1492{ 1701{
1493 int vx, vy;
1494 int x, y; 1702 int x, y;
1495 int sw4 = (sw + 3) & ~3; 1703 int sw4 = (sw + 3) & ~3;
1496 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1497 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1498 1706
1499 memset (darkness, 255, sw4 * sh); 1707 memset (darkness, 255, sw4 * sh);
1500 SvPOK_only (darkness_sv); 1708 SvPOK_only (darkness_sv);
1501 SvCUR_set (darkness_sv, sw4 * sh); 1709 SvCUR_set (darkness_sv, sw4 * sh);
1502 1710
1503 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1711 mx += self->x;
1504 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1712 my += self->y;
1505 1713
1506 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1507 if (0 <= y + vy && y + vy < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1508 { 1716 {
1509 maprow *row = self->row + (y + vy); 1717 maprow *row = self->row + (y + my);
1510 1718
1511 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1512 if (row->c0 <= x + vx && x + vx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1513 { 1721 {
1514 mapcell *cell = row->col + (x + vx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1515 1723
1516 darkness[y * sw4 + x] = cell->darkness < 0 1724 darkness[y * sw4 + x] = cell->darkness
1725 ? 255 - (cell->darkness - 1)
1517 ? 255 - FOW_DARKNESS 1726 : 255 - FOW_DARKNESS;
1518 : 255 - cell->darkness;
1519 } 1727 }
1520 } 1728 }
1521 1729
1522 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1523 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1524 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1525 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1526} 1734}
1527 1735
1528SV * 1736SV *
1529get_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)
1530 CODE: 1738 CODE:
1531{ 1739{
1532 int x, y, x1, y1; 1740 int x, y, x1, y1;
1533 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1534 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1559 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1560 { 1768 {
1561 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1562 uint8_t flags = 0; 1770 uint8_t flags = 0;
1563 1771
1564 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1565 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1566 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1567 1775
1568 *data++ = flags; 1776 *data++ = flags;
1569 1777
1570 if (flags & 1) 1778 if (flags & 1)
1571 { 1779 {
1780 tileid tile = cell->tile [0];
1572 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1573 *data++ = cell->face [0]; 1782 *data++ = tile;
1574 } 1783 }
1575 1784
1576 if (flags & 2) 1785 if (flags & 2)
1577 { 1786 {
1787 tileid tile = cell->tile [1];
1578 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1579 *data++ = cell->face [1]; 1789 *data++ = tile;
1580 } 1790 }
1581 1791
1582 if (flags & 4) 1792 if (flags & 4)
1583 { 1793 {
1794 tileid tile = cell->tile [2];
1584 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1585 *data++ = cell->face [2]; 1796 *data++ = tile;
1586 } 1797 }
1587 } 1798 }
1588 else 1799 else
1589 *data++ = 0; 1800 *data++ = 0;
1590 } 1801 }
… …
1596} 1807}
1597 OUTPUT: 1808 OUTPUT:
1598 RETVAL 1809 RETVAL
1599 1810
1600void 1811void
1601set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1602 PPCODE: 1813 PPCODE:
1603{ 1814{
1604 int x, y, z; 1815 int x, y, z;
1605 int w, h; 1816 int w, h;
1606 int x1, y1; 1817 int x1, y1;
… …
1630 { 1841 {
1631 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1632 1843
1633 if (flags) 1844 if (flags)
1634 { 1845 {
1635 mapface face[3] = { 0, 0, 0 };
1636
1637 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1638 1848
1639 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1640 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1641 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1642 1852
1643 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1644 { 1854 {
1645 cell->darkness = -1; 1855 cell->darkness = 0;
1646 1856
1647 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1648 { 1858 {
1649 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1650 1860
1651 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || (t && !self->tex [t].name))
1862 {
1652 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1653 } 1868 }
1654 } 1869 }
1655 } 1870 }
1656 } 1871 }
1657 } 1872 }
1658} 1873}
1659 1874
1660MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1661 1876
1662CFClient::MixChunk 1877CFPlus::MixChunk
1663new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1664 CODE: 1879 CODE:
1665 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1666 OUTPUT: 1881 OUTPUT:
1667 RETVAL 1882 RETVAL
1668 1883
1669void 1884void
1670DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1671 CODE: 1886 CODE:
1672 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1673 1888
1674int 1889int
1675volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1676 CODE: 1891 CODE:
1677 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1678 OUTPUT: 1893 OUTPUT:
1679 RETVAL 1894 RETVAL
1680 1895
1681int 1896int
1682play (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)
1683 CODE: 1898 CODE:
1684 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1685 OUTPUT: 1900 OUTPUT:
1686 RETVAL 1901 RETVAL
1687 1902
1688MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1689 1904
1690int 1905int
1691volume (int volume = -1) 1906volume (int volume = -1)
1692 CODE: 1907 CODE:
1693 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1694 OUTPUT: 1909 OUTPUT:
1695 RETVAL 1910 RETVAL
1696 1911
1697CFClient::MixMusic 1912CFPlus::MixMusic
1698new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1699 CODE: 1914 CODE:
1700 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1701 OUTPUT: 1916 OUTPUT:
1702 RETVAL 1917 RETVAL
1703 1918
1704void 1919void
1705DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1706 CODE: 1921 CODE:
1707 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1708 1923
1709int 1924int
1710play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1711 CODE: 1926 CODE:
1712 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1713 OUTPUT: 1928 OUTPUT:
1714 RETVAL 1929 RETVAL
1715 1930
1716MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1717 1932
1718BOOT: 1933BOOT:
1719{ 1934{
1720 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1721 static const struct { 1936 static const struct {
1722 const char *name; 1937 const char *name;
1723 IV iv; 1938 IV iv;
1724 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1725# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
… …
1788 const_iv (GL_SEPARABLE_2D), 2003 const_iv (GL_SEPARABLE_2D),
1789 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1790 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1791 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1792 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
1793 const_iv (GL_LINE_LOOP), 2009 const_iv (GL_LINE_LOOP),
1794 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1795 const_iv (GL_QUAD_STRIP), 2011 const_iv (GL_QUAD_STRIP),
1796 const_iv (GL_TRIANGLES), 2012 const_iv (GL_TRIANGLES),
1797 const_iv (GL_TRIANGLE_STRIP), 2013 const_iv (GL_TRIANGLE_STRIP),
… …
1907 r *= a; 2123 r *= a;
1908 g *= a; 2124 g *= a;
1909 b *= a; 2125 b *= a;
1910 } 2126 }
1911 // microsoft visual "c" rounds instead of truncating... 2127 // microsoft visual "c" rounds instead of truncating...
1912 glColor4ub (MIN ((int)(r * 256.f), 255), 2128 glColor4f (r, g, b, a);
1913 MIN ((int)(g * 256.f), 255),
1914 MIN ((int)(b * 256.f), 255),
1915 MIN ((int)(a * 256.f), 255));
1916 2129
1917void glInterleavedArrays (int format, int stride, char *data) 2130void glInterleavedArrays (int format, int stride, char *data)
1918 2131
1919void glDrawElements (int mode, int count, int type, char *indices) 2132void glDrawElements (int mode, int count, int type, char *indices)
1920 2133
… …
1997 2210
1998void glEndList () 2211void glEndList ()
1999 2212
2000void glCallList (int list) 2213void glCallList (int list)
2001 2214
2002

Diff Legend

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