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.145 by root, Fri Aug 18 03:19:58 2006 UTC vs.
Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
22#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
23#include <SDL_endian.h> 32#include <SDL_endian.h>
24#include <SDL_image.h> 33#include <SDL_image.h>
25#include <SDL_mixer.h> 34#include <SDL_mixer.h>
26#include <SDL_opengl.h> 35#include <SDL_opengl.h>
27 36
36# include <sys/types.h> 45# include <sys/types.h>
37# include <sys/socket.h> 46# include <sys/socket.h>
38# include <netinet/in.h> 47# include <netinet/in.h>
39# include <netinet/tcp.h> 48# include <netinet/tcp.h>
40# include <inttypes.h> 49# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 50#endif
49 51
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 53
52#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
53 55
54#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 63#else
62# define PARACHUTE 0 64# define PARACHUTE 0
63#endif 65#endif
64 66
67static AV *texture_av;
68
65static struct 69static struct
66{ 70{
67#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 72#include "glfunc.h"
69#undef GL_FUNC 73#undef GL_FUNC
70} gl; 74} gl;
71 75
76static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 78{
74 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 83 else
79 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
80} 85}
81 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
82#include "texcache.c" 111#include "texcache.c"
83 112
84#include "pango-font.c" 113#include "pango-font.c"
85#include "pango-fontmap.c" 114#include "pango-fontmap.c"
86#include "pango-render.c" 115#include "pango-render.c"
159 188
160 *w = rect.width; 189 *w = rect.width;
161 *h = rect.height; 190 *h = rect.height;
162} 191}
163 192
193typedef uint16_t tileid;
164typedef uint16_t mapface; 194typedef uint16_t faceid;
165 195
166typedef struct { 196typedef struct {
167 GLint name; 197 int name;
168 int w, h; 198 int w, h;
169 float s, t; 199 float s, t;
170 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
171} maptex; 203} maptex;
172 204
173typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
174 uint16_t darkness; 208 uint16_t darkness;
175 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
176 uint8_t stat_hp;
177} mapcell; 210} mapcell;
178 211
179typedef struct { 212typedef struct {
180 int32_t c0, c1; 213 int32_t c0, c1;
181 mapcell *col; 214 mapcell *col;
182} maprow; 215} maprow;
183 216
184typedef struct map { 217typedef struct map {
185 int x, y, w, h; 218 int x, y, w, h;
186 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
187 int faces; 220 int faces; tileid *face2tile; // [faceid]
188 mapface *face; 221 int texs; maptex *tex; // [tileid]
189
190 int texs;
191 maptex *tex;
192 222
193 int32_t rows; 223 int32_t rows;
194 maprow *row; 224 maprow *row;
195} *CFPlus__Map; 225} *CFPlus__Map;
196 226
216 return ptr; 246 return ptr;
217} 247}
218 248
219#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
221 271
222static maprow * 272static maprow *
223map_get_row (CFPlus__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
224{ 274{
225 if (0 > y) 275 if (0 > y)
294static void 344static void
295map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
296{ 346{
297 int x, y; 347 int x, y;
298 maprow *row; 348 maprow *row;
349 mapcell *cell;
299 350
300 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
301 if (y >= 0) 352 if (y >= 0)
302 { 353 {
303 if (y >= self->rows) 354 if (y >= self->rows)
309 if (x >= row->c0) 360 if (x >= row->c0)
310 { 361 {
311 if (x >= row->c1) 362 if (x >= row->c1)
312 break; 363 break;
313 364
314 row->col[x - row->c0].darkness = 0; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
315 } 371 }
316 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
317} 389}
318 390
319static void 391static void
320music_finished (void) 392music_finished (void)
321{ 393{
356 n |= n >> 8; 428 n |= n >> 8;
357 n |= n >> 16; 429 n |= n >> 16;
358 430
359 return n + 1; 431 return n + 1;
360} 432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
361 437
362MODULE = CFPlus PACKAGE = CFPlus 438MODULE = CFPlus PACKAGE = CFPlus
363 439
364PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
365 441
369 static const struct { 445 static const struct {
370 const char *name; 446 const char *name;
371 IV iv; 447 IV iv;
372 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
373# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
374 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
375 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
376 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
377 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
378 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
387 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
388 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
389 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
390 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
391 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
392 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
393 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
394 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
395 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
396 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
451 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
452 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
453 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
454 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
455 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
456 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
457 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
458 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
459 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
460 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
461 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
462 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
463 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
464 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
465 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
466 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
467 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
468 const_iv (KMOD_CTRL),
469 const_iv (KMOD_SHIFT),
470 const_iv (KMOD_ALT),
471 const_iv (KMOD_META)
472# undef const_iv 557# undef const_iv
473 }; 558 };
474 559
475 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
476 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
477} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
478 572
479int 573int
480in_destruct () 574in_destruct ()
481 CODE: 575 CODE:
482 RETVAL = PL_main_cv == Nullcv; 576 RETVAL = PL_main_cv == Nullcv;
494 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
495 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
496 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
497} 591}
498 592
593char *
594SDL_GetError ()
595
499int 596int
500SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
501 598
502void 599void
503SDL_Quit () 600SDL_Quit ()
504 601
505void 602void
506SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
507 PPCODE: 604 PPCODE:
508{ 605{
509 SDL_Rect **m; 606 SDL_Rect **m;
510 607
511 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
512 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
513 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
514 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
515 612
516 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
517 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
518 615
519 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
520 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
521 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
522 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
523 620
524 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
525#if SDL_VERSION_ATLEAST(1,2,10) 622#if SDL_VERSION_ATLEAST(1,2,10)
526 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
527 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
528#endif 625#endif
529 626
530 SDL_EnableUNICODE (1);
531 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
532
533 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
534 628
535 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
536 while (*m) 630 while (*m)
537 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
538 AV *av = newAV (); 634 AV *av = newAV ();
539 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
540 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
541 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
542 641
543 ++m; 642 ++m;
544 } 643 }
545} 644}
546 645
547char *
548SDL_GetError ()
549
550int 646int
551SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
552 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
553 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
554 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
555 ); 660 );
661
556 if (RETVAL) 662 if (RETVAL)
557 { 663 {
664 av_clear (texture_av);
665
558 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
559# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
560# include "glfunc.h" 668#include "glfunc.h"
561# undef GL_FUNC 669#undef GL_FUNC
562 } 670 }
671}
563 OUTPUT: 672 OUTPUT:
564 RETVAL 673 RETVAL
565 674
566void 675void
567SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
568 677
569char * 678char *
570SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
571 680
681int
682SDL_GetAppState ()
683
572void 684void
573SDL_PollEvent () 685poll_events ()
574 PPCODE: 686 PPCODE:
575{ 687{
576 SDL_Event ev; 688 SDL_Event ev;
577 689
578 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
579 { 692 {
580 HV *hv = newHV (); 693 HV *hv = newHV ();
581 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
582 695
583 switch (ev.type) 696 switch (ev.type)
585 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
586 case SDL_KEYUP: 699 case SDL_KEYUP:
587 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
588 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
589 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
590 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
591 break; 705 break;
592 706
593 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
594 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
595 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
596 break; 710 break;
597 711
598 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
600
601 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
602 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
603 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
604 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
605 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
606 break; 738 break;
607 739
608 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
609 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
610 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
639Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
640 772
641void 773void
642lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
643 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
644#ifndef _WIN32 782#ifdef _WIN32
645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 783 char buffer[2048];
784 DWORD buflen;
785
786 EXTEND (SP, 3);
787
788 buflen = sizeof (buffer);
789 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
790 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
791 {
792 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
793
794 buflen = sizeof (buffer);
795 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
796 {
797 PUSHs (newSVpv (buffer, 0));
798
799 buflen = sizeof (buffer);
800 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
801 PUSHs (newSVpv (buffer, 0));
802 }
803 }
646#endif 804#endif
805}
647 806
648void 807void
649add_font (char *file) 808add_font (char *file)
650 CODE: 809 CODE:
651 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
756#endif 915#endif
757 _exit (1); 916 _exit (1);
758 917
759void 918void
760_exit (int retval) 919_exit (int retval = 0)
761 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
762 _exit (retval); 924 _exit (retval);
925#endif
926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
763 935
764MODULE = CFPlus PACKAGE = CFPlus::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
765 937
766CFPlus::Font 938CFPlus::Font
767new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
1014xy_to_index (CFPlus::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
1015 CODE: 1187 CODE:
1016{ 1188{
1017 int index, trailing; 1189 int index, trailing;
1018 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1019 RETVAL = index; 1191 RETVAL = index + trailing;
1020} 1192}
1021 OUTPUT: 1193 OUTPUT:
1022 RETVAL 1194 RETVAL
1023 1195
1024void 1196void
1030 1202
1031 EXTEND (SP, 3); 1203 EXTEND (SP, 3);
1032 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1207}
1208
1209void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1211 PPCODE:
1212{
1213 int line, x;
1214
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217
1218 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221}
1222
1223void
1224line_x_to_index (CFPlus::Layout self, int line, int x)
1225 PPCODE:
1226{
1227 PangoLayoutLine *lp;
1228 int index, trailing;
1229
1230 if (line < 0)
1231 XSRETURN_EMPTY;
1232
1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */
1235
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237
1238 EXTEND (SP, 2);
1239 if (GIMME_V == G_SCALAR)
1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1241 else
1242 {
1243 PUSHs (sv_2mortal (newSViv (index)));
1244 PUSHs (sv_2mortal (newSViv (trailing)));
1245 }
1035} 1246}
1036 1247
1037void 1248void
1038render (CFPlus::Layout self, float x, float y, int flags = 0) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1039 PPCODE: 1250 PPCODE:
1044 flags 1255 flags
1045 ); 1256 );
1046 1257
1047MODULE = CFPlus PACKAGE = CFPlus::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1048 1259
1260int minpot (int n)
1261
1049void 1262void
1050pad2pot (SV *data_, SV *w_, SV *h_) 1263pad2pot (SV *data_, SV *w_, SV *h_)
1051 CODE: 1264 CODE:
1052{ 1265{
1053 int ow = SvIV (w_); 1266 int ow = SvIV (w_);
1130 glDisable (GL_ALPHA_TEST); 1343 glDisable (GL_ALPHA_TEST);
1131 glDisable (GL_BLEND); 1344 glDisable (GL_BLEND);
1132 } 1345 }
1133} 1346}
1134 1347
1348IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1349 CODE:
1350{
1351 GLint width;
1352 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1353 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1354 RETVAL = width > 0;
1355}
1356 OUTPUT:
1357 RETVAL
1358
1135MODULE = CFPlus PACKAGE = CFPlus::Map 1359MODULE = CFPlus PACKAGE = CFPlus::Map
1136 1360
1137CFPlus::Map 1361CFPlus::Map
1138new (SV *class, int map_width, int map_height) 1362new (SV *class)
1139 CODE: 1363 CODE:
1140 New (0, RETVAL, 1, struct map); 1364 New (0, RETVAL, 1, struct map);
1141 RETVAL->x = 0; 1365 RETVAL->x = 0;
1142 RETVAL->y = 0; 1366 RETVAL->y = 0;
1143 RETVAL->w = map_width; 1367 RETVAL->w = 0;
1144 RETVAL->h = map_height; 1368 RETVAL->h = 0;
1145 RETVAL->ox = 0; 1369 RETVAL->ox = 0;
1146 RETVAL->oy = 0; 1370 RETVAL->oy = 0;
1147 RETVAL->faces = 8192; 1371 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1148 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1372 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1149 RETVAL->texs = 8192;
1150 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1151 RETVAL->rows = 0; 1373 RETVAL->rows = 0;
1152 RETVAL->row = 0; 1374 RETVAL->row = 0;
1153 OUTPUT: 1375 OUTPUT:
1154 RETVAL 1376 RETVAL
1155 1377
1156void 1378void
1157DESTROY (CFPlus::Map self) 1379DESTROY (CFPlus::Map self)
1158 CODE: 1380 CODE:
1159{ 1381{
1160 map_clear (self); 1382 map_clear (self);
1161 Safefree (self->face); 1383 Safefree (self->face2tile);
1162 Safefree (self->tex); 1384 Safefree (self->tex);
1163 Safefree (self); 1385 Safefree (self);
1164} 1386}
1165 1387
1166void 1388void
1389resize (CFPlus::Map self, int map_width, int map_height)
1390 CODE:
1391 self->w = map_width;
1392 self->h = map_height;
1393
1394void
1167clear (CFPlus::Map self) 1395clear (CFPlus::Map self)
1168 CODE: 1396 CODE:
1169 map_clear (self); 1397 map_clear (self);
1170 1398
1171void 1399void
1172set_face (CFPlus::Map self, int face, int texid) 1400set_tileid (CFPlus::Map self, int face, int tile)
1173 CODE: 1401 CODE:
1174{ 1402{
1175 while (self->faces <= face) 1403 need_facenum (self, face); self->face2tile [face] = tile;
1176 { 1404 need_texid (self, tile);
1177 Append (mapface, self->face, self->faces, self->faces); 1405}
1178 self->faces *= 2;
1179 }
1180 1406
1181 self->face [face] = texid; 1407void
1408set_smooth (CFPlus::Map self, int face, int smooth, int level)
1409 CODE:
1410{
1411 tileid texid;
1412 maptex *tex;
1413
1414 if (face < 0 || face >= self->faces)
1415 return;
1416
1417 if (smooth < 0 || smooth >= self->faces)
1418 return;
1419
1420 texid = self->face2tile [face];
1421
1422 if (!texid)
1423 return;
1424
1425 tex = self->tex + texid;
1426 tex->smoothtile = self->face2tile [smooth];
1427 tex->smoothlevel = level;
1182} 1428}
1183 1429
1184void 1430void
1185set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1431set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1186 CODE: 1432 CODE:
1187{ 1433{
1188 while (self->texs <= texid) 1434 need_texid (self, texid);
1189 {
1190 Append (maptex, self->tex, self->texs, self->texs);
1191 self->texs *= 2;
1192 }
1193 1435
1194 { 1436 {
1195 maptex *tex = self->tex + texid; 1437 maptex *tex = self->tex + texid;
1196 1438
1197 tex->name = name; 1439 tex->name = name;
1239void 1481void
1240scroll (CFPlus::Map self, int dx, int dy) 1482scroll (CFPlus::Map self, int dx, int dy)
1241 CODE: 1483 CODE:
1242{ 1484{
1243 if (dx > 0) 1485 if (dx > 0)
1244 map_blank (self, self->x, self->y, dx - 1, self->h); 1486 map_blank (self, self->x, self->y, dx, self->h);
1245 else if (dx < 0) 1487 else if (dx < 0)
1246 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1488 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1247 1489
1248 if (dy > 0) 1490 if (dy > 0)
1249 map_blank (self, self->x, self->y, self->w, dy - 1); 1491 map_blank (self, self->x, self->y, self->w, dy);
1250 else if (dy < 0) 1492 else if (dy < 0)
1251 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1493 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1252 1494
1253 self->ox += dx; self->x += dx; 1495 self->ox += dx; self->x += dx;
1254 self->oy += dy; self->y += dy; 1496 self->oy += dy; self->y += dy;
1255 1497
1256 while (self->y < 0) 1498 while (self->y < 0)
1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1511 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1270 uint8_t *data_end = (uint8_t *)SvEND (data_); 1512 uint8_t *data_end = (uint8_t *)SvEND (data_);
1271 mapcell *cell; 1513 mapcell *cell;
1272 int x, y, flags; 1514 int x, y, flags;
1273 1515
1274 while (data < data_end) 1516 while (data < data_end - 1)
1275 { 1517 {
1276 flags = (data [0] << 8) + data [1]; data += 2; 1518 flags = (data [0] << 8) + data [1]; data += 2;
1277 1519
1278 x = self->x + ((flags >> 10) & 63); 1520 x = self->x + ((flags >> 10) & 63);
1279 y = self->y + ((flags >> 4) & 63); 1521 y = self->y + ((flags >> 4) & 63);
1282 1524
1283 if (flags & 15) 1525 if (flags & 15)
1284 { 1526 {
1285 if (!cell->darkness) 1527 if (!cell->darkness)
1286 { 1528 {
1529 memset (cell, 0, sizeof (*cell));
1287 cell->darkness = 256; 1530 cell->darkness = 256;
1288 cell->face [0] = 0;
1289 cell->face [1] = 0;
1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1292 } 1531 }
1293 1532
1294 //TODO: don't trust server data to be in-range(!) 1533 //TODO: don't trust server data to be in-range(!)
1295 1534
1296 if (flags & 8) 1535 if (flags & 8)
1302 do 1541 do
1303 { 1542 {
1304 ext = *data++; 1543 ext = *data++;
1305 cmd = ext & 0x3f; 1544 cmd = ext & 0x3f;
1306 1545
1307 if (ext < 4) 1546 if (cmd < 4)
1308 cell->darkness = 255 - ext * 64 + 1; 1547 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health 1548 else if (cmd == 5) // health
1549 {
1550 cell->stat_width = 1;
1310 cell->stat_hp = *data++; 1551 cell->stat_hp = *data++;
1552 }
1553 else if (cmd == 6) // monster width
1554 cell->stat_width = *data++ + 1;
1555 else if (cmd == 0x47)
1556 {
1557 if (*data == 4)
1558 ; // decode player count
1559
1560 data += *data + 1;
1561 }
1562 else if (cmd == 8) // cell flags
1563 cell->flags = *data++;
1311 else if (ext & 0x40) // unknown, multibyte => skip 1564 else if (ext & 0x40) // unknown, multibyte => skip
1312 data += *data + 1; 1565 data += *data + 1;
1566 else
1567 data++;
1313 } 1568 }
1314 while (cmd & 0x80); 1569 while (ext & 0x80);
1315 } 1570 }
1316 else 1571 else
1317 cell->darkness = *data++ + 1; 1572 cell->darkness = *data++ + 1;
1318 } 1573 }
1319 1574
1320 if (flags & 4) 1575 if (flags & 4)
1321 { 1576 {
1322 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1577 faceid face = (data [0] << 8) + data [1]; data += 2;
1578 need_facenum (self, face);
1579 cell->tile [0] = self->face2tile [face];
1323 } 1580 }
1324 1581
1325 if (flags & 2) 1582 if (flags & 2)
1326 { 1583 {
1327 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1584 faceid face = (data [0] << 8) + data [1]; data += 2;
1585 need_facenum (self, face);
1586 cell->tile [1] = self->face2tile [face];
1328 } 1587 }
1329 1588
1330 if (flags & 1) 1589 if (flags & 1)
1331 { 1590 {
1332 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1591 faceid face = (data [0] << 8) + data [1]; data += 2;
1592 need_facenum (self, face);
1593 cell->tile [2] = self->face2tile [face];
1333 } 1594 }
1334 } 1595 }
1335 else 1596 else
1336 cell->darkness = 0; 1597 cell->darkness = 0;
1337 } 1598 }
1367 { 1628 {
1368 mapcell *cell = row->col + (x - row->c0); 1629 mapcell *cell = row->col + (x - row->c0);
1369 1630
1370 for (z = 0; z <= 0; z++) 1631 for (z = 0; z <= 0; z++)
1371 { 1632 {
1372 mapface face = cell->face [z];
1373
1374 if (face)
1375 {
1376 maptex tex = self->tex [face]; 1633 maptex tex = self->tex [cell->tile [z]];
1377 int a0 = 255 - tex.a; 1634 int a0 = 255 - tex.a;
1378 int a1 = tex.a; 1635 int a1 = tex.a;
1379 1636
1380 r = (r * a0 + tex.r * a1) / 255; 1637 r = (r * a0 + tex.r * a1) / 255;
1381 g = (g * a0 + tex.g * a1) / 255; 1638 g = (g * a0 + tex.g * a1) / 255;
1382 b = (b * a0 + tex.b * a1) / 255; 1639 b = (b * a0 + tex.b * a1) / 255;
1383 a = (a * a0 + tex.a * a1) / 255; 1640 a = (a * a0 + tex.a * a1) / 255;
1384 }
1385 } 1641 }
1386 } 1642 }
1387 1643
1388 *map++ = (r ) 1644 *map++ = (r )
1389 | (g << 8) 1645 | (g << 8)
1396} 1652}
1397 OUTPUT: 1653 OUTPUT:
1398 RETVAL 1654 RETVAL
1399 1655
1400void 1656void
1401draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1657draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1402 CODE: 1658 CODE:
1403{ 1659{
1404 int vx, vy; 1660 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1661 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1662 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1663 smooth_key skey;
1405 int x, y, z; 1664 int x, y, z;
1406 int last_name; 1665 int last_name;
1407 mapface face;
1408 1666
1409 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1667 // thats current max. sorry.
1410 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1668 if (sw > 255) sw = 255;
1669 if (sh > 255) sh = 255;
1411 1670
1412 /* 1671 // clear key, in case of extra padding
1413 int vx = self->vx = self->w >= sw 1672 memset (&skey, 0, sizeof (skey));
1414 ? self->x + (self->w - sw) / 2
1415 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1416
1417 int vy = self->vy = self->h >= sh
1418 ? self->y + (self->h - sh) / 2
1419 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1420 */
1421 1673
1422 glColor4ub (255, 255, 255, 255); 1674 glColor4ub (255, 255, 255, 255);
1423 1675
1424 glEnable (GL_BLEND); 1676 glEnable (GL_BLEND);
1425 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1677 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1428 1680
1429 glBegin (GL_QUADS); 1681 glBegin (GL_QUADS);
1430 1682
1431 last_name = 0; 1683 last_name = 0;
1432 1684
1685 mx += self->x;
1686 my += self->y;
1687
1688 // first pass: determine smooth_max
1689 // rather ugly, if you ask me
1690 // could also be stored inside mapcell and updated on change
1691 memset (smooth_max, 0, sizeof (smooth_max));
1692
1693 for (y = 0; y < sh; y++)
1694 if (0 <= y + my && y + my < self->rows)
1695 {
1696 maprow *row = self->row + (y + my);
1697
1698 for (x = 0; x < sw; x++)
1699 if (row->c0 <= x + mx && x + mx < row->c1)
1700 {
1701 mapcell *cell = row->col + (x + mx - row->c0);
1702
1703 smooth_max[x + 1][y + 1] =
1704 MAX (self->tex [cell->tile [0]].smoothlevel,
1705 MAX (self->tex [cell->tile [1]].smoothlevel,
1706 self->tex [cell->tile [2]].smoothlevel));
1707 }
1708 }
1709
1433 for (z = 0; z < 3; z++) 1710 for (z = 0; z <= 2; z++)
1711 {
1712 memset (smooth_level, 0, sizeof (smooth_level));
1713
1434 for (y = 0; y < sh; y++) 1714 for (y = 0; y < sh; y++)
1435 if (0 <= y + vy && y + vy < self->rows) 1715 if (0 <= y + my && y + my < self->rows)
1436 { 1716 {
1437 maprow *row = self->row + (y + vy); 1717 maprow *row = self->row + (y + my);
1438 1718
1439 for (x = 0; x < sw; x++) 1719 for (x = 0; x < sw; x++)
1440 if (row->c0 <= x + vx && x + vx < row->c1) 1720 if (row->c0 <= x + mx && x + mx < row->c1)
1441 { 1721 {
1442 mapcell *cell = row->col + (x + vx - row->c0); 1722 mapcell *cell = row->col + (x + mx - row->c0);
1443
1444 face = cell->face [z]; 1723 tileid tile = cell->tile [z];
1724
1725 if (tile)
1726 {
1727 maptex tex = self->tex [tile];
1728 int px = (x + 1) * T - tex.w;
1729 int py = (y + 1) * T - tex.h;
1445 1730
1446 if (face && face < self->texs) 1731 // suppressing texture state switches here
1732 // is only moderately effective, but worth the extra effort
1733 if (last_name != tex.name)
1734 {
1735 if (!tex.name)
1736 tex = self->tex [2]; /* missing, replace by noface */
1737
1738 glEnd ();
1739 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1740 glBegin (GL_QUADS);
1741 }
1742
1743 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1744 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1745 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1746 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1747
1748 if (cell->flags && z == 2)
1749 {
1750 if (cell->flags & 1)
1751 {
1752 maptex tex = self->tex [1];
1753 int px = x * T + T * 2 / 32;
1754 int py = y * T - T * 6 / 32;
1755
1756 glEnd ();
1757 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1758 glBegin (GL_QUADS);
1759
1760 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1761 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1762 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1763 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1764 }
1765 }
1766
1767 // update smooth hash
1768 if (tex.smoothtile)
1769 {
1770 skey.tile = tex.smoothtile;
1771 skey.level = tex.smoothlevel;
1772
1773 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1774
1775 // add bits to current tile and all neighbours. skey.x|y is
1776 // shifted +1|+1 so we always stay positive.
1777
1778 // bits is ___n cccc CCCC bbbb
1779 // n do not draw borders&corners
1780 // c draw these corners, but...
1781 // C ... not these
1782 // b draw these borders
1783
1784 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1785 // ┃· ·· ·┃ ━━
1786
1787 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1788 // ·· ·· ·┏ ┓·
1789
1790 // full tile
1791 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1792
1793 // borders
1794 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1795 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1796 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1797 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1798
1799 // corners
1800 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1801 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1802 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1803 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1804 }
1805 }
1806 }
1807 }
1808
1809 // go through all smoothlevels, lowest to highest, then draw.
1810 // this is basically counting sort
1811 {
1812 int w, b;
1813
1814 for (w = 0; w < 256 / 32; ++w)
1815 {
1816 uint32_t smask = smooth_level [w];
1817 if (smask)
1818 for (b = 0; b < 32; ++b)
1819 if (smask & (((uint32_t)1) << b))
1447 { 1820 {
1448 maptex tex = self->tex [face]; 1821 int level = (w << 5) | b;
1822 HE *he;
1449 1823
1450 int px = (x + 1) * 32 - tex.w; 1824 hv_iterinit (smooth);
1451 int py = (y + 1) * 32 - tex.h; 1825 while ((he = hv_iternext (smooth)))
1452
1453 if (last_name != tex.name)
1454 { 1826 {
1827 smooth_key *skey = (smooth_key *)HeKEY (he);
1828 IV bits = SvIVX (HeVAL (he));
1829
1830 if (!(bits & 0x1000)
1831 && skey->level == level
1832 && level > smooth_max [skey->x][skey->y])
1833 {
1834 maptex tex = self->tex [skey->tile];
1835 int px = (((int)skey->x) - 1) * T;
1836 int py = (((int)skey->y) - 1) * T;
1837 int border = bits & 15;
1838 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1839 float dx = tex.s * .0625f; // 16 images/row
1840 float dy = tex.t * .5f ; // 2 images/column
1841
1842 // this time naively avoiding texture state changes
1843 // save gobs of state changes.
1844 if (last_name != tex.name)
1845 {
1846 if (!tex.name)
1847 continue; // smoothing not yet available
1848
1455 glEnd (); 1849 glEnd ();
1456 last_name = tex.name;
1457 glBindTexture (GL_TEXTURE_2D, last_name); 1850 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1458 glBegin (GL_QUADS); 1851 glBegin (GL_QUADS);
1852 }
1853
1854 if (border)
1855 {
1856 float ox = border * dx;
1857
1858 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1859 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1860 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1861 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1862 }
1863
1864 if (corner)
1865 {
1866 float ox = corner * dx;
1867
1868 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1869 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1870 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1871 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1872 }
1873 }
1459 } 1874 }
1460
1461 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1462 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1463 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1464 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1465 } 1875 }
1466 }
1467 } 1876 }
1877 }
1878
1879 hv_clear (smooth);
1880 }
1468 1881
1469 glEnd (); 1882 glEnd ();
1470 1883
1471 glDisable (GL_TEXTURE_2D); 1884 glDisable (GL_TEXTURE_2D);
1472 glDisable (GL_BLEND); 1885 glDisable (GL_BLEND);
1473 1886
1474 // top layer: overlays such as the health bar 1887 // top layer: overlays such as the health bar
1475 for (y = 0; y < sh; y++) 1888 for (y = 0; y < sh; y++)
1476 if (0 <= y + vy && y + vy < self->rows) 1889 if (0 <= y + my && y + my < self->rows)
1477 { 1890 {
1478 maprow *row = self->row + (y + vy); 1891 maprow *row = self->row + (y + my);
1479 1892
1480 for (x = 0; x < sw; x++) 1893 for (x = 0; x < sw; x++)
1481 if (row->c0 <= x + vx && x + vx < row->c1) 1894 if (row->c0 <= x + mx && x + mx < row->c1)
1482 { 1895 {
1483 mapcell *cell = row->col + (x + vx - row->c0); 1896 mapcell *cell = row->col + (x + mx - row->c0);
1484 1897
1485 int px = x * 32; 1898 int px = x * T;
1486 int py = y * 32; 1899 int py = y * T;
1487 1900
1488 if (cell->stat_hp) 1901 if (cell->stat_hp)
1489 { 1902 {
1490 int width = sh / 28 + 1; 1903 int width = cell->stat_width * T;
1904 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1491 1905
1492 glColor3ub (0, 0, 0); 1906 glColor3ub (0, 0, 0);
1493 glRectf (px + 1, py, px + 31, py + width + 2); 1907 glRectf (px + 1, py - thick - 2,
1908 px + width - 1, py);
1494 1909
1495 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); 1910 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1496 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1); 1911 glRectf (px + 2,
1912 py - thick - 1,
1913 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1497 } 1914 }
1498 } 1915 }
1499 } 1916 }
1500} 1917}
1501 1918
1558 glDisable (GL_BLEND); 1975 glDisable (GL_BLEND);
1559 glDisable (GL_TEXTURE_2D); 1976 glDisable (GL_TEXTURE_2D);
1560} 1977}
1561 1978
1562void 1979void
1563fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1564 PPCODE: 1981 PPCODE:
1565{ 1982{
1566 int vx, vy;
1567 int x, y; 1983 int x, y;
1568 int sw4 = (sw + 3) & ~3; 1984 int sw4 = (sw + 3) & ~3;
1569 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1570 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1986 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1571 1987
1572 memset (darkness, 255, sw4 * sh); 1988 memset (darkness, 255, sw4 * sh);
1573 SvPOK_only (darkness_sv); 1989 SvPOK_only (darkness_sv);
1574 SvCUR_set (darkness_sv, sw4 * sh); 1990 SvCUR_set (darkness_sv, sw4 * sh);
1575 1991
1576 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1992 mx += self->x;
1577 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1993 my += self->y;
1578 1994
1579 for (y = 0; y < sh; y++) 1995 for (y = 0; y < sh; y++)
1580 if (0 <= y + vy && y + vy < self->rows) 1996 if (0 <= y + my && y + my < self->rows)
1581 { 1997 {
1582 maprow *row = self->row + (y + vy); 1998 maprow *row = self->row + (y + my);
1583 1999
1584 for (x = 0; x < sw; x++) 2000 for (x = 0; x < sw; x++)
1585 if (row->c0 <= x + vx && x + vx < row->c1) 2001 if (row->c0 <= x + mx && x + mx < row->c1)
1586 { 2002 {
1587 mapcell *cell = row->col + (x + vx - row->c0); 2003 mapcell *cell = row->col + (x + mx - row->c0);
1588 2004
1589 darkness[y * sw4 + x] = cell->darkness 2005 darkness[y * sw4 + x] = cell->darkness
1590 ? 255 - (cell->darkness - 1) 2006 ? 255 - (cell->darkness - 1)
1591 : 255 - FOW_DARKNESS; 2007 : 255 - FOW_DARKNESS;
1592 } 2008 }
1593 } 2009 }
2010
2011 if (smoothing)
2012 {
2013 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2014 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2015
2016 SvPOK_only (darkness2_sv);
2017 SvCUR_set (darkness2_sv, sw4 * sh);
2018
2019 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x)
2021 {
2022 float *f = (float *)matrix;
2023 int dx, dy;
2024 float sum = 0.f;
2025
2026 for (dy = -1; dy <= 1; ++dy)
2027 for (dx = -1; dx <= 1; ++dx)
2028 {
2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
2031
2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2033 }
2034
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2036 }
2037
2038 darkness_sv = darkness2_sv;
2039 }
1594 2040
1595 EXTEND (SP, 3); 2041 EXTEND (SP, 3);
1596 PUSHs (sv_2mortal (newSViv (sw4))); 2042 PUSHs (sv_2mortal (newSViv (sw4)));
1597 PUSHs (sv_2mortal (newSViv (sh))); 2043 PUSHs (sv_2mortal (newSViv (sh)));
1598 PUSHs (darkness_sv); 2044 PUSHs (darkness_sv);
1632 if (row && row->c0 <= x && x < row->c1) 2078 if (row && row->c0 <= x && x < row->c1)
1633 { 2079 {
1634 mapcell *cell = row->col + (x - row->c0); 2080 mapcell *cell = row->col + (x - row->c0);
1635 uint8_t flags = 0; 2081 uint8_t flags = 0;
1636 2082
1637 if (cell->face [0]) flags |= 1; 2083 if (cell->tile [0]) flags |= 1;
1638 if (cell->face [1]) flags |= 2; 2084 if (cell->tile [1]) flags |= 2;
1639 if (cell->face [2]) flags |= 4; 2085 if (cell->tile [2]) flags |= 4;
1640 2086
1641 *data++ = flags; 2087 *data++ = flags;
1642 2088
1643 if (flags & 1) 2089 if (flags & 1)
1644 { 2090 {
2091 tileid tile = cell->tile [0];
1645 *data++ = cell->face [0] >> 8; 2092 *data++ = tile >> 8;
1646 *data++ = cell->face [0]; 2093 *data++ = tile;
1647 } 2094 }
1648 2095
1649 if (flags & 2) 2096 if (flags & 2)
1650 { 2097 {
2098 tileid tile = cell->tile [1];
1651 *data++ = cell->face [1] >> 8; 2099 *data++ = tile >> 8;
1652 *data++ = cell->face [1]; 2100 *data++ = tile;
1653 } 2101 }
1654 2102
1655 if (flags & 4) 2103 if (flags & 4)
1656 { 2104 {
2105 tileid tile = cell->tile [2];
1657 *data++ = cell->face [2] >> 8; 2106 *data++ = tile >> 8;
1658 *data++ = cell->face [2]; 2107 *data++ = tile;
1659 } 2108 }
1660 } 2109 }
1661 else 2110 else
1662 *data++ = 0; 2111 *data++ = 0;
1663 } 2112 }
1703 { 2152 {
1704 uint8_t flags = *data++; 2153 uint8_t flags = *data++;
1705 2154
1706 if (flags) 2155 if (flags)
1707 { 2156 {
1708 mapface face[3] = { 0, 0, 0 };
1709
1710 mapcell *cell = row_get_cell (row, x); 2157 mapcell *cell = row_get_cell (row, x);
2158 tileid tile[3] = { 0, 0, 0 };
1711 2159
1712 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2160 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1713 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2161 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1714 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2162 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1715 2163
1716 if (cell->darkness == 0) 2164 if (cell->darkness == 0)
1717 { 2165 {
1718 cell->darkness = 0; 2166 cell->darkness = 0;
1719 2167
1720 for (z = 0; z <= 2; z++) 2168 for (z = 0; z <= 2; z++)
1721 { 2169 {
1722 cell->face[z] = face[z]; 2170 tileid t = tile [z];
1723 2171
1724 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2172 if (t >= self->texs || (t && !self->tex [t].name))
2173 {
1725 XPUSHs (sv_2mortal (newSViv (face[z]))); 2174 XPUSHs (sv_2mortal (newSViv (t)));
2175 need_texid (self, t);
2176 }
2177
2178 cell->tile [z] = t;
1726 } 2179 }
1727 } 2180 }
1728 } 2181 }
1729 } 2182 }
1730 } 2183 }
1765 CODE: 2218 CODE:
1766 RETVAL = Mix_VolumeMusic (volume); 2219 RETVAL = Mix_VolumeMusic (volume);
1767 OUTPUT: 2220 OUTPUT:
1768 RETVAL 2221 RETVAL
1769 2222
2223int
2224fade_out (int ms)
2225 CODE:
2226 RETVAL = Mix_FadeOutMusic (ms);
2227 OUTPUT:
2228 RETVAL
2229
1770CFPlus::MixMusic 2230CFPlus::MixMusic
1771new_from_file (SV *class, char *path) 2231new_from_file (SV *class, char *path)
1772 CODE: 2232 CODE:
1773 RETVAL = Mix_LoadMUS (path); 2233 RETVAL = Mix_LoadMUS (path);
1774 OUTPUT: 2234 OUTPUT:
1781 2241
1782int 2242int
1783play (CFPlus::MixMusic self, int loops = -1) 2243play (CFPlus::MixMusic self, int loops = -1)
1784 CODE: 2244 CODE:
1785 RETVAL = Mix_PlayMusic (self, loops); 2245 RETVAL = Mix_PlayMusic (self, loops);
2246 OUTPUT:
2247 RETVAL
2248
2249int
2250fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2251 CODE:
2252 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1786 OUTPUT: 2253 OUTPUT:
1787 RETVAL 2254 RETVAL
1788 2255
1789MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1790 2257
1794 static const struct { 2261 static const struct {
1795 const char *name; 2262 const char *name;
1796 IV iv; 2263 IV iv;
1797 } *civ, const_iv[] = { 2264 } *civ, const_iv[] = {
1798# define const_iv(name) { # name, (IV)name } 2265# define const_iv(name) { # name, (IV)name }
2266 const_iv (GL_VENDOR),
2267 const_iv (GL_VERSION),
2268 const_iv (GL_EXTENSIONS),
1799 const_iv (GL_COLOR_MATERIAL), 2269 const_iv (GL_COLOR_MATERIAL),
1800 const_iv (GL_SMOOTH), 2270 const_iv (GL_SMOOTH),
1801 const_iv (GL_FLAT), 2271 const_iv (GL_FLAT),
1802 const_iv (GL_DITHER), 2272 const_iv (GL_DITHER),
1803 const_iv (GL_BLEND), 2273 const_iv (GL_BLEND),
1830 const_iv (GL_LUMINANCE), 2300 const_iv (GL_LUMINANCE),
1831 const_iv (GL_LUMINANCE_ALPHA), 2301 const_iv (GL_LUMINANCE_ALPHA),
1832 const_iv (GL_FLOAT), 2302 const_iv (GL_FLOAT),
1833 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2303 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1834 const_iv (GL_COMPILE), 2304 const_iv (GL_COMPILE),
2305 const_iv (GL_PROXY_TEXTURE_1D),
2306 const_iv (GL_PROXY_TEXTURE_2D),
1835 const_iv (GL_TEXTURE_1D), 2307 const_iv (GL_TEXTURE_1D),
1836 const_iv (GL_TEXTURE_2D), 2308 const_iv (GL_TEXTURE_2D),
1837 const_iv (GL_TEXTURE_ENV), 2309 const_iv (GL_TEXTURE_ENV),
1838 const_iv (GL_TEXTURE_MAG_FILTER), 2310 const_iv (GL_TEXTURE_MAG_FILTER),
1839 const_iv (GL_TEXTURE_MIN_FILTER), 2311 const_iv (GL_TEXTURE_MIN_FILTER),
1879# undef const_iv 2351# undef const_iv
1880 }; 2352 };
1881 2353
1882 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2354 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1883 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2355 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2356
2357 texture_av = newAV ();
2358 AvREAL_off (texture_av);
1884} 2359}
1885 2360
1886char * 2361char *
1887gl_vendor () 2362gl_vendor ()
1888 CODE: 2363 CODE:
1899 2374
1900char * 2375char *
1901gl_extensions () 2376gl_extensions ()
1902 CODE: 2377 CODE:
1903 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2378 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2379 OUTPUT:
2380 RETVAL
2381
2382const char *glGetString (GLenum pname)
2383
2384GLint glGetInteger (GLenum pname)
2385 CODE:
2386 glGetIntegerv (pname, &RETVAL);
2387 OUTPUT:
2388 RETVAL
2389
2390GLdouble glGetDouble (GLenum pname)
2391 CODE:
2392 glGetDoublev (pname, &RETVAL);
1904 OUTPUT: 2393 OUTPUT:
1905 RETVAL 2394 RETVAL
1906 2395
1907int glGetError () 2396int glGetError ()
1908 2397
2033 2522
2034void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2523void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2035 2524
2036void glDrawPixels (int width, int height, int format, int type, char *pixels) 2525void glDrawPixels (int width, int height, int format, int type, char *pixels)
2037 2526
2527void glPixelZoom (float x, float y)
2528
2038void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2529void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2039 2530
2040int glGenTexture () 2531int glGenTexture ()
2041 CODE: 2532 CODE:
2042{ 2533 RETVAL = gen_texture ();
2043 GLuint name;
2044 glGenTextures (1, &name);
2045 RETVAL = name;
2046}
2047 OUTPUT: 2534 OUTPUT:
2048 RETVAL 2535 RETVAL
2049 2536
2050void glDeleteTexture (int name) 2537void glDeleteTexture (int name)
2051 CODE: 2538 CODE:
2052{
2053 GLuint name_ = name;
2054 glDeleteTextures (1, &name_); 2539 del_texture (name);
2055} 2540
2056
2057int glGenList () 2541int glGenList ()
2058 CODE: 2542 CODE:
2059 RETVAL = glGenLists (1); 2543 RETVAL = glGenLists (1);
2060 OUTPUT: 2544 OUTPUT:
2061 RETVAL 2545 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines