pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] r2995 - in branches/pingus_sdl: . data/images/fonts src src


From: grumbel at BerliOS
Subject: [Pingus-CVS] r2995 - in branches/pingus_sdl: . data/images/fonts src src/components
Date: Fri, 17 Aug 2007 22:09:13 +0200

Author: grumbel
Date: 2007-08-17 22:09:11 +0200 (Fri, 17 Aug 2007)
New Revision: 2995

Removed:
   branches/pingus_sdl/data/images/fonts/pingus_small4_fix_num.png
   branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-1.font
   branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-2.font
   branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-9.font
Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font
   branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.png
   branches/pingus_sdl/src/components/pingus_counter.cpp
   branches/pingus_sdl/src/components/time_display.cpp
   branches/pingus_sdl/src/font.cpp
   branches/pingus_sdl/src/fonts.cpp
   branches/pingus_sdl/src/fonts.hpp
   branches/pingus_sdl/src/start_screen.cpp
Log:
- made pingus_small have fixed-width numbers (by a alpha-1 border)
- fixed pingus counter bar issue
- some fine tuning of the start screen
- removed old fixednum fonts

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-17 17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/TODO    2007-08-17 20:09:11 UTC (rev 2995)
@@ -27,7 +27,7 @@
 
 - a new worlds 
 
-- UTF8 support
+- UTF8 support with MES-1 characters 
(http://www.eki.ee/letter/chardata.cgi?comp1=MES-1&comp2=)
 
 - split screen multiplayer
 
@@ -60,8 +60,6 @@
 
 - remove all the remaining unneeded debuging std::cout's
 
-- src/components/pingus_counter.hpp font should be fixed-width/monospace
-
 - forgein languages break many parts of the GUI (font align, mostly worldmap)
 
 Nice to Have:

Modified: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font  
2007-08-17 17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.font  
2007-08-17 20:09:11 UTC (rev 2995)
@@ -1,7 +1,7 @@
 ;; -*- scheme -*-
 (pingus-font
  (name "Pingus Small")
- (space-length    8)
+ (space-length    13)
  (char-spacing 0)
  (vertical-spacing 23)
  (alpha-threshold  0)

Modified: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-1.png
===================================================================
(Binary files differ)

Deleted: branches/pingus_sdl/data/images/fonts/pingus_small4_fix_num.png
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small4_fix_num.png     
2007-08-17 17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/data/images/fonts/pingus_small4_fix_num.png     
2007-08-17 20:09:11 UTC (rev 2995)
@@ -1,83 +0,0 @@
-�PNG
-
-
-H�a���F�
-�
t�v���4����f���g��<�8���7(��\d�o+i��
address@hidden&/+�`�_\}���w���ӎ����c|��.V^Cыv�s���V��U�Np��x~���A|��������øx����r?�����c��Α���oTnO���:�?�g��è��l�����������_b���?c�����s�6�O�����9=}����
-̓T�Q~�e      
���~���;w'��2��#�R�oE�d9�)_��]<�#��d�|��?u��x$���29���_%����r���Q���S��
-KN�������F��*�.Cv�1T�����M/�G��u.4b��-�~�2��e����$�c�E�n��}�+�u���S       
X�g�c0��@&�O�LU�h�0e�t��4˴n�.��R�g���fH<�ݧiuPy�Ϟ�c��>
@�R`d������L��`���\ ��Z��LJLB�G�
 f�Ӷ�f�u�©��������h�tޏ
-���Iۓ��\�4�����)��,��)0^K���Ho
-ӥ�     ��
g�~m([j�
-�y�r$���!��Ar�V0�E�8
-N����3�`�x/q�\��E���K�dC�jD�(��>��>W�$�+�K��h�3�ۿT0T�Ҙ�v�V:�͐j�����?z��H
�N�|��,�D�GO�h�^�e�����V �iRA 7�S!C!�����,�ȟ�      address@hidden 
|r����=��<\r&��]w]������o&��X��w7 
��%X��i��F�k��z�\.�R%��?ԻxS}���x�*g��
-˦|���Q�j{����D       �.^O�ފ�] #�5
-L����wA������{�؆є���ɴ%�E���rPK�dI�P�|k��,����$��Z>uq"address@hidden
�
-J�Z�]B`��
-.D�[��� 3��[i'�     �[��)K<�O�"Xw�+�&address@hidden"�Ӥ��.
����De���r|�G�6�]ɦ]��T{I.�"�}�$3&0\_YgH�n�4�L�?o�X�L�����*u7�^����
x���y����>�E�3�9���|�d7�b#Ҭ�(�1ֻѺ����o���լ�/
}����E��?z��B3h{��0��}�#����
-��e��y�6��ѭ�� �������e呪e�
-�n0T�'~aʭ�tʏ�c
h����L)������A�`A���|�� address@hidden       �{���x�e        
address@hidden@�Gv8�m�P��%��2�`T<�a��m�I��^��R��mm��!�X� 
I�Q�'%��7���ڞ�K6A�G}��F�A��4���{%'T�L0��{ʸ�
-�����F��:��H9�K" z5����Y��ز�>�9�͖&����'�
-��t;+���c�?��#�6��<�Z�}T��.J^�Jڏ�5�:I7���q�Q�31�o�q�K��5��^$I��u>address@hidden"�=�~��/�oy�
��Q��k��zR��`����=l�c�04��TzP������!���5\;��x���S �.y
V���t��>o}�x~BU�X��l���w�|@�P<7�Nn�ވ�B�k�&�#p:z�R�
-9l���7F^G�e����
��ٞ���m2��ej�Ya��2�z���6�n&>�B�}��׳��AY���ΡW�<���(:"�������B�4ذK�T��)� 
��E.�q���.��X�an�P��g���u��
���йi��?R`h����x�&�,ѭ��›g)���}~�cb��^��������N�%�:�z�<�Y
-�����a"\�|�tb>t/(���_T�%DVA�gK:'��$A���C]`����)address@hidden@�"��im�|address@hidden&
ʭ����Vq���l:�۫Ay��>`����p����address@hiddenaddress@hidden>�6Ur��T��H 
      ��}�{�d���h��G��pi0��/|����;��,9`yy���Yl����3$��e;������y�E
-=l�(�i���[�hp#Nav]�_G[V������6+$`5�
-{���ꬿY}�])���<�!K��
>c��V�8���}�C��T�A�����V��?B������K��'xX
-x�O���ގ��YD�8�u�
-z���� �+��3�y������   
��v��d4�U0�q��a��}�?�S����i�����e5�'�D��*�E0�CP��_e#�Q.M,        
r�+{���*�a�|
-�͕>�s��h�C�,P%����|�W���-������G�{҃��~R�������O3ڛ-�
-�]����
-�VK�2����]�5�X�لVFY`Ż�D}}�2E�����0���M2���2��O�Y
-�9H9�K�y�ŝ��:�w%�*�[�OnaK�f��_7���ڮ��Q��}
[��o����m���9��-�e��#�5�p=�o�O
-�C��Q�N2r�
-J�
-sj�jU�������a+/��[���dA�[�|(��(�2���������#��m�L��ztG"��:���
-P��v0�X�:1o
%p�V�i�TAM�A�o��)address@hidden:)���U)!��[���zl�Ҁ2|,��)�C`5�f�<o����`Q+o�H!қI���6��7�T[x�'
      ?
-���������Cx
�")��jN�_�Q��Ńa>[J      
Z�ⳋ<o�g�2�gp"AW[C�5�V�uEw��紘��C¢���Sr�WH9�O><address@hidden/<c�"�=2�
��Y��,��(�r��La
-⡜&���'��0eB�F�k
address@hidden@�M��I?d �|���I�� ��"�ِ�8�By?H�H�
- �"P<|�O��QF
address@hidden/�0�/M����co!m�'��U��
-z�^(U�O?�7��=�����%i�`(����">{�   !�����eP������o)�A�J�7(�hL�
- ��х��_�z�A�ם/�t���S��8P)�`��osm���r�1�7˿�dW?`�%Rʛ�7sB�p�D��Hy�}��zH
��寗23��
-�(��
-��F�:��� ��f�G���#3\z�#�"����G}؛0im�ED�Wˣ�I
���ԴT   ��K�I0t�7���h�u��   �5r�+�T��A��*��56�Ϣ�e:����}�  
z,'�����$�.��       ���Yg�����R�E�/]e����\Ա�&Wz'�,��L�
�ö*�-ԏA����:�/�V?۴�#��K*ɻK9n��e�}�zuRE��n�J=R�//�,address@hidden>�Pz]��`��d�1U�����'V^�]<��е�
--O�G����l4 m��A��]��(8�D�{�99�p��T����[�I��=N�
-���d�W���F�Z���"Y:N�wq,�g���:��:��r�{�%�Cy#۵�^,����
-��hP4���륐>M�P5˜,u.0��u��r�t�g��c$:I&'��4~�Λ��Eq��
"�
�*w�����{H>address@hidden:��xv
-��Z��
-׳���O��ڄ��&�h��c��#$���nt�|�X���C����2ڑ�P���q�;n��b�����c�o�����Q����
�4�֑�x04�+zʌ�      ���  r���B�c�{�,�� 
�Z!/��N7��Tw��M$db�s��F�ͷw����񣃳C��Z!�u����QP`���wtq�n�����Cu�Iˢ23M�
y�燣��e�����
-
-^9Q��H/�F�5u�0�z
-��޶��ܛC=�&S[��Ŵb�����j���-����#o��    �%���
-�N��4z����:���ү��#��f�v��`�I��#0��2�c��c���,�G�lqi^gsmө-����`���—
-
-$y=�XO�M�f`�\.��Y��d�4��ƒ�S<���4��b�Z{��w������Έ�����,��h�dz����=�e"�[�+��(/R�}���(��A��ֻHˋ�
-�� ·��8�b�B>�p1̺84��g�l�v����c}�����ˣ>��·\����i~� 
a܉R�-��,��tF�$:$��H��~J�;��
-e�k
-��|Fy(ۣ�ᠧ��J7,mw ��}��N�mXu�t�`�R�C�T��7��'�R�l}��1�z��?j��RF�^�\��~�0��
����Xb�����g]D���
-�٭{�3L���|l��|?�c̆Qb��
-Z��J���r�V�#�4F��n��x+�P�k��,[�:Ã���ޣ̻B�����8+�"J�nDz��v�!���S��yW��������x��Wc&address@hidden;!c��`���;�-`�Q��j��U6�}o�lv�j/0��Le�����Mw�R9�Re�*;:�`!�t������Z?��qf��lYI����M7�(address@hidden
-�R^,b�����o`(�g�����]�f$�՚��|�|�{m�c��i�����Ѯ=�P��{P/�*Y�Ѹ�U��y��5Cl���\04�0p�
        ��Y�W�"������i�ވ'O��H3������
�b_�Ty���bɣ���.Q�����(��z�냔X���ߛ`��`�<ȯfʜт�|�ޔ�]_]
^xV����Adz�����n��a����l�\ȳ�V����l�c��F|������
-��B�C��>Q��7S�7]j�sHkna�/Z6�yu��Sɤ���O��b�1�+гF򋞯����\0t?���mŏ���PL<�6!:���8�ܷ
-��$#�B~�O>��sC��()��l0�7RCȬ��A9ѻM�H�,�5����xj꺵
-�ݝ�$ASi�X(9�P�!���
-��*�c/Ex�L]�r.�xf'���d���������FZ�
-e9�.���c��Lʭ�M����-�
-�x��&ه�v`�#���s�s�z*=��%���       ��e
-#j��j=�����$?ΥwF����uy�ZK��[~ƱQ04H��N
d��4K&��1E�Vg_�1=.Ûc�X�ƃ��|���~|��OH���u9�wN�p����=F�9�A���&���ս��2�{�+�)w��U�rO��&����e<N
����c^�z�s�y���
-U�
�١�����U�2���Ϊ��EwB���>�3��C0�-�a�C���<�E�^4�
=�L��<���T;address@hidden/address@hidden 
��=�Z~�u��>0�P��)x���t�C���g��b����4����S�Ⴁ
4�{����<_Y���U��D�]
0�2�y�TZ`�a��[Ȅ�(�/�2�ݓae���CM�WK�����!����0��'�~�`h��s��`l0�nB��B��b��1�WB��;�+M�'s�H3�/address@hidden
�*/ĵ|
-�XP�� address@hidden)��[��]�[�jL�{F����I����tgR��3bvp$��;9r���G
-p�)�E 1ݻ����W�.%‹��u"�o?��e�.���C�
l�XG���qQ�K�)1�p׼�(�Rk�y��h^A�8{\��C��K#A��r۬��zf�8y�(�-Q(�n��f3%N��:�k٧�����ۋ�͕
���Y�R˩9F�_b�|���
-e'�/��h�J�fuU���+8���������&HI�NW%�$9���;O�R�
网5o��{����;��j����GL�0'�1V�  [�"L�R���I8Ipb
-�R�x�qF�3��Mo�
address@hidden"�Va7�nxõ����wy��A����o3ɇ����u�Z�P��f��
-/�
-�>�F&a�I�Y��V��>����3;�\[��=;�`��1�GB���Q�|��Xe��b,���y�N�����[J�<address@hidden>����tK<�1���a��,`���)�ī\��!
-
address@hidden(�
�       �RF�����c�,address@hidden ��۴BƼS���v�ܶ
��w�x#�(�#��G���5��x���ܯ�qȭ6�KϙJ�����u
-�{� a��
-�{�|��_�u*����#2������\����e�pz�H�ԍJ>�GU�V�z̭��{i9�'UDT��9nS[����?��Y��OORqo%���/�5c�)��
 �7ރs�.ң'� 
address@hidden|L|�ɧ�q���j_V+�3u�g���̠EOnb���d�$�]bd[ڏ,��f6�%���lxWtХ1���|F-7)�xY[��qɎ�o��3��{帤��w�[.��c�#v0t�d�FU�ա7�6ԺL_zti�}��*O/��y��(���+��_�|address@hidden:��I^�~e�������1
J������d�;b}��
-6����l��16�a�*6��z��:o��F�e<�gs�
-�q����lC#���te�PW���5�����"�*(43:k��a��b[:��V��2f����r�U��UQ�V��s����,�>b�lk4߄�Dö'��
 
YT���C�>���v2C�g'S�*o��"���S����M"�8ػ.�/H�R*�ѧO��v=�p�繿�׸S�6ލ���X�����׫��&address@hidden&��]��$I4Nh
-�vn��7˝ɺ�Ȼ��v������mCd��,Z���������d�&WH1-bA�{7?K��ho04�rg0�AH��L���C�o�N�
 �{�!�f��+��ҿ��6��Y�P-S��'R[j��<@ܬ6�i��b���u|���u<îK�K��=(�J�  
ʱ���(7��"address@hidden&�)D��cEs[���:��c����'��z���1�8��T�͓F�+)J7 
{1{�P        �ҏF<ׄ���B*�I8"̺Hp�I��j��0��'�|0�C�I�s������+|0��s�
-J��г��C�04��bW�v�����U��   �I���(�'/�`h�2��k��k#���t��M`��P�l�
-�2�~��=e�4�^侨�9X�Ё�A
�9��C{ޠ�Z�ε'��^����ٷ��<�P��%�F”%z��9��0���{)�5k�hߤ!
-��(�f%
����n�#(������>��O>�`���`�����`��
\ No newline at end of file

Deleted: 
branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-1.font  
2007-08-17 17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-1.font  
2007-08-17 20:09:11 UTC (rev 2995)
@@ -1,11 +0,0 @@
-;; -*- scheme -*-
-(pingus-font
- (name "Pingus Small")
- (space-length    8)
- (alpha-threshold  0)
- (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-             
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-1.png"))
-
-;; EOF ;;

Deleted: 
branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-2.font  
2007-08-17 17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-2.font  
2007-08-17 20:09:11 UTC (rev 2995)
@@ -1,11 +0,0 @@
-;; -*- scheme -*-
-(pingus-font
- (name "Pingus Small")
- (space-length    8)
- (alpha-threshold  0)
- (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-             
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-2.png"))
-
-;; EOF ;;

Deleted: 
branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-9.font  
2007-08-17 17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-9.font  
2007-08-17 20:09:11 UTC (rev 2995)
@@ -1,11 +0,0 @@
-;; -*- scheme -*-
-(pingus-font
- (name "Pingus Small")
- (space-length    8)
- (alpha-threshold  0)
- (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-             
"�����������������������������������������������������������������������������������������������")
- (image "data/images/fonts/pingus_small-iso-8859-9.png"))
-
-;; EOF ;;

Modified: branches/pingus_sdl/src/components/pingus_counter.cpp
===================================================================
--- branches/pingus_sdl/src/components/pingus_counter.cpp       2007-08-17 
17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/src/components/pingus_counter.cpp       2007-08-17 
20:09:11 UTC (rev 2995)
@@ -33,7 +33,7 @@
   : server(s),
     background(Resource::load_sprite("core/buttons/info"))
 {
-  font = Fonts::pingus_small_fix_num;
+  font = Fonts::pingus_small;
 }
 
 void
@@ -46,14 +46,14 @@
 
   World* world = server->get_world();
 
-  snprintf(str, 128, _("Released:%3d/%-3d   Out:%3d   Saved:%3d/%-3d").c_str(),
+  snprintf(str, 128, _("Released:%3d/%d   Out:%3d   Saved:%3d/%d").c_str(),
           world->get_pingus()->get_number_of_released(),
           world->get_pingus()->get_number_of_allowed(),
           world->get_pingus()->get_number_of_alive(),
           world->get_pingus()->get_number_of_exited(),
           server->get_plf().get_number_to_save());
 
-  gc.print_center(font, gc.get_width()/2, 0, str);
+  gc.print_center(font, gc.get_width()/2, -1, str);
 }
 
 

Modified: branches/pingus_sdl/src/components/time_display.cpp
===================================================================
--- branches/pingus_sdl/src/components/time_display.cpp 2007-08-17 17:02:26 UTC 
(rev 2994)
+++ branches/pingus_sdl/src/components/time_display.cpp 2007-08-17 20:09:11 UTC 
(rev 2995)
@@ -37,7 +37,7 @@
   : server(c->get_server()),
     infinity_symbol(Resource::load_sprite("core/misc/infinity"))
 {
-  font = Fonts::pingus_small_fix_num;
+  font = Fonts::pingus_small;
 }
 
 void
@@ -48,8 +48,9 @@
 
   if (server->get_plf().get_time() == -1 && !(pingus_debug_flags & 
PINGUS_DEBUG_GAMETIME))
     {
-      gc.draw(infinity_symbol, static_cast<float>(Display::get_width()
-                                                  - 
infinity_symbol.get_width() - 6), 2.0f, 150.0f);
+      // No need for this
+      //gc.draw(infinity_symbol, static_cast<float>(Display::get_width()
+      //                                            - 
infinity_symbol.get_width() - 6), 2.0f, 150.0f);
     }
   else
     {

Modified: branches/pingus_sdl/src/font.cpp
===================================================================
--- branches/pingus_sdl/src/font.cpp    2007-08-17 17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/src/font.cpp    2007-08-17 20:09:11 UTC (rev 2995)
@@ -188,7 +188,7 @@
       {
         if (text[i] == ' ')
           {
-            dstx += space_length;
+            dstx += space_length + char_spacing;
           }
         else
           {
@@ -219,13 +219,13 @@
 
   int  get_width(const std::string& text) const
   {
-    int width = 0;
-    int last_width = 0;
+    float width = 0.0f;
+    float last_width = 0;
     for(std::string::size_type i = 0; i < text.size(); ++i)
       {
         if (text[i] == ' ')
           {
-            width += space_length;
+            width += space_length + char_spacing;
           }
         else if (text[i] == '\n')
           {
@@ -234,10 +234,10 @@
           }
         else
           {
-            width += chrs[static_cast<unsigned char>(text[i])].w+1;
+            width += chrs[static_cast<unsigned char>(text[i])].w + 
char_spacing;
           }
       }
-    return std::max(width, last_width);
+    return int(std::max(width, last_width));
   }
 
   Size get_size(const std::string& text) const

Modified: branches/pingus_sdl/src/fonts.cpp
===================================================================
--- branches/pingus_sdl/src/fonts.cpp   2007-08-17 17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/src/fonts.cpp   2007-08-17 20:09:11 UTC (rev 2995)
@@ -29,7 +29,6 @@
 Font chalk_small;
 
 Font pingus_small;
-Font pingus_small_fix_num;
 Font pingus_large;
 
 Font courier_small;
@@ -45,7 +44,6 @@
 
   pingus_small = Resource::load_font("fonts/pingus_small" + std::string("-") + 
encoding);
   pingus_large = Resource::load_font("fonts/pingus"       + std::string("-") + 
encoding);
-  pingus_small_fix_num = Resource::load_font("fonts/pingus_small_fix_num" + 
std::string("-") + encoding);
 
   courier_small = Resource::load_font("fonts/courier_small" + std::string("-") 
+ encoding);
 
@@ -58,7 +56,6 @@
   chalk_normal = Font();
   chalk_small  = Font();
   pingus_small = Font();
-  pingus_small_fix_num = Font();
   pingus_large = Font();
   courier_small = Font();
   lcd = Font();

Modified: branches/pingus_sdl/src/fonts.hpp
===================================================================
--- branches/pingus_sdl/src/fonts.hpp   2007-08-17 17:02:26 UTC (rev 2994)
+++ branches/pingus_sdl/src/fonts.hpp   2007-08-17 20:09:11 UTC (rev 2995)
@@ -34,7 +34,6 @@
 extern Font courier_small;
 
 extern Font pingus_small;
-extern Font pingus_small_fix_num;
 extern Font pingus_large;
 
 extern Font lcd;

Modified: branches/pingus_sdl/src/start_screen.cpp
===================================================================
--- branches/pingus_sdl/src/start_screen.cpp    2007-08-17 17:02:26 UTC (rev 
2994)
+++ branches/pingus_sdl/src/start_screen.cpp    2007-08-17 20:09:11 UTC (rev 
2995)
@@ -101,7 +101,7 @@
   StartScreen* parent;
 public:
   StartScreenAbortButton(StartScreen* p)
-    : GUI::SurfaceButton(Display::get_width()/2 - 278,
+    : GUI::SurfaceButton(Display::get_width()/2 - 300,
                          Display::get_height()/2 + 144,
                          ResDescriptor("core/start/back"),
                          ResDescriptor("core/start/back_clicked"),
@@ -144,8 +144,8 @@
 {
   gc.draw(background, Display::get_width()/2.f, Display::get_height()/2.f);
 
-  int left_x  = Display::get_width()/2 - 120;
-  int right_x = Display::get_width()/2 + 120;
+  int left_x  = Display::get_width()/2 - 150;
+  int right_x = Display::get_width()/2 + 150;
   int y = Display::get_height()/2 + 40;
 
   gc.print_center(Fonts::chalk_large,





reply via email to

[Prev in Thread] Current Thread [Next in Thread]