[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2683 - in branches/pingus_sdl: data/images/core/buttons sr
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r2683 - in branches/pingus_sdl: data/images/core/buttons src |
Date: |
Wed, 17 Jan 2007 22:37:43 +0100 |
Author: grumbel
Date: 2007-01-17 22:37:42 +0100 (Wed, 17 Jan 2007)
New Revision: 2683
Modified:
branches/pingus_sdl/data/images/core/buttons/pause.png
branches/pingus_sdl/src/ground_map.cxx
branches/pingus_sdl/src/pixel_buffer.cpp
branches/pingus_sdl/src/sprite.cpp
Log:
- fixed transparency in the groundmap
- more grayscale -> rgb conversion
Modified: branches/pingus_sdl/data/images/core/buttons/pause.png
===================================================================
--- branches/pingus_sdl/data/images/core/buttons/pause.png 2007-01-17
20:55:52 UTC (rev 2682)
+++ branches/pingus_sdl/data/images/core/buttons/pause.png 2007-01-17
21:37:42 UTC (rev 2683)
@@ -1,3 +1,10 @@
�PNG
-
\ No newline at end of file
+
+����
+����t�m�0(
+d�ٸ���eY$ �z�-if��~�iɶm&� �u۶���T�Uj���`�6�^�0�f���=�m��*
+�z�7�|S���+�3�<#� ��ns�����PE
+!p˲h�Z��J"���}��<�����Q���5��<�T�Z���.����~����.a�og�X��#G�e�08z�(�D�Z�K�t:K��do8�ˑ��I&�T*����V�,,,����KWuI�f�0
Q�D"A:�&C��:>� �Ʉ��=�(b0�J��T*t�]����$ MӐe]�Y^^���c�6����dPU�0
��r�_�W�8qB��������t:q���iR��mp�����
+��t��dBE�����q��0d<cY;;;�q�d���=}��������6?���ϟ��<���Ġ��\.�]w�EE�m��ŋlnn�!�ш(�p�v����\�)�ى����x<�w|h����h4��G&��T*���X\\��ѣ����i��l6�q����|,�������3g�]�Bp��9sFA��[(pEQ�}�z���8�;�i6�1�����5"8u��t������8��C��!�d�(��e9��f��a=T��Ba6C�'NH����шN��t:E�u�
@�uJ��$���������}���x��/۴t��ß|(�Q�o`.���_�u]��)�~�-
+lgg�D"�,˱4�f�h��t:��jaYֿ?�=y����
�C$I�\.S��B�y�5��fR��|Y���j$�I<ϋet�T��M��;&�������
�0.k;�,��}��g"�����矿f�.��,x�M`7P���;����tňI�t���
\ No newline at end of file
Modified: branches/pingus_sdl/src/ground_map.cxx
===================================================================
--- branches/pingus_sdl/src/ground_map.cxx 2007-01-17 20:55:52 UTC (rev
2682)
+++ branches/pingus_sdl/src/ground_map.cxx 2007-01-17 21:37:42 UTC (rev
2683)
@@ -68,12 +68,7 @@
void
MapTile::put(PixelBuffer obj, int x, int y)
{
-#if 0
prepare();
- Blitter::put_surface(pixelbuffer, obj, x, y);
- surface = CL_Surface(pixelbuffer);
-#endif
- prepare();
pixelbuffer.blit(obj, x, y);
sprite = Sprite(pixelbuffer);
}
Modified: branches/pingus_sdl/src/pixel_buffer.cpp
===================================================================
--- branches/pingus_sdl/src/pixel_buffer.cpp 2007-01-17 20:55:52 UTC (rev
2682)
+++ branches/pingus_sdl/src/pixel_buffer.cpp 2007-01-17 21:37:42 UTC (rev
2683)
@@ -52,7 +52,7 @@
0x0000ff00,
0x00ff0000,
0xff000000);
- SDL_FillRect(surface, NULL, SDL_MapRGBA(surface->format, 255, 255, 0, 255));
+ //SDL_FillRect(surface, NULL, SDL_MapRGBA(surface->format, 0, 0, 0, 0));
}
PixelBuffer::~PixelBuffer()
Modified: branches/pingus_sdl/src/sprite.cpp
===================================================================
--- branches/pingus_sdl/src/sprite.cpp 2007-01-17 20:55:52 UTC (rev 2682)
+++ branches/pingus_sdl/src/sprite.cpp 2007-01-17 21:37:42 UTC (rev 2683)
@@ -91,7 +91,8 @@
{
if (pixelbuffer.get_surface())
{
- surface = SDL_DisplayFormat(pixelbuffer.get_surface());
+ surface = SDL_DisplayFormatAlpha(pixelbuffer.get_surface());
+ //SDL_SetAlpha(surface, SDL_SRCALPHA, 128);
}
else
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2683 - in branches/pingus_sdl: data/images/core/buttons src,
grumbel at BerliOS <=