[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.318 by root, Wed Dec 24 06:12:21 2014 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC

 {
   GSList *attrs = run->item->analysis.extra_attrs;
   while (attrs)
     {
-      PangoAttribute *attr = attrs->data;
+      PangoAttribute *attr = (PangoAttribute *)attrs->data;
       if (attr->klass->type == PANGO_ATTR_SHAPE)
         return 1;
       attrs = attrs->next;
 static void
 substitute_func (FcPattern *pattern, gpointer data)
 {
   FcPatternAddBool (pattern, FC_HINTING, 1);
 #ifdef FC_HINT_STYLE
-  FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
+  FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
 #endif
   FcPatternAddBool (pattern, FC_AUTOHINT, 0);
 }
 static void
   ev.data2 = 0;
   SDL_PushEvent ((SDL_Event *)&ev);
 }
+// approximately divide by 255
 static unsigned int
 div255 (unsigned int n)
 {
   return (n + (n >> 8)) >> 8;
 }
 void SDL_QuitSubSystem (U32 flags)
 void SDL_Quit ()
 int SDL_GL_SetAttribute (int attr, int value)
+	C_ARGS: (SDL_GLattr)attr, value
 int SDL_GL_GetAttribute (int attr)
 	CODE:
-        if (SDL_GL_GetAttribute (attr, &RETVAL))
+        if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
           XSRETURN_UNDEF;
         OUTPUT:
         RETVAL
 void
 void
 SDL_GL_SwapBuffers ()
 char *
 SDL_GetKeyName (int sym)
+	C_ARGS: (SDLKey)sym
 int
 SDL_GetAppState ()
 int
 	OUTPUT:
         RETVAL
 int
 Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
-  	POSTCALL:
+	POSTCALL:
         Mix_HookMusicFinished (music_finished);
         Mix_ChannelFinished (channel_finished);
 void
 Mix_QuerySpec ()
         SDL_LockSurface (surface2);
         EXTEND (SP, 6);
         PUSHs (sv_2mortal (newSViv (surface2->w)));
         PUSHs (sv_2mortal (newSViv (surface2->h)));
-        PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
+        PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
         PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
         PUSHs (sv_2mortal (newSViv (GL_RGBA)));
         PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
         SDL_UnlockSurface (surface2);
 MODULE = Deliantra::Client	PACKAGE = DC::Font
 PROTOTYPES: DISABLE
 DC::Font
-new_from_file (SV *class, char *path, int id = 0)
+new_from_file (SV *klass, char *path, int id = 0)
 	CODE:
 {
         int count;
         FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
         RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
 	PROTOTYPE:
 	CODE:
         tc_restore ();
 DC::Layout
-new (SV *class)
+new (SV *klass)
 	CODE:
         New (0, RETVAL, 1, struct cf_layout);
         RETVAL->pl          = pango_layout_new (opengl_context);
         RETVAL->r           = 1.;
 MODULE = Deliantra::Client	PACKAGE = DC::Map
 PROTOTYPES: DISABLE
 DC::Map
-new (SV *class)
+new (SV *klass)
 	CODE:
         New (0, RETVAL, 1, struct map);
         RETVAL->x  = 0;
         RETVAL->y  = 0;
         RETVAL->w  = 0;
 void
 set_smooth (DC::Map self, int face, int smooth, int level)
 	CODE:
 {
-  	tileid texid;
+	tileid texid;
         maptex *tex;
         if (face < 0 || face >= self->faces)
           return;
         if (smooth < 0 || smooth >= self->faces)
           return;
-  	texid = self->face2tile [face];
+	texid = self->face2tile [face];
         if (!texid)
           return;
         tex = self->tex + texid;
 }
 void
 expire_textures (DC::Map self, int texid, int count)
 	PPCODE:
-  	for (; texid < self->texs && count; ++texid, --count)
+	for (; texid < self->texs && count; ++texid, --count)
           {
             maptex *tex = self->tex + texid;
             if (tex->name)
               {
                        | (b << 16)
                        | (a << 24);
               }
           }
-      	RETVAL = map_sv;
+	RETVAL = map_sv;
 }
 	OUTPUT:
         RETVAL
 void
 draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
 	CODE:
 {
         int x, y, z;
-  	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
+	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
         uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
         static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
         smooth_key skey;
         int pl_x, pl_y;
         maptex pl_tex;
                 else
                   *data++ = 0;
               }
           }
         /* if size is w*h + 5 then no data has been found */
         if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
           {
             SvPOK_only (data_sv);
             SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
           }
- 	RETVAL = data_sv;
+	RETVAL = data_sv;
 }
 	OUTPUT:
         RETVAL
 void
         STRLEN len;
         uint8_t *data, *end;
         len = SvLEN (data_sv);
         SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
-        data = SvPVbyte_nolen (data_sv);
+        data = (uint8_t *)SvPVbyte_nolen (data_sv);
         end = data + len + 8;
         if (len < 5)
           XSRETURN_EMPTY;
 }
 MODULE = Deliantra::Client	PACKAGE = DC::RW
 DC::RW
-new (SV *class, SV *data_sv)
+new (SV *klass, SV *data_sv)
 	CODE:
 {
         STRLEN datalen;
         char *data = SvPVbyte (data_sv, datalen);
 }
 	OUTPUT:
         RETVAL
 DC::RW
-new_from_file (SV *class, const char *path, const char *mode = "rb")
+new_from_file (SV *klass, const char *path, const char *mode = "rb")
 	CODE:
         RETVAL = SDL_RWFromFile (path, mode);
 	OUTPUT:
         RETVAL
 #else
         XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
 #endif
 DC::MixChunk
-new (SV *class, DC::RW rwops)
+new (SV *klass, DC::RW rwops)
 	CODE:
         RETVAL = Mix_LoadWAV_RW (rwops, 1);
 	OUTPUT:
         RETVAL
         RETVAL = Mix_PlayingMusic ();
 	OUTPUT:
         RETVAL
 DC::MixMusic
-new (SV *class, DC::RW rwops)
+new (SV *klass, DC::RW rwops)
 	CODE:
         RETVAL = Mix_LoadMUS_RW (rwops);
 	OUTPUT:
         RETVAL
         gl.BlendFuncSeparateEXT = 0;
 void
 apple_nvidia_bug (int enable)
-char *
+const char *
 gl_vendor ()
 	CODE:
-        RETVAL = (char *)glGetString (GL_VENDOR);
+        RETVAL = (const char *)glGetString (GL_VENDOR);
 	OUTPUT:
         RETVAL
-char *
+const char *
 gl_version ()
 	CODE:
-        RETVAL = (char *)glGetString (GL_VERSION);
+        RETVAL = (const char *)glGetString (GL_VERSION);
 	OUTPUT:
         RETVAL
-char *
+const char *
 gl_extensions ()
 	CODE:
-        RETVAL = (char *)glGetString (GL_EXTENSIONS);
+        RETVAL = (const char *)glGetString (GL_EXTENSIONS);
 	OUTPUT:
         RETVAL
 const char *glGetString (GLenum pname)
+	CODE:
+        RETVAL = (const char *)glGetString (pname);
+	OUTPUT:
+        RETVAL
 GLint glGetInteger (GLenum pname)
 	CODE:
         glGetIntegerv (pname, &RETVAL);
 	OUTPUT:
 void
 find_widget (SV *self, NV x, NV y)
 	PPCODE:
 {
-  	if (within_widget (self, x, y))
+	if (within_widget (self, x, y))
           XPUSHs (self);
 }
 BOOT:
 {
 void
 draw (SV *self)
 	CODE:
 {
-  	HV *hv;
+	HV *hv;
-  	SV **svp;
+	SV **svp;
 	NV x, y, w, h;
         SV *draw_x_sv = GvSV (draw_x_gv);
         SV *draw_y_sv = GvSV (draw_y_gv);
         SV *draw_w_sv = GvSV (draw_w_gv);
         SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.318 by root, Wed Dec 24 06:12:21 2014 UTC vs. Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.318 by root, Wed Dec 24 06:12:21 2014 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC