From: <z-...@us...> - 2009-01-16 22:47:26
|
Revision: 8834 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8834&view=rev Author: z-man Date: 2009-01-16 22:18:31 +0000 (Fri, 16 Jan 2009) Log Message: ----------- Re-applied changes from old utf8 branch, now found at armagetronad/branches/utf8-outdated. textures and language directories have diverged and should not be merged. If/when this is to be merged to the trunk, the language files from the trunk should be taken and reconverted to utf8. Texture changes in this branch look more useful than those on the trunk to me. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/AUTHORS armagetronad/branches/utf8/armagetronad/config/settings.cfg armagetronad/branches/utf8/armagetronad/src/Makefile.am armagetronad/branches/utf8/armagetronad/src/engine/eAdvWall.h armagetronad/branches/utf8/armagetronad/src/engine/eRectangle.h armagetronad/branches/utf8/armagetronad/src/network/nConfig.cpp armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp armagetronad/branches/utf8/armagetronad/src/network/nNetwork.h armagetronad/branches/utf8/armagetronad/src/render/rColor.h armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp armagetronad/branches/utf8/armagetronad/src/render/rFont.h armagetronad/branches/utf8/armagetronad/src/render/rScreen.cpp armagetronad/branches/utf8/armagetronad/src/tools/tColor.cpp armagetronad/branches/utf8/armagetronad/src/tools/tColor.h armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp armagetronad/branches/utf8/armagetronad/src/tools/tString.h armagetronad/branches/utf8/armagetronad/src/tron/gCycleMovement.h armagetronad/branches/utf8/armagetronad/src/ui/uMenu.cpp armagetronad/branches/utf8/armagetronad/src/ui/uMenu.h armagetronad/branches/utf8/armagetronad/win32/README.txt armagetronad/branches/utf8/armagetronad/win32/makedist.bat Added Paths: ----------- armagetronad/branches/utf8/armagetronad/language/ armagetronad/branches/utf8/armagetronad/language/polish.txt armagetronad/branches/utf8/armagetronad/language/polish_transliterated.txt armagetronad/branches/utf8/armagetronad/src/thirdparty/utf8/ armagetronad/branches/utf8/armagetronad/src/thirdparty/utf8/utf8.h armagetronad/branches/utf8/armagetronad/src/tools/tRectangle.cpp armagetronad/branches/utf8/armagetronad/src/tools/tRectangle.h armagetronad/branches/utf8/armagetronad/textures/Armagetronad.ttf armagetronad/branches/utf8/armagetronad/textures/armagetronad.sfd Removed Paths: ------------- armagetronad/branches/utf8/armagetronad/language/ armagetronad/branches/utf8/armagetronad/src/engine/eRectangle.cpp armagetronad/branches/utf8/armagetronad/textures/Armagetronad.ttf armagetronad/branches/utf8/armagetronad/textures/armagetronad.sfd Modified: armagetronad/branches/utf8/armagetronad/AUTHORS =================================================================== --- armagetronad/branches/utf8/armagetronad/AUTHORS 2009-01-16 22:01:28 UTC (rev 8833) +++ armagetronad/branches/utf8/armagetronad/AUTHORS 2009-01-16 22:18:31 UTC (rev 8834) @@ -31,7 +31,6 @@ guru3, z-man and davidfancella are the Administrators, any spam goes to them. - Honored former members ====================== @@ -106,3 +105,12 @@ Yan Olliver Mathematical expression parser + +Nemanja Trifunovic + UTF-8 library + +External resources +================== + +Bitstream + default font file Modified: armagetronad/branches/utf8/armagetronad/config/settings.cfg =================================================================== --- armagetronad/branches/utf8/armagetronad/config/settings.cfg 2009-01-16 22:01:28 UTC (rev 8833) +++ armagetronad/branches/utf8/armagetronad/config/settings.cfg 2009-01-16 22:18:31 UTC (rev 8834) @@ -790,6 +790,31 @@ ############################################################################################ # +# Unicode behavior +# +############################################################################################ + +SERVER_SENDS_UTF8 1 # send strings as UTF8 by default +SERVER_SENDS_UTF8_OVERRIDE 1 # but revert to latin1 when an old client connects. + +# alternatives: + +# send strings as latin1, always. Avoids constant switches and errors when string format +# change messages and messages with strings are reordered by the network. Also, this is +# the only way to make your server's description and player names appear correctly on +# pre-0.3.1 clients, at the cost that they may be broken on 0.3.1 clients and later. +#SERVER_SENDS_UTF8 0 + +# send strings as utf8, always. Special characters will be garbled for pre-0.3.1 clients. +#SERVER_SENDS_UTF8 1 +#SERVER_SENDS_UTF8_OVERRIDE 0 + +# send strings as utf8, always. Don't take connections from clients that don't understand that. +#SERVER_SENDS_UTF8 1 +#SERVER_SENDS_UTF8_OVERRIDE 2 + +############################################################################################ +# # Debugging (only available if compiled for debug) # ############################################################################################ Property changes on: armagetronad/branches/utf8/armagetronad/language ___________________________________________________________________ Added: svn:ignore + .tag languages.txt *.bak Added: svn:mergeinfo + Copied: armagetronad/branches/utf8/armagetronad/language/polish.txt (from rev 8833, armagetronad/trunk/armagetronad/language/polish.txt) =================================================================== --- armagetronad/branches/utf8/armagetronad/language/polish.txt (rev 0) +++ armagetronad/branches/utf8/armagetronad/language/polish.txt 2009-01-16 22:18:31 UTC (rev 8834) @@ -0,0 +1,3042 @@ +#***************************************** +#***************************************** +#***************************************** +#***************************************** +# +# Help texts for the various configuration +# options that can be set via the console. +# +# The text item for a configuration item +# with name NAME has the ID name_help. +# +#***************************************** +#***************************************** +#***************************************** +#***************************************** +language Polish + +#***************************************** +#***************************************** +#***************************************** +#***************************************** +# +# Help texts for the various configuration +# options that can be set via the console. +# +# The text item for a configuration item +# with name NAME has the ID name_help. +# +#***************************************** +#***************************************** +#***************************************** +#***************************************** + +first_use_help Czy po raz pierwszy uzywasz \g? +include_help Dolacza ponizszy plik +sinclude_help Dolacza ponizszy plik, nie zwracajac bledu, jezeli go nie znaleziono +rinclude_help Dolacza plik z bazy zr\xF3del. Uzyj bezposredniej sciezki. +new_team_allowed_help Czy tworzenie nowej druzyny jest aktualnie dozwolone? + +#******************************************** +#******************************************** +# +# lost settings +# +#******************************************** +#******************************************** + +keyboard_help Ustawienia klawiatury + +#******************************************** +#******************************************** +# +# keyboard settings +# +#******************************************** +#******************************************** + +doublebind_time_help Czas w sekundach pomiedzy wywolaniem tej samej akcji przez inne klawisze. + +#******************************************** +#******************************************** +# +# Cycle physics related configuration options +# +#******************************************** +#******************************************** + +cycle_speed_help Podstawowa predkosc cyklu podczas jazdy prosto i zdala od scian +cycle_speed_min_help Minimalna predkosc cyklu, mierzona wzgledem CYCLE_SPEED +cycle_speed_max_help Maksymalna predkosc cyklu, mierzona wzgledem CYCLE_SPEED. 0 = bez limitu. + +cycle_speed_decay_below_help Mnoznik do predkosci cyklu, oznaczajacy wartosc CYCLE_SPEED od dolu + +cycle_speed_decay_above_help Mnoznik do predkosci cyklu, oznaczajacy wartosc CYCLE_SPEED od dolu +cycle_start_speed_help Poczatkowa predkosc cyklu +cycle_sound_speed_help Dzielnik predkosci dzwieku + +cycle_accel_help Mnoznik przyspieszenia przy scianach +cycle_accel_self_help Mnoznik do CYCLE_ACCEL dla wlasnej sciany +cycle_accel_team_help Mnoznik do CYCLE_ACCEL dla sciany graczy z druzyny +cycle_accel_enemy_help Mnoznik do CYCLE_ACCEL dla sciany przeciwnik\xF3w +cycle_accel_rim_help Mnoznik do CYCLE_ACCEL dla stalych scian mapy +cycle_accel_slingshot_help Mnoznik do calkowitego CYCLE_ACCEL, jesli cykl jest pomiedzy dwiema scianami, z czego jedna jest jego wlasna +cycle_accel_tunnel_help Mnoznik do calkowitego CYCLE_ACCEL, jesli cykl jest pomiedzy dwiema scianami, a zadna nie jest jego wlasna +cycle_accel_offset_help Minimalny odstep od sciany, ta wartosc musi musi byc dodatnia +cycle_wall_near_help Maksymalny przyspieszajacy odstep od sciany + +cycle_boost_self_help Dodatkowe przyspieszenie otrzymywane podczas odjezdzania od wlasnej sciany. +cycle_boost_team_help Dodatkowe przyspieszenie otrzymywane podczas odjezdzania od sciany gracza z druzyny. +cycle_boost_enemy_help Dodatkowe przyspieszenie otrzymywane podczas odjezdzania od sciany przeciwnika. +cycle_boost_rim_help Dodatkowe przyspieszenie otrzymywane podczas odjezdzania od sciany krawedzi mapy. +cycle_boostfactor_self_help Mnoznik do przyspieszenia otrzymywany podczas odjezdzania od wlasnej sciany. +cycle_boostfactor_team_help Mnoznik do przyspieszenia otrzymywany podczas odjezdzania od sciany gracza z druzyny. +cycle_boostfactor_enemy_help Mnoznik do przyspieszenia otrzymywany podczas odjezdzania od sciany przeciwnika. +cycle_boostfactor_rim_help Mnoznik do przyspieszenia otrzymywany podczas odjezdzania od sciany krawedzi mapy. + +cycle_turn_memory_help Ilosc oczekujacych (buforowanych) ruch\xF3w cyklu, jakie sa zapamietywane i wykonywane. + +cycle_delay_help Minimalny odstep czasowy pomiedzy skretami. (musi byc wiekszy od 0) +cycle_delay_bonus_help Dodatkowy mnoznik CYCLE_DELAY stosowany tylko na dedykowanym serwerze. +cycle_delay_timebased_help Jesli wartosc tej opcji to 1, to odstep pomiedzy skretami bedzie bazowany na czasie, natomiast 0 spowoduje, ze bedzie bazowany na odleglosci. Wartosci posrednie tez sa obslugiwane. +cycle_turn_speed_factor_help Mnoznik predkosci cyklu podczas skrecania. +cycle_delay_doublebind_bonus_help Mnoznik do CYCLE_DELAY dla skret\xF3w w te sama strone pod rzad. + + +cycle_brake_help Sila hamulc\xF3w + +cycle_width_help Kolizyjna szerokosc tunelu. Jesli cykl wjedzie do tunelu o takiej szerokosci, lub wezszego, odniesie szkody. +cycle_width_side_help Minimalna odleglosc cyklu od sciany zanim odniesie szkody. +cycle_width_rubber_min_help Jezeli warunki okreslone w cycle_width sa lekko przekroczone, gracz bedzie tracil tyle Rubber'a, ile okresla ta wartosc. Jezeli ta wartosc wynosi 1, zuzycie rubbera bedzie takie samo, jakby cykl stal naprzeciw sciany, jezeli wynosi 0, nie zuzyje nic. +cycle_width_rubber_max_help Jezeli warunki okreslone w cycle_width sa mocno przekroczone, gracz bedzie tracil tyle Rubber'a, ile okresla ta wartosc. Jezeli ta wartosc wynosi 1, zuzycie rubbera bedzie takie samo, jakby cykl stal naprzeciw sciany, jezeli wynosi 0, nie zuzyje nic. + +cycle_rubber_help Ilosc Rubber'a. Ta wyjatkowo przyjazna graczom wartosc okresla w praktyce jak dlugo moga stac naprzeciw sciany zanim ulegna zniszczeniu. +cycle_rubber_time_help Czas, w jakim przywracany jest caly Rubber. +cycle_rubber_legacy_help Kod Rubber'a dla starych klient\xF3w. Starych tzn. <= 0.2.7.0. +cycle_rubber_timebased_help Jesli wartosc tej opcji to 1, to zuzycie Ruber'a bazowane na czasie, natomiast 0 spowoduje, ze bedzie bazowane na odleglosci. Wartosci posrednie i inne tez sa obslugiwane. +cycle_rubber_speed_help Predkosc cyklu, gdy ten zuzywa Rubber stojac naprzeciw sciany (w ciagu kazdej sekundy gracz znajduje sie blizej sciany o ~0.4^{ta watrosc}) +cycle_rubber_mindistance_help Minimalna odleglosc od sciany na jakiej moze znajdowac sie cykl wskutek Rubber'a. +cycle_rubber_mindistance_gap_help Jezeli wieksze od zera 0, CYCLE_RUBBER_MINDISTANCE jest automatycznie modyfikowany tak, aby w powstalym tunelu m\xF3gl sie zmiescic jeszcze jakis cykl. +cycle_rubber_mindistance_gap_side_help CYCLE_RUBBER_MINDISTANCE_GAP zadziala tylko wtedy, jezeli kt\xF3rys z innych graczy znajduje sie tak blisko, ze m\xF3glby przez ten teoretyczny tunel przejechac w ciagu okreslonej ta wartoscia liczby sekund +cycle_rubber_mindistance_ratio_help Dodatkowa odleglosc powiekszajaca CYCLE_RUBBER_MINDISTANCE w zaleznosci od dlugosci sciany naprzeciw kt\xF3rej stoisz +cycle_rubber_mindistance_reservoir_help Dodatkowy dystans jezeli masz pusty Miernik Ruber'a (Zmienia sie w miare jak zuzywasz Rubber) +cycle_rubber_mindistance_unprepared_help Dodatkowy dystans dla nieprzygotowanych grind\xF3w; zostaje stosowany gdy ostatni skret gracza byl tylko poslizgiem i przekroczyl czas na przygotowanie okreslony w CYCLE_RUBBER_MINDISTANCE_PREPARATION. +cycle_rubber_mindistance_preparation_help Skala czasu, do kt\xF3rej por\xF3wnywany jest czas od ostatniego skretu gracza, aby okreslic skutki CYCLE_RUBBER_MINDISTANCE_UNPREPARED. +cycle_rubber_mindistance_legacy_help Dodatkowy mnoznik do CYCLE_RUBBER_MINDISTANCE, aktywowany gdypolaczeni sa gracze uzywajacy starszego klienta z bledem "rip bug" +cycle_rubber_minadjust_help Kiedy wyr\xF3wnywanie do sciany, pozw\xF3l zblizyc sie do niej co najmniej na te odleglosc, wzgledem poprzedniej pozycji +cycle_rubber_delay_help Podczas tego odstepu czasu po ostatnim skrecie gracza, efektywnosc Rubbera zostanie zwielokrotniona o CYCLE_RUBBER_DELAY_BONUS. +cycle_rubber_delay_bonus_help Mnoznik - dodatkowe ustawienie potrzebne do CYCLE_RUBBER_DELAY. +cycle_ping_rubber_help Dodatkowe zwiekszenie przyjaznosci Rubbera graczom o duzym ping'u. +cycle_rubber_wall_shrink_help Przy skonczonej dlugosci scian, zuzyty Rubber jest mnozony przez te wartosc a dlugosc sciany jest zmniejszana o wynik +cycle_brake_refill_help Stopien, w jakim przeladowuja sie hamulce graczy, kiedy nie sa uzywane +cycle_brake_deplete_help Stopien, w jakim przeladowuja sie hamulce graczy, kiedy SA uzywane +cycle_sync_interval_enemy_help Czas pomiedzy odswiezaniem przez klienta informacji o polozeniu cykli +cycle_sync_interval_self_help Odstep czasu pomiedzy informacjami dotyczacymi pozycji cyklu wysylanymi przez klienta +cycle_avoid_oldclient_bad_sync_help Jezeli ustawione na 1, klienci w starej wersji nie beda otrzymywali informacji w sytuacjach kiedy wiadomo, ze wywola to blad, w zwiazku z ich niekompatybilnoscia. +cycle_fair_antilag_help Jesli ustawione na 1, dezaktywuje kod odpowiedzialny za "poslizgi" spowodowane lagiem, gdy klienci w starej wersji sa polaczeni. +cycle_time_tolerance_help Maksymalny odstep czasowy pomiedzy wykonaniem tej samej akcji na serwerze i kliencie. +cycle_packetloss_tolerance_help Smierc cyklu jest tak dlugo unikana, jak blad gracza moze zostac wyjasniony przez utracone w sieci pakiety. Aktywowanie tej umozliwia pewne oszukiwanie gry. +cycle_sync_ff_help Predkosc prognozowania synchronizowania; zmniejsz dla mniejszego obciazenia CPU, ale wieksze wartosci moga poprawiac ping +cycle_sync_ff_steps_help Ilosc krok\xF3w symulacji na jeden krok prawdziwy; zwieksz dla wiekszej dokladnosci +topology_police_help Sprawdzanie, czy ruchy w grze byly prawidlowe. +topology_police_parallel_help Dodatek do TOPOLOGY_POLICE sprawdzajacy sciany wewnatrz struktury mapy, kt\xF3re sa r\xF3wnolegle. +cycle_smooth_time_help Skala czasowa dla opcji synchronizacji. Zwiekszenie tego spowoduje, ze interpolacja bedzie plynniejsza, ale mniej dokladna. Zmniejszenie oslabi plynnosc synchronizacji. +cycle_smooth_min_speed_help Minimalna predkosc korekcji plynnosci wzgledem predkosci cyklu +cycle_smooth_threshold_help Tylko synchronizacje w kt\xF3rych zmiana polozenia graczy sa mniejsze od tej wartosci (mierzonej w predkosci) beda wprowadzane plynnie. Wieksze zmiany beda wprowadzane natychmiast. + +cycle_max_refcount_help Maksymalna ilosc odniesien do cykli, zanim same wybuchna. To ustawienie ma chronic przed atakami zwiazanymi z wydajnoscia DOS'a. + +#******************************************** +#******************************************** +# +# Score rules configuration items +# +#******************************************** +#******************************************** +enemy_teammate_penalty_help Kara w sekundach, jezeli wykryty wplyw pochodzi od gracza z druzyny. +enemy_dead_penalty_help Kara w sekundach, jezeli wykryty wplyw pochodzi od niezywego gracza. + +enemy_chatbot_penalty_help Kara za zabijanie graczy, kt\xF3rzy sa w menu/rozmawiaja. +enemy_currenttime_influence_help Jezeli ta wartosc wynosi 1, to nie czas wytworzenia sciany, kt\xF3ra zabila graza bedzie uznawany, jako wplyw na jego smierc, tylko czas aktualnej pozycji. Posrednie wartosci sa dozwolone. +enemy_suicide_timeout_help Jezeli w ciagu tylu sekund, ile wynosi ta wartosc nie znaleziono wplywu innych graczy, to smierc gracza zostanie uznana za samob\xF3jstwo. +score_die_help Ilosc punkt\xF3w, jaka zdobywasz za smierc +score_survive_help Ilosc punkt\xF3w, jaka zdobywasz za przezycie +score_hole_help Ilosc punkt\xF3w, jaka zdobywasz za robienie dziur w scianach przeciwnik\xF3w dla dobra wlasnej druzyny +score_kill_help Ilosc punkt\xF3w, jaka zdobywasz za zabicie kogos +score_suicide_help Ilosc punkt\xF3w, jaka zdobywasz za samob\xF3jstwo +score_win_help Ilosc punkt\xF3w, jaka zdobywasz za wygranie rundy +score_deathzone_help Ilosc punkt\xF3w, jaka zdobywasz za wjazd w strefe smierci + +sp_score_win_help Ilosc punkt\xF3w, jaka zdobywasz za wygranie rundy w trybie pojedynczego gracza +sp_walls_stay_up_delay_help Czas w sekundach po jakim znikaja sciany gracza, kt\xF3ry zginal; ujemne wartosci zostawia te sciany na zawsze. +sp_walls_length_help Dlugosc sciany cyklu w metrach; ujemne wartosci spowoduja, ze scian beda mialy nieskonczona dlugosc. +sp_explosion_radius_help Promien wybuchu eksplodujacego cyklu w trybie pojedynczego gracza +sp_team_balance_on_quit_help Wyr\xF3wnywac druzyny w trybie pojedynczego gracza po wyjsciu? +sp_team_balance_with_ais_help Wyr\xF3wnywac druzyny w trybie pojedynczego graczami AI? +sp_team_max_imbalance_help Maksymalna dopuszczalna nier\xF3wnosc druzyn w trybie pojedynczego gracza +sp_team_max_players_help Maksimum graczy na jedna druzyne w trybie pojedynczego gracza +sp_team_min_players_help Minimum graczy na jedna druzyne w trybie pojedynczego gracza +sp_teams_max_help Maksymalna ilosc druzyn w trybie pojedynczego gracza +sp_teams_min_help Minimalna ilosc druzyn w trybie pojedynczego gracza +sp_finish_type_help Co sie dzieje, kiedy zginie ostatni czlowiek w trybie pojedynczego gracza? +sp_game_type_help Typ rozgrywki w trybie pojedynczego gracza. 0 - Freestyle, 1 - ostatni zywy gracz lub 2 - Ludzie vs. AI. +sp_auto_iq_help Automatycznie dobierac IQ graczy komputerowych w trybie pojedynczego gracza? +sp_auto_ais_help Automatycznie tworzyc graczy AI w trybie pojedynczego gracza? +sp_ai_iq_help Inteligencja graczy AI w trybie pojedynczego gracza +sp_min_players_help Minimalna ilosc graczy w trybie pojedynczego gracza +sp_num_ais_help Ilosc graczy AI w trybie pojedynczego gracza +sp_limit_score_help Gdy kt\xF3rys z graczy w trybie pojedynczego gracza przekroczy ten limit punkt\xF3w, rozpocznie sie nowy mecz +sp_limit_rounds_help Ilosc rund na jeden mecz w trybie pojedynczego gracza +sp_limit_time_help Maksymalny czas trwania jednego meczu w minutach w trybie pojedynczego gracza + +spawn_wingmen_back_help Okresla, jak daleko w tyl znajduje sie pozycja startowa skrzydlowych. +spawn_wingmen_side_help Okresla, jak daleko w bok znajduje sie pozycja startowa skrzydlowych. + +walls_stay_up_delay_help Czas w sekundach, po jakim znikaja sciany po wybuchu cyklu; ujemne wartosci zostawia sciany na zawsze. +walls_length_help Dlugosc sciany w metrach; ujemne wartosci spowoduje, ze sciany beda nieskonczenie dlugie. +explosion_radius_help Promien wybuchu po eksplozji cyklu +team_balance_on_quit_help Wyr\xF3wnywac druzyny po wyjsciu? +team_balance_with_ais_help Wyr\xF3wnywac sile druzyn graczami AI? +team_max_imbalance_help Maksymalna dopuszczana r\xF3znica w ilosci graczy poszczeg\xF3lnych druzyn +team_max_players_help Maksymalna ilosc graczy na druzyne +team_min_players_help Minimalna ilosc graczy na druzyne +team_allow_shuffle_up_help Jezeli wynosi 1, gracze moga sie przetasowywac do woli. Jesli 0, to moga tylko spadac na mniejsze pozycje. +team_center_is_boss_help Jezeli wynosi 1, graczem startujacym na srodku bedzie szef druzyny. Jezeli 0, bedzie to gracz, kt\xF3ry jest w tej druzynie przez najdluzszy okres czasu. + +team_elimination_mode_help Okresla spos\xF3b, w jaki ArmagetronAd powinien eliminowac zbne druzyny, gdy jest ich wiecej niz TEAM_MAX: Jezeli ustawione na 0, gra bedzie starac sie utrzymac jak najwiecej graczy przy grze, a jesli wszytkie druzyny majapo tyle samo graczy, to odpadnie druzyna z najslabszym wynikiem; Ustawienie tej wartosci na 1 nakaze grze dobieranie druzyn po kolorach (niebieska, potem zlota, potem czerwona itd.); Natomiast ustanienie na 2 bedzie usuwac druzyny z najslabszym wynikiem, bez wzgledu na ilosc graczy. + +teams_max_help Maksymalna ilosc druzyn +teams_min_help Minimalna ilosc druzyn +finish_type_help Co sie dzieje, gdy wszyscy ludzcy gracze zgina? +game_type_help Typ rozgrywki. 0 - Freestyle, 1 - ostatni zywy gracz lub 2 - Ludzie vs. AI. +auto_iq_help Automatycznie dobierac IQ graczy komputerowych? +auto_ais_help Automatycznie tworzyc graczy AI? +ai_iq_help Inteligencja graczy AI +min_players_help Minimalna ilosc graczy +num_ais_help Ilosc graczy AI +limit_score_help Gdy kt\xF3rys z graczy przekroczy ten limit punkt\xF3w, rozpocznie sie nowy mecz +limit_rounds_help Ilosc rund na jeden mecz +limit_time_help Maksymalny czas trwania jednego meczu w minutach + +auto_team_help Oznacza, czy gracze powinny byc automatycznie umieszczani w druzynach. +auto_team_spec_spam_help Jesli 0, przyjscie/odejscie obserwatora nie bedzie oznaczane. + +allow_team_name_color_help Nazywanie druzyn po kolorze +allow_team_name_player_help Nazywanie druzyn po nazwie lidera + +play_time_total_help Laczny czas gry, z jakim kt\xF3rym ktos gral na tym kliencie +play_time_online_help Laczny czas gry, z jakim kt\xF3rym ktos gral na tym kliencie online +play_time_team_help Laczny czas gry, z jakim kt\xF3rym ktos gral na tym kliencie w druzynie +min_play_time_total_help Laczny czas gry, wymagany aby m\xF3c zagrac na tym serwerze. +min_play_time_online_help Laczny czas gry online, wymagany aby m\xF3c zagrac na tym serwerze. +min_play_time_team_help Laczny czas gry w druzynie, wymagany aby m\xF3c zagrac na tym serwerze. +play_time_total_lacking Nie mozesz tu grac, najpierw musisz zdobyc wiecej doswiadczenia. Zagraj przez \1 min. (takze lokalnie), aby uzyskac dostep do gry na tym serwerze.\n +play_time_online_lacking Nie mozesz tu grac, najpierw musisz zdobyc wiecej doswiadczenia w grze online. Zagraj przez \1 min. na innych serwerach, aby uzyskac dostep do gry na tym serwerze.\n +play_time_team_lacking Nie mozesz tu grac, najpierw musisz zdobyc wiecej doswiadczenia w grze druzynowej. Zagraj przez \1 minut na serwerzch druzynowych, aby uzyskac dostep do gry na tym serwerze.\n + +team_name_1_help nazwa druzyny 1 +team_name_2_help nazwa druzyny 2 +team_name_3_help nazwa druzyny 3 +team_name_4_help nazwa druzyny 4 +team_name_5_help nazwa druzyny 5 +team_name_6_help nazwa druzyny 6 +team_name_7_help nazwa druzyny 7 +team_name_8_help nazwa druzyny 8 + +team_red_1_help czerwona czesc koloru druzyny 1 +team_red_2_help czerwona czesc koloru druzyny 2 +team_red_3_help czerwona czesc koloru druzyny 3 +team_red_4_help czerwona czesc koloru druzyny 4 +team_red_5_help czerwona czesc koloru druzyny 5 +team_red_6_help czerwona czesc koloru druzyny 6 +team_red_7_help czerwona czesc koloru druzyny 7 +team_red_8_help czerwona czesc koloru druzyny 8 + +team_green_1_help zielona czesc koloru druzyny 1 +team_green_2_help zielona czesc koloru druzyny 2 +team_green_3_help zielona czesc koloru druzyny 3 +team_green_4_help zielona czesc koloru druzyny 4 +team_green_5_help zielona czesc koloru druzyny 5 +team_green_6_help zielona czesc koloru druzyny 6 +team_green_7_help zielona czesc koloru druzyny 7 +team_green_8_help zielona czesc koloru druzyny 8 + +team_blue_1_help niebieska czesc koloru druzyny 1 +team_blue_2_help niebieska czesc koloru druzyny 2 +team_blue_3_help niebieska czesc koloru druzyny 3 +team_blue_4_help niebieska czesc koloru druzyny 4 +team_blue_5_help niebieska czesc koloru druzyny 5 +team_blue_6_help niebieska czesc koloru druzyny 6 +team_blue_7_help niebieska czesc koloru druzyny 7 +team_blue_8_help niebieska czesc koloru druzyny 8 + +# wall length modification +cycle_dist_wall_shrink_help Mnoznik wszelkich odleglosci w obliczeniach dotyczacych scian. Wszystkie wartosci sa dozwolone. Zajrzyj do settings.cfg po szczeg\xF3lowe informacje. +cycle_dist_wall_shrink_offset_help Offset wszystkich odleglosci w obliczeniach scian. Zajrzyj do settings.cfg po szczeg\xF3lowe informacje. + +# respawn relevant settings (no server supports respawning yet, but the client is prepared) +cycle_blink_frequency_help Czestotliwosc w Hz z kt\xF3ra migocze niesmiertelny cykl. +cycle_invulnerable_time_help Czas w sekundach w jakim cykl jest niesmiertelny po restarcie. +cycle_wall_time_help Czas w sekundach po jakim cykl zaczyna tworzyc za soba sciane po restarcie. +cycle_first_spawn_protection_help Ustaw na 1, jezeli zyczysz sobie, aby ustawienia niesmiertelnosci i op\xF3znienie zostawiania sciany dotyczyly tez pierwszego, poczatkowego startu cykli. + +#******************************************** +#******************************************** +# +# Game rules configuration items +# +#******************************************** +#******************************************** + +# map file +map_file_help Plik mapy uzywanej do gry +map_uri_help Nie dotykaj tego ustawienia! Uzywaj RESOURCE_REPOSITORY_SERVER i MAP_FILE zamiast tego! +arena_axes_help W ilu kierunkach moze jechac cykl. 4 - domyslne, 6 to hexatron. +resource_repository_client_help URI kt\xF3rego uzywa klient szukajac map, kt\xF3rych mu brakuje do gry. Lepiej nie zmieniac. +resource_repository_server_help URI kt\xF3rego uzywaja klient i serwer szukajac map, kt\xF3rych in brakuje. + +# limits +speed_factor_help Mnoznik predkosci cykli +sp_speed_factor_help Mnoznik predkosci cykli w trybie pojedynczego gracza +size_factor_help Mnoznik rozmiaru areny +sp_size_factor_help Mnoznik rozmiaru areny w trybie pojedynczego gracza + +# single player settings (used by dedicated server only) +sp_ais_help ilosc graczy AI w trybie pojedynczego gracza + +start_new_match_help Rozpoczyna nowy mecz + +# ladder and highscore rules +ladder_min_bet_help Minimalny wynik, potrzebny do zostania umieszczonym w rankingu +ladder_percent_bet_help Procent Twojego wyniku, kt\xF3ry umieszczasz w rankingu. +ladder_tax_help Procent Twojego wyniku w rankingu, kt\xF3ry jestes winien fiskusowi :-) +ladder_lose_percent_on_load_help Procent wyniku w rankingu tracony przy kazdym zaladowaniu +ladder_lose_min_on_load_help Minimalna ilosc punkt\xF3w w rankingu tracona przy kazdym zaladowaniu + +ladder_gain_extra_help Zalezny od pinga dodatkowy bonus do rankingu jaki otrzymuje zwyciezca + +real_arena_size_factor_help Aktualny rozmiar areny. Zostaw te wartosc! Zmieniaj size_factor. +real_cycle_speed_factor_help Aktualna predkosc cykli. Zostaw te wartosc! Zmieniaj speed_factor. + +sp_win_zone_min_round_time_help Minimalna liczba sekund jaka musi uplynac od poczatku rundy, aby mogla zostac aktywowana strefa wygranej w trybie pojedynczego gracza +sp_win_zone_min_last_death_help Minimalna liczba sekund jaka musi uplynac od ostatniej smierci, aby mogla zostac aktywowana strefa wygranej w trybie pojedynczego gracza +win_zone_min_round_time_help Minimalna liczba sekund jaka musi uplynac od poczatku rundy, aby mogla zostac aktywowana strefa wygranej +win_zone_min_last_death_help Minimalna liczba sekund jaka musi uplynac od ostatniej smierci, aby mogla zostac aktywowana strefa wygranej +win_zone_expansion_help Predkosc ekspansji strefy wygranej +win_zone_initial_size_help Poczatkowy rozmiar strefy wygranej +win_zone_deaths_help Wartosc = 1 zmienia strefe wygranej w strefe smierci. +win_zone_randomness_help Losowosc startowego polozenia strefy wygranej. 0 umieszcza ja zawsze na srodku, 1 rozmieszcza ja losowo po calej mapie. + +game_timeout_help Podstawowy limit czasowy dla synchronizacji; oznacza dokladny czas pomiedzy rundami. +last_chat_break_time_help Czas ostatniej rundy, na jaki gracz prowadzacy rozmowe moze zatrzymac gre. +extra_round_time_help Dlugosc dodatkowej przerwy na poczatku rundy. +player_chat_wait_max_help Maksymalny czas w sekundach w jakim czeka sie na pojedynczego gracza, az skonczy rozmawiac. +player_chat_wait_fraction_help Maksymalny poslizg czasu w sekundach w jakim czeka sie na pojedynczego gracza, az skonczy rozmawiac . +player_chat_wait_single_help Ustaw na 1, jesli powinno sie czekac tylko na jednego rozmawiajacego gracza. +player_chat_wait_teamleader_help Ustaw na 1, jezeli zyczysz sobie aby tylko kapitanowie druzyn mogli zatrzymywac czas gry rozmawiajac. + +wait_for_external_script_help Pozw\xF3l serwerowi oczekiwac pomiedzy rundami na skrypty. + +wait_for_external_script_timeout_help Jezeli serwer sostal zatrzymany przez skrypt na czes dluzszy niz ta wartosc (w sekundach), wymus rozpoczecie gry. + +chatter_remove_time_help Czas w sekundach, po jakim ciagle rozmawiajacy gracz jest usuwany z gry. +idle_remove_time_help Czas w sekundach, po jakim nieaktywny gracz jest usuwany z gry. +idle_kick_time_help Czas w sekundach, po jakim nieaktywny gracz jest wykopywany z serwera. + +#******************************************** +#******************************************** +# +# Player Configuration items +# +#******************************************** +#******************************************** + +player_name_confitem_help Imie Gracza +player_user_confitem_help Globalny ID Gracza +auto_login_confitem_help Czy ten gracz powinien automatycznie prosic o autentykacje? +camcenter_help Automatycznie ustaw kamere wewnetrzna zgodnie z kierunkiem jazdy. +start_cam_help Poczatkowa kamera +start_fov_help Poczatkowy zasieg widoku +allow_cam_help Pozw\xF3l/zabron graczom uzycie innych kamer +instant_chat_string_help Szybki Chat dostepny przy nacisnieciu jednego klawisza +name_team_after_player_help Jesli wybrane, druzyny beda nosic nazwy po ich liderach. +fav_num_per_team_player_help Ulubiona ilosc graczy na druzyne +spectator_mode_help Ustawia tryb obserwatora temu graczu. +auto_incam_help Automatycznie przelacza na kamere wewnetrzna w labiryncie +camwobble_help Pozwala kamerze wewnetrznej pochylac sie razem z Twoim cyklem. + +color_b_help Czesc niebieska koloru gracza - sciany i cyklu. +color_g_help Czesc zielona koloru gracza - sciany i cyklu. +color_r_help Czesc czerwona koloru gracza - sciany i cyklu. + +#******************************************** +#******************************************** +# +# Convenience +# +#******************************************** +#******************************************** + +history_size_console_help Ilosc linii trzymanych w historii konsoli. +history_size_chat_help Ilosc linii trzymanych w historii chatu. + +#******************************************** +#******************************************** +# +# Spam protection +# +#******************************************** +#******************************************** + +ping_flood_time_10_help Minimalny dozwolony czas na otrzymanie 10 pakiet\xF3w ping z jednego komputera. +ping_flood_time_20_help Minimalny dozwolony czas na otrzymanie 20 pakiet\xF3w ping z jednego komputera. +ping_flood_time_50_help Minimalny dozwolony czas na otrzymanie 50 pakiet\xF3w ping z jednego komputera. +ping_flood_time_100_help Minimalny dozwolony czas na otrzymanie 100 pakiet\xF3w ping z jednego komputera. +ping_flood_global_help Czasy z PING_FLOOD_TIME_X, pomnozone przez te wartosc, licza pingi dla wszystkich komputer\xF3w. Ujemne wartosci wylacza ochrone przed pingfloodem. + +spam_protection_repeat_help Minimalny odstep czasowy pomiedzy dwiema identycznymi wiadomosciami tekstowymi. +spam_protection_help Minimalny odstep czasowy pomiedzy kolejnymi wiadomosciami, ochrona przez spamem. +spam_protection_vote_help Mnoznik do SPAM_PROTECTION dotyczacy glosowan. +spam_protection_chat_help Mnoznik do SPAM_PROTECTION dotyczacy wiadomosci tekstowych. +spam_penalty_help Ilosc sekund, na jaka ma zostac wyciszony spamer. +spam_maxlen_help Maksymalna dlugosc wiadomosci tekstowej. +spam_autokick_help Ilosc spamu, po kt\xF3rej gracz zostanie automatycznie wykopany. +spam_autokick_count_help Ilosc ostrzerzen jaka otrzyma spamer przed wykopaniem. +silence_all_help Jezeli 1, to nowi gracze beda od poczatku wyciszeni. +enable_chat_help Jezeli 0, wszystkie wiadomosci tekstowe beda magazynowane (jezeli zostana zmienione na serwerze, to te zapamietane na komputerach graczy nie ulegna zmianie) +allow_team_change_help Jesli ustawione na 1, to kazdy gracz bedzie m\xF3gl wg. Wlasnego uznania zmieniac druzyne. W przeciwnym wypadku gracze beda mogli to robic tylko wtedy, gdy otrzymaja specjalne pozwolenie tzn. ustawienie ALLOW_TEAM_CHANGE_PLAYER + +# spam kick messages +spam_chat Rozmawiales za duzo. +spam_teamchage Zbyt czesto zmieniales druzyny. +spam_vote_kick_issue Zglaszales zbyt duzo ankiet. +spam_vote_rejected Zbyt wiele Twoich glos\xF3w zostalo odrzuconych. + +#******************************************** +#******************************************** +# +# Cheat protection +# +#******************************************** +#******************************************** + +allow_enemies_same_ip_help Pozwala walczyc dw\xF3m graczom o tym samym IP. +allow_enemies_same_client_help Pozwala na gre dw\xF3m graczom z tego samego klienta. + +allow_control_during_chat_help Pozwala graczowi wpisywac komendy podczas rozmowy. + +allow_imposters_help Jezeli ustawione na 1, to gracze o tej samej nazwie beda tolerowani. W przeciwnym wypadku wszyscy opr\xF3cz jednego beda automatycznie zmieniac nazwe. +allow_impostors_help Jezeli ustawione na 1, to gracze o tej samej nazwie beda tolerowani. W przeciwnym wypadku wszyscy opr\xF3cz jednego beda automatycznie zmieniac nazwe. + +#******************************************** +#******************************************** +# +# Lag compensation +# +#******************************************** +#******************************************** + +lag_max_speedup_timer_help Maksymalne zwiekszenie predkosci czasu, podczas rekompenowania lagu. + +lag_slow_time_help Skala czasu, w kt\xF3rym powolny lag zanika. + +lag_fast_time_help Skala czasu, w kt\xF3rym szybki lag zanika. + +lag_slow_weight_help Dodatkowa waga doniesien o lagu z serwera o powolnej rekompensacie lagu. + +lag_fast_weight_help Dodatkowa waga doniesien o lagu z serwera o szybkiej rekompensacie lagu. + +lag_credit_help Maksymalny czas zapozyczenia laga. + +lag_credit_single_help Maksymalny czas zapozyczenia laga na kazde zdarzenie. + +lag_sweet_spot_help Punkt, ilosc zapozyczenia laga, na kt\xF3rej serwer chce utrzymac klienta. + +lag_credit_time_help Skala czasu, w kt\xF3rym splacane jest zapozyczenia laga. + +lag_offset_client_help Dodatkowa ilosc rekompensaty laga, okreslana przez klienta. + +lag_offset_server_help Dodatkowa ilosc rekompensaty laga, okreslana przez serwer. + +lag_offset_legacy_help Dodatkowa ilosc rekompensaty laga dla klient\xF3w starszych wersji, kt\xF3rzy nie potrafia poprawnie rekompensowac laga, okreslana przez sewrer. + +#******************************************** +#******************************************** +# +# Banning +# +#******************************************** +#******************************************** + +network_min_ban_help Minimalny okres,czasu, na jaki moze zostac zbanowany uzytkownik. + +network_autoban_offset_help Automatycznie banuj graczy na NETWORK_AUTOBAN_FACTOR * ( kph - NETWORK_AUTOBAN_OFFSET ) minut kiedy zostana wykopani; kph to srednia ilosc wykopan na godzine. +network_autoban_factor_help Automatycznie banuj graczy na NETWORK_AUTOBAN_FACTOR * ( kph - NETWORK_AUTOBAN_OFFSET ) minut kiedy zostana wykopani; kph to srednia ilosc wykopan na godzine. +network_autoban_max_kph_help Maksymalna wartosc kph, wykonan na godzine. + +network_spectator_time_help Jezeli ustawione na wiecej niz zero, to bedzie maksymalny czas w sekundach, w ciagu kt\xF3rego tolerowany jest klient bez graczy. + +#******************************************** +#******************************************** +# +# Voting settings +# +#******************************************** +#******************************************** + +vote_use_server_controlled_kick_help Ustaw na jeden, jezeli chcesz uzyc ulepszonego sterowania ankietami przez serwer. +voting_timeout_help Czas trwania ankiety. +voting_timeout_per_voter_help Dodatek do VOTING_TIMEOUT dla kazdego ankietowanego. +allow_voting_help Jesli 1, gracze beda mogli glosowac. +allow_voting_spectator_help Jesli 1, obserwatorzy beda mogli glosowac. +min_voters_help Ilosc graczy mogacych glosowac, jaka musi byc podlaczona, aby mozna bylo utworzyc ankiete. +max_votes_help Maksymalna ilosc ankiet, jakie moga byc aktywne w danej chwili. +votes_cancel_help Anuluj wszystkie aktywne ankiety. +max_votes_per_voter_help Maksymalna ilosc ankiet wyslanych przez jednego gracza, jakie moga byc aktywne w danej chwili. +voting_start_decay_help Ilosc sekund, po kt\xF3rych ci, co nie glosowani sa ignorowani. +voting_decay_help Jeden z nie glosujacych zostaje ignorowany po uplywie tylu sekund, ile tu ustawiono. +voting_bias_help Dodaj wirtualnych glosujacych, kt\xF3rzy przeciwstawia sie kazdej zmianie. +voting_bias_kick_help Dodaj wirtualnych glosujacych, przeciwstawajacych sie wszystkim ankietom dotyczacym wykopania graczy. +voting_bias_suspend_help Dodaj wirtualnych glosujacych, przeciwstawajacych sie wszystkim ankietom dotyczacym zawieszenia graczy. +voting_bias_include_help Dodaj wirtualnych glosujacych, przeciwstawajacych sie wszystkim ankietom dotyczacym dolaczenia pliku. +voting_bias_command_help Dodaj wirtualnych glosujacych, przeciwstawajacych sie wszystkim ankietom dotyczacym wykonania komendy na serwerze. + +voting_privacy_help Kontrola prywatnosci ankiet. 2: nic nie jest pokazywane 1: nadeslanie ankiety jest widoczne dla administratora 0: glosowanie jest widoczne dla administratora -1: nadeslanie ankiety jest publiczne -2: wszystko jest publiczne +voting_spam_issue_help Poziom spamu dla nadsylania ankiet. +voting_spam_reject_help Poziom spamu dla odrzucania ankiet. + +voting_harm_time_help Minikalny czas (w sekundach) pomiedzy dwiema zlosliwymi ankietami dotyczacymi tego samego gracza. +voting_kick_time_help Minimalny odstep czasu pomiedzy ankietami dotyczacymi wykopania tego samego gracza. +voting_maturity_help Czas w sekundach, po jakim swiezo podlaczony do serwera gracz moze zaczac wysylac ankiety. + +voting_suspend_rounds_help Ilosc rund na kt\xF3ra zawieszany jest gracz (po glosowaniu). + +voting_kick_minharm_help Minimalna ilosc zlosliwych ankiet przeciw graczowi (zawieszenie, wykopanie) kt\xF3re musza zostac zgloszone (sukces nie jest konieczny), aby gracz zostal faktycznie wykopany, po ankiecie dotyczacej wykopania tego gracza (w przeciwnym razie ten gracz jest po prostu zawieszany) + +votes_suspend_help Zawiesza glosowanie na n minut. + +votes_suspend_default_help Domyslna wartosc dla VOTES_SUSPEND. + +votes_unsuspend_help Pozw\xF3l ponowanie na glosowaniae. +voting_suspended Glosowanie zostalo zawieszone na nastepne \1 min..\n +voting_unsuspended Glosowanie jest ponownie dozwolone.\n +vote_rejected_voting_suspended Glosowanie zostalo zawieszone przez administartora..\n + +#******************************************** +#******************************************** +# +# Name Display +# +#******************************************** +#******************************************** + +fadeout_name_delay_help Czas, w jakim zanikaja nazwy graczy. 0 jesli maja w og\xF3le nie byc wyswietlane lub -1 jesli maja byc pokazane zawsze. +show_own_name_help Czy Twoje imie powinno byc wyswietlane nad Twoim cyklem? + +#******************************************** +#******************************************** +# +# Recording and playback +# +#******************************************** +#******************************************** + +recording_debuglevel_help Poziom dodatkowych informacji, jakie sa nagrywane. +fast_forward_maxstep_help Maksymalny czas nagrania pomiedzy poszczeg\xF3lnymi wyswietlanymi klatkami przy przewijaniu. +fast_forward_maxstep_real_help Maksymalny rzeczywisty czas pomiedzy poszczeg\xF3lnymi wyswietlanymi klatkami przy przewijaniu. +fast_forward_maxstep_rel_help Maksymalny poslizg czasu, jaki zostal do konca trybu przewijania pomiedzy wyswietlanymi klatkami. + +#******************************************** +#******************************************** +# +# Camera Configuration items +# +#******************************************** +#******************************************** + +camera_forbid_smart_help Zabrania klientom uzycia kamery Sprytnej +camera_forbid_in_help Zabrania klientom uzycia kamery Wewnetrznej +camera_forbid_free_help Zabrania klientom uzycia kamery Wolnej +camera_forbid_follow_help Zabrania klientom uzycia kamery Zewnetrznej +camera_forbid_custom_help Zabrania klientom uzycia kamery Wlasnej +camera_forbid_server_custom_help Zabrania klientom uzycia kamery Wlasnej Serwera + +camera_forbid_custom_glance_help Zabrania ustawien spojrzen kamery wlasnej +camera_override_custom_glance_help Nadpisz ustawienia spojrzen kamery wlasnej ustawieniami serwera. +camera_override_custom_glance_server_custom_help Nadpisz ustawienia spojrzen kamery wlasnej serwera ustawieniami serwera. + +camera_follow_start_x_help Pozycja poczatkowa kamery Zewnetrznej +camera_follow_start_y_help Pozycja poczatkowa kamery Zewnetrznej +camera_follow_start_z_help Pozycja poczatkowa kamery Zewnetrznej + +camera_smart_start_x_help Pozycja poczatkowa Sprytnej kamery +camera_smart_start_y_help Pozycja poczatkowa Sprytnej kamery +camera_smart_start_z_help Pozycja poczatkowa Sprytnej kamery +camera_smart_glance_custom_help Uzyj ustawien kamery Wlasnej do spogladania w boki przy pomocy kamery Sprytnej +camera_smart_glance_custom_text Wlasne spogladanie + +camera_free_start_x_help Pozycja poczatkowa Wolnej kamery +camera_free_start_y_help Pozycja poczatkowa Wolnej kamery +camera_free_start_z_help Pozycja poczatkowa Wolnej kamery + +camera_custom_back_help Pozycja kamery Wlasnej: jak daleko za cyklem sie znajduje? +camera_custom_rise_help Pozycja kamery Wlasnej: jak wysoko nad cyklem sie znajduje? +camera_custom_back_fromspeed_help Ta wartosc jest mnozona przez aktualna predkosc cyklu i dodawana do CAMERA_CUSTOM_BACK. +camera_custom_rise_fromspeed_help Ta wartosc jest mnozona przez aktualna predkosc cyklu i dodawana do CAMERA_CUSTOM_RISE. +camera_custom_pitch_help Pozycja kamery Wlasnej: jak bardzo patrzy w g\xF3re/d\xF3l? +camera_custom_zoom_help Pozycja kamery Wlasnej: jak bardzo przyblizona jest do Twojego cyklu na poczatku rundy (aby pokazac formacje druzyny)? +camera_custom_turn_speed_help Predkosc, z jaka obraca sie kamera Wlasna. +camera_custom_turn_speed_180_help Dodatkowy mnoznik do CAMERA_CUSTOM_TURN_SPEED po nawrocie. +camera_in_turn_speed_help Predkosc, z jaka obraca sie kamera wewnetrzna. + +camera_server_custom_back_help Pozycja kamery Wlasnej: jak daleko za cyklem sie znajduje? +camera_server_custom_rise_help Pozycja kamery Wlasnej: jak wysoko nad cyklem sie znajduje? +camera_server_custom_back_fromspeed_help Ta wartosc jest mnozona przez aktualna predkosc cyklu i dodawana do CAMERA_SERVER_CUSTOM_BACK. +camera_server_custom_rise_fromspeed_help Ta wartosc jest mnozona przez aktualna predkosc cyklu i dodawana do CAMERA_SERVER_CUSTOM_RISE. +camera_server_custom_pitch_help Pozycja kamery Wlasnej: jak bardzo patrzy w g\xF3re/d\xF3l? +camera_server_custom_turn_speed_help Predkosc, z jaka obraca sie kamera Wlasna Serwera. Jesli mniejsze niz zero, to ustawienia obrotu zostana wziete od klienta. +camera_server_custom_turn_speed_180_help Dodatkowy mnoznik do CAMERA_SERVER_CUSTOM_TURN_SPEED po nawrocie. + +camera_glance_back_help Poloznienie kamery Zerkajacej: jak bardzo za cyklem ma sie znajdowac? +camera_glance_rise_help Poloznienie kamery Zerkajacej: jak bardzo nad cyklem ma sie znajdowac? +camera_glance_back_fromspeed_help Ta wartosc jest mnozona przez aktualna predkosc i dodawana do CAMERA_GLANCE_BACK. +camera_glance_rise_fromspeed_help Ta wartosc jest mnozona przez aktualna predkosc i dodawana do CAMERA_GLANCE_RISE. +camera_glance_pitch_help Poloznienie kamery Zerkajacej: jak bardzo patrzy w g\xF3re/d\xF3l? +camera_server_glance_back_help Poloznienie kamery Zerkajacej serwera: jak bardzo za cyklem ma sie znajdowac? +camera_server_glance_rise_help Poloznienie kamery Zerkajacej serwera: jak bardzo nad cyklem ma sie znajdowac? +camera_server_glance_rise_fromspeed_help Ta wartosc jest mnozona przez aktualna predkosc i dodawana do CAMERA_SERVER_GLANCE_RISE. +camera_server_glance_back_fromspeed_help Ta wartosc jest mnozona przez aktualna predkosc i dodawana do CAMERA_SERVER_GLANCE_BACK. +camera_server_glance_pitch_help Poloznienie kamery Zerkajacej: jak bardzo patrzy w g\xF3re/d\xF3l? + +#This few translations below looks unsurely of me, if you can, repair them. Szczerze m\xF3wiac, nie mam pojecia o co w nich chodzi. +# The speed the external visibility targets recovers from wall hits +camera_visibility_recovery_speed_help Predkosc, z jaka zewnetrzny cel widocznosci chroni sie przed scianami +# The distance the visibility targets keep from walls +camera_visibility_wall_distance_help Odlglosc, z jaka cel widzialnosci trzyma sie od sciany. +# Speed with wich the visibility targets is brought into view +camera_visibility_clip_speed_help Predkosc z jaka cele widocznosci sa przyciagane na widok. +# Distance (measured in seconds, gets multiplied by speed) of the visibility targets from the watched object +camera_visibility_extension_help Odleglosc (wyrazona w sekundach, jest mnozona przez aktualna predkosc) cel\xF3w widocznosci od ogladanych obiekt\xF3w +# Extra forward component of the sideways visibility targets ??? tego totalnie nie rozumiem +camera_visibility_sideskew_help Dotatkowa przednia skladowa cel\xF3w widocznosci (?). + +camera_visibility_lower_wall_help Jezeli ustawione na 1, sciany beda pomniejszane, jesli blokuja widok, a kamera sie nie porusza. +camera_visibility_lower_wall_smart_help Calkiem jak CAMERA_VISIBILITY_LOWER_WALL, ale to ustawienie ma sie specjalnie do Sprytnej kamery. +bug_transparency_help Niedostarczane: rysuj wszystkie sciany krawedzi jako p\xF3lprzezroczyste. +bug_transparency_demand_help Niedostarczane: zwiekszaj przezroczystosc zamiast obnizac sciany po smierci gracza. + +#******************************************** +#******************************************** +# +# Network Configuration items +# +#******************************************** +#******************************************** + +custom_server_name_help Nazwa serwera, do kt\xF3rego podlaczyc +dedicated_idle_help Po uruchomieniu na ten czas (w godz.), serwer dedykowany sie wylaczy. +dedicated_fps_help Maksymalna ilosc krok\xF3w symulacji, jaka bedzie przeprowadzal serwer dedykowany + +dedicated_fps_idle_factor_help Ilosc razy przypadajacych na kazda klatke, ile serwer powinien sprawdzac, czy symulacja moze bycz robiona, jezeli nie ma zadnch danych z sieci. +talk_to_master_help Czy wyslac informacje o tym serwerze do Internetu? +max_out_rate_help Maksymalna wyjsciowa ilosc kb/s. +max_in_rate_help Maksymalna wejsciowa ilosc kb/s. +ping_charity_help Dopuszczalna przez Ciebie r\xF3znica pomiedzy Twoim pingiem, a pingiem innych graczy. +ping_charity_max_help Opcja serwera: maksymalna wartosc zr\xF3wnania pinga. Ustaw 0 aby uniknac blyskawicznych smierci. Aktywne tylko, gdy klienci sa w wersji 0.2.8.3lub nowszej. +ping_charity_min_help Opcja serwera: minimalna wartosc zr\xF3wnania pinga. Uzyj, aby wymusic gre fair. Aktywne tylko, gdy klienci sa w wersji 0.2.8.3lub nowszej. +ping_charity_server_help Nie zmieniaj: maksymalna kompensacja pingu dla serwera. +big_brother_help Czy juz wyslalismy informacje wielkiemu bratu? +server_name_help Nazwa tego serwaera +server_options_help Kr\xF3tki opis opcji tego serwera +server_ip_help IP, na kt\xF3rym nasluchuje ten serwer + +server_dns_help Jesli Tw\xF3j serwer ma zmienne IP i ustawisz DNS tak, aby zawsze do niego prowadzil, mozesz ustawic te zmienna na nazwe DNS, aby pom\xF3c klientom zapamietac adres Twojego sewera, nawet gdy zmieni mu sie IP. +server_port_help Port, na kt\xF3rym nasluchuje serwer +client_port_help Port, na kt\xF3rym pr\xF3bujemy sie polacznyc +max_clients_help Maksymalna ilosc klient\xF3w + +max_clients_limit Ostrzerzenie: MAX_CLIENTS nie moze bycwikszy niz \1. Ustanienie nie uleglo zatem zmianie. +max_clients_same_ip_soft_help Maksymalna dozwolona ilosc graczy z tego samego IP; nastepni beda wykopani, gdy serwer bedzie pelny +max_clients_same_ip_hard_help Maksymalna dozwolona ilosc graczy z tego samego IP; nastepni beda ignorowani. +max_players_same_ip_help Maksymalna ilosc graczy z tego samego IP (kazdy klient moze obsluzyc az 4 graczy!) +url_help Adres internetowy powiazany z tym serwerem. + +# settings compatibility + +setting_legacy_behavior_breaking_help Domyslne zachowanie wobec starszych klient\xF3w dla ustawien, kt\xF3re sa calkowicie niezgodne ze starszym klientem i uniemozliwiaja gre. Przyklad: MAP_FILE +setting_legacy_behavior_bumpy_help Domyslne zachowanie wobec starszych klient\xF3w dla ustawien, kt\xF3re nie uniemozliwiaja gry starszym klienom, ale moga ja znacznie utrudnic (cykle skacza dookola, komendy nie wykonywane na czas). Przyklad: CYCLE_DELAY_TIMEBASED +setting_legacy_behavior_annoying_help Domyslne zachowanie wobec starszych klient\xF3w dla ustawien, kt\xF3re powoduja wylacznie drobne nieporozumienia, np. cykle przeciwnik\xF3w zatrzymuja sie na 0.1s co kazda ture. Przyklad: CYCLE_RUBBER_MINDISTANCE +setting_legacy_behavior_cheating_help Domyslne zachowanie wobec starszych klient\xF3w dla ustawien, kt\xF3re moga ulatwic oszukiwanie, jezeli nie sa ustawione na domyslna wartosc. Przyklad: DOUBLEBIND_TIME +setting_legacy_behavior_visual_help Domyslne zachowanie wobec starszych klient\xF3w dla ustawien, kt\xF3re wplywaja tylko na efekty graficzne i wyswietlanie informacji na ekranie, a nie fizyke gry. Przyklad: CYCLE_RUBBER_* (klient wyslietla miernik Rubber'a, ale nie jest od do niczego uzywany. + +#******************************************** +#******************************************** +# +# Graphics Configuration items +# +#******************************************** +#******************************************** + +png_screenshot_help Zapisuj zdjecia jako pliki PNG, a nie BMP. +white_sparks_help Rysuj iskry na bialo (zamiast w kolorze cyklu). +keep_window_active_help Nadal wyswietlaj gre, gdy okno gry straci kursor (trzymaj zawsze na wierzchu). + +# hud +show_brake_help Pokazywac w HUD miernik hamulc\xF3w? +show_alive_help Pokazywac w HUD ilosc pozostalych przeciwnik\xF3w i przyjaci\xF3l? +show_fastest_help Pokazywac w HUD najszybszego gracza? +show_hud_help Pokazywac HUD? +show_ping_help Pokazywac w HUD Tw\xF3j ping? +show_rubber_help Pokazywac w HUD miernik Rubber'a? +show_score_help Pokazywac w HUD Tw\xF3j wynik? +show_speed_help Pokazywac Predkosciomierz w HUD? +show_time_help Pokazywac w HUD aktualny czas? +show_time_24_help Pokazywac w HUD czas w 24-godzinnym formacie? +speed_gauge_locx_help Polozenie poziome Predkosciomierza +speed_gauge_locy_help Polozenie pionowe Predkosciomierza +speed_gauge_size_help Rozmiar Predkosciomierza +rubber_gauge_locx_help Polozenie poziome miernika Rubber'a +rubber_gauge_locy_help Polozenie pionowe miernika Rubber'a +rubber_gauge_size_help Rozmiar miernika Rubber'a +brake_gauge_locx_help Polozenie poziome miernika hamulc\xF3w +brake_gauge_locy_help Polozenie pionowe miernika hamulc\xF3w +brake_gauge_size_help Rozmiar miernika hamulc\xF3w +alive_locx_help Polozenie poziome informacji o pozostalych zywych graczach +alive_locy_help Polozenie pionowe informacji o pozostalych zywych graczach +alive_size_help Rozmiar informacji o pozostalych zywych graczach +fastest_locx_help Polozenie poziome informacji o najszybszym graczu +fastest_locy_help Polozenie pionowe informacji o najszybszym graczu +fastest_size_help Rozmiar informacji o najszybszym graczu +ping_locx_help Polozenie poziome wyswietlacza Ping'a +ping_locy_help Polozenie pionowe wyswietlacza Ping'a +ping_size_help Rozmiar wyswietlacza Ping'a +score_locx_help Polozenie poziome wyswietlacza wyniku +score_locy_help Polozenie pionowe wyswietlacza wyniku +score_size_help Rozmiar wyswietlacza wyniku +cm_locy_help Polozenie pionowe wysrodkowanych wiadomosci. + +#floor +grid_size_help Odstep pomiedzy liniami siatki. +grid_size_moviepack_help Odstep pomiedzy liniami siatki, kiedy paczka filmowa jest wlaczona. +floor_red_help Kolor podlogi +floor_green_help Kolor podlogi +floor_blue_help Kolor podlogi + +rim_wall_stretch_x_help Poziome rozciagniecie tekstur scian krawedziowych. +rim_wall_stretch_y_help Pionowe rozciagniecie tekstur scian krawedziowych. +rim_wall_wrap_y_help Ustaw na 1, jezeli tekstura scian krawedziowych ma sie powtarzac w pionie. + +#moviepack settings +moviepack_floor_red_help Kolor podlogi +moviepack_floor_green_help Kolor podlogi +moviepack_floor_blue_help Kolor podlogi +moviepack_wall_stretch_help Odleglosc pomiedzy pionowymi liniami paczki filmowej. +moviepack_rim_wall_stretch_x_help Poziome rozciagniecie tekstur scian krawedziowych paczki filmowej. +moviepack_rim_wall_stretch_y_help Pionowe rozciagniecie tekstur scian krawedziowych paczki filmowej. + +#detail settings +swapmode_text Tryb synchronizacji grafiki: +swapmode_help Okresla funkcje wywolywana do synchronizacji grafiki. +swapmode_fastest_text Najszybsza +swapmode_fastest_help Bez takiej funkcji. Najszybsze, i zuzywa najmniej CPU, ale moze spowodowac bledy grafiki. Uzywaj na wlasne ryzyko. +swapmode_glflush_text Flush +swapmode_glflush_help Wywoluje funkcje glFlush() do synchronizacji grafiki. Male zuzycie CPU i zapobiega bledom grafiki. To jest domyslna wartosc. +swapmode_glfinish_text Finish +swapmode_glfinish_help Wywoluje funkcje glFinish() do synchronizacji grafiki. Gwarantuje brak op\xF3znienia grafiki,ale moze spowodowac utrate klatek lub duze obciazeniu CPU na niekt\xF3rych systemach. Lepiej uzywac Flush, jesli nie dziala prawidlowo. +swap_mode_help Okresla komende uzywana do synchronizacji grafiki. 0: brak, 1: glFlush(), 2: glFinish(). + +texture_mode_0_help Tekstura podlogi: +texture_mode_1_help Tekstury scian: +texture_mode_2_help Tekstury obiekt\xF3w: +texture_mode_3_help Czcionka: + +gl_extensions_help Informacje systemowe OpenGL +gl_version_help Informacje systemowe OpenGL +gl_renderer_help Informacje systemowe OpenGL +gl_vendor_help Informacje systemowe OpenGL +alpha_blend_help Aktywuj p\xF3lprzezroczystosc + +zone_alpha_toggle_help XOR z ALPHA_BLEND okresla spos\xF3b w jaki majabyc rysowane strefy. +smooth_shading_help Aktywuj cieniowanie +text_out_help Aktywuj wyswietlanie wyjscia tekstowego/konsoli +console_columns_help Ilosc znak\xF3w w kazdej linii konsoli +console_rows_help Domyslna ilosc linii konsoli +console_rows_max_help Ilosc linii konsoli przy przewijaniu wstecz. + +console_indent_help Ilosc spaji poprzedzajacych kontynuacje linii, kt\xF3ra nie zmiescila sie w konsoli. +console_decorate_id_help Umieszcza ID gracza w kazdej linii konsoli +console_decorate_ip_help Umieszcza IP klienta w kazdej linii konsoli +console_decorate_timestamp_help Dekoruje wszystie linie w konsoli aktualna data i godzina. +console_ladder_log_help Wyswietla w konsoli informacje o rankingu + +ladderlog_decorate_timestamp_help Dekoruje wszystie linie w rankingu aktualna data i godzina. +ladderlog_write_all_help Ustwa wszystkie ustawienia LADDER_LOG_WRITE_* na te sama wartosc. +ladderlog_write_all_usage Uzycie: LADDER_LOG_WRITE_ALL 1|0 +ladderlog_write_all_enabled Aktywuj pelny widok rankingu. +ladderlog_write_all_disabled Wylacz widok rankingu. + +ladderlog_write_authority_b... [truncated message content] |
From: <baz...@us...> - 2009-01-17 12:36:08
|
Revision: 8839 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8839&view=rev Author: bazaarmagetron Date: 2009-01-17 12:35:56 +0000 (Sat, 17 Jan 2009) Log Message: ----------- author: Manuel Moos Checking for header FTGL/ftgl.h which we're using now, and which conveniently appeared right at the time all char* input started getting interpreted as UTF8 by ftgl, which we now want to rely on. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/configure.ac Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-16 17:01:30.635999918 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-17 13:23:44.414999962 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd Modified: armagetronad/branches/utf8/armagetronad/configure.ac =================================================================== --- armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-16 22:48:50 UTC (rev 8838) +++ armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-17 12:35:56 UTC (rev 8839) @@ -808,15 +808,23 @@ test -z "$FREETYPE_CONFIG" && FREETYPE_CONFIG=freetype-config FTGL_CFLAGS="`pkg-config ftgl --cflags`" +FTGL_LIBS="`pkg-config ftgl --libs`" +FTGL_ERROR="You need the library ftgl in at least version 2.1.3~rc5 to compile Armagetron. Read the file doc/install_linux.html." + AC_CHECK_LIB(ftgl,FT_Render_Glyph, CPPFLAGS="$CPPFLAGS $FTGL_CFLAGS" -LIBS="$LIBS `pkg-config ftgl --libs`" +LIBS="$LIBS $FTGL_LIBS" , -AC_MSG_ERROR([You need the library ftgl to compile Armagetron. Read the file doc/install_linux.html.]), -`pkg-config ftgl --libs` +AC_MSG_ERROR([$FTGL_ERROR]), +$FTGL_LIBS ) +AC_CHECK_HEADER(ftgl.h, +, +AC_MSG_ERROR([$FTGL_ERROR]) +) + USE_FTGL=yes # `pkg-config ftgl --cflags` doesn't reliably give the include path to FTGL itself, we are on our own finding the includes in some cases. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-17 15:19:21
|
Revision: 8840 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8840&view=rev Author: bazaarmagetron Date: 2009-01-17 15:19:05 +0000 (Sat, 17 Jan 2009) Log Message: ----------- author: mathias Merged luke-jr's new characters from the trunk. Please only add new UTF-8 chars here, they can't be used in a non-utf8 branch, anyways. Also got rid of tons of warnings about self-intersecting glyphs and path segments with extrema != endpoints. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/textures/Armagetronad.ttf armagetronad/branches/utf8/armagetronad/textures/armagetronad.sfd Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-17 13:23:44.414999962 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-17 16:07:53.852999926 +0100 committer: mathias <mathias@earth> properties: branch-nick: utf8-armagetronad-work Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i Modified: armagetronad/branches/utf8/armagetronad/textures/Armagetronad.ttf =================================================================== (Binary files differ) Modified: armagetronad/branches/utf8/armagetronad/textures/armagetronad.sfd =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-17 20:57:30
|
Revision: 8844 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8844&view=rev Author: bazaarmagetron Date: 2009-01-17 20:57:17 +0000 (Sat, 17 Jan 2009) Log Message: ----------- author: Manuel Moos Added AC_LANG(C++) in places and shuffled test for ftgl header to after freetype2 is detected, for those cases where ftgl doesn't add freetype2's include and library settings. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/configure.ac Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-17 16:07:53.852999926 +0100 committer: mathias <mathias@earth> properties: branch-nick: utf8-armagetronad-work + timestamp: 2009-01-17 20:53:31.739000082 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm Modified: armagetronad/branches/utf8/armagetronad/configure.ac =================================================================== --- armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-17 20:02:55 UTC (rev 8843) +++ armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-17 20:57:17 UTC (rev 8844) @@ -630,6 +630,8 @@ if test x$enable_armathentication = xyes; then +AC_LANG([C++]) + dnl ACX_PTHREAD([ dnl LIBS="${PTHREAD_LIBS} ${LIBS}" @@ -805,6 +807,8 @@ dnl FTGL dnl ************************************************* +AC_LANG([C++]) + test -z "$FREETYPE_CONFIG" && FREETYPE_CONFIG=freetype-config FTGL_CFLAGS="`pkg-config ftgl --cflags`" @@ -820,11 +824,6 @@ $FTGL_LIBS ) -AC_CHECK_HEADER(ftgl.h, -, -AC_MSG_ERROR([$FTGL_ERROR]) -) - USE_FTGL=yes # `pkg-config ftgl --cflags` doesn't reliably give the include path to FTGL itself, we are on our own finding the includes in some cases. @@ -874,6 +873,13 @@ AC_MSG_ERROR([You need the library freetype to compile Armagetron. Read the file doc/install_linux.html.]) ) +# FTGL again. Check for the header. +AC_CHECK_HEADER(ftgl.h, +, +AC_MSG_ERROR([$FTGL_ERROR]) +) + + # end of dedicated server if/else fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-17 20:58:26
|
Revision: 8845 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8845&view=rev Author: bazaarmagetron Date: 2009-01-17 20:58:17 +0000 (Sat, 17 Jan 2009) Log Message: ----------- author: Manuel Moos Network strings are, for now, always latin1. We can decide to activate utf8 network strings later if other plans fail. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/network/nConfig.cpp armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-17 20:53:31.739000082 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-17 21:36:29.150000095 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy Modified: armagetronad/branches/utf8/armagetronad/src/network/nConfig.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/network/nConfig.cpp 2009-01-17 20:57:17 UTC (rev 8844) +++ armagetronad/branches/utf8/armagetronad/src/network/nConfig.cpp 2009-01-17 20:58:17 UTC (rev 8845) @@ -457,7 +457,7 @@ "0.2.8.5_alpha", // 18 "0.2.8.5", // 19 "0.3.1", // 20 - "0.3.1_utf", // 21 + // "0.3.1_utf", // 21 0 }; Modified: armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp 2009-01-17 20:57:17 UTC (rev 8844) +++ armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp 2009-01-17 20:58:17 UTC (rev 8845) @@ -1101,7 +1101,11 @@ static nVersionFeature sn_ZeroMessageCrashfix( 1 ); -static nVersionFeature unicode( 21 ); +/* +// Z-Man: commented out looking for a better way, please don't delete yet until we have a proper +// different way of sending UTF8 over the network. + +static nVersionFeature unicode( 21_not_anymore_adapt_to_new_version ); static bool sn_serverSendsUnicode = false; static nSettingItemWatched<bool> sn_serverSendsUnicodeConf( "SERVER_SENDS_UTF8", sn_serverSendsUnicode, nConfItemVersionWatcher::Group_Visual, 21 ); @@ -1111,12 +1115,19 @@ // otherwise, use the setting item. return nTempVersionOverrider::Overridden() ? unicode.Supported() : sn_serverSendsUnicode; } +*/ nMessage& nMessage::operator << (const tString &ss){ tString s = ss; + /* + // Z-Man: commented out looking for a better way, please don't delete yet until we have a proper + // different way of sending UTF8 over the network. + // convert utf8 to latin1. For comments the operator >>. if ( sn_GetNetState() == nSERVER ? !ServerSendsUnicode() : !unicode.Supported(0) ) + */ + { try { @@ -1146,7 +1157,7 @@ { // no need to do a thing. utf8 passes as latin1 almost all of the time, unless // you're German or French or anything non-English. well. - con << "utf8 to latin1 conversion error!\n"; + con << "latin1 to utf8 conversion error!\n"; } } @@ -1284,10 +1295,13 @@ // to all clients once one client does not support unicode, because messages containing strings // can be broadcast. So the client has to do the conversion if only one client is online // that does not support unicode. - if ( sn_GetNetState() == nSERVER ? !unicode.Supported( SenderID() ) : !ServerSendsUnicode() ) + // if ( sn_GetNetState() == nSERVER ? !unicode.Supported( SenderID() ) : !ServerSendsUnicode() ) { s = latin1_to_utf8(s); } + /* + // Z-Man: commented out looking for a better way, please don't delete yet until we have a proper + // different way of sending UTF8 over the network. else { // the incoming string is supposed to be in utf8 format. check that, and crop it otherwise. @@ -1296,6 +1310,7 @@ if ( !utf8::is_valid( s.begin(), s.end() ) ) s = latin1_to_utf8(s); } + */ return *this; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-17 20:59:11
|
Revision: 8846 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8846&view=rev Author: bazaarmagetron Date: 2009-01-17 20:59:02 +0000 (Sat, 17 Jan 2009) Log Message: ----------- author: Manuel Moos define HAVE_FTGL_H now if single ftgl header is present (preparing to make it optional). Switching back to C mode for C library tests, some of them fail in C++ mode and pedantic CXXFLAGS. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/configure.ac Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-17 21:36:29.150000095 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-17 21:49:02.033999920 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn Modified: armagetronad/branches/utf8/armagetronad/configure.ac =================================================================== --- armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-17 20:58:17 UTC (rev 8845) +++ armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-17 20:59:02 UTC (rev 8846) @@ -874,8 +874,7 @@ ) # FTGL again. Check for the header. -AC_CHECK_HEADER(ftgl.h, -, +AC_CHECK_HEADERS(ftgl.h,, AC_MSG_ERROR([$FTGL_ERROR]) ) @@ -890,6 +889,8 @@ dnl AC_CHECK_LIB(g++, main,, dnl AC_MSG_WARN([C++ standard library not found. You can ignore this warning on non-GNU-systems.])) +AC_LANG([C]) + AC_CHECK_LIB(z, main,, AC_MSG_ERROR([You need libz to compile Armagetron.])) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-17 22:55:21
|
Revision: 8847 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8847&view=rev Author: bazaarmagetron Date: 2009-01-17 21:56:51 +0000 (Sat, 17 Jan 2009) Log Message: ----------- author: Manuel Moos With only a little bit of macros, made it possible to switch between feeding FTGL utf8 or wchar strings. Triggered by existence of ftgl.h header currently, which is not exactly optimal (its existence only says a UTF8 capable FTGL was installed in the past). Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp armagetronad/branches/utf8/armagetronad/src/render/rFont.h Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-17 21:49:02.033999920 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-17 22:47:25.974999905 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-17 20:59:02 UTC (rev 8846) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-17 21:56:51 UTC (rev 8847) @@ -36,7 +36,20 @@ #ifndef DEDICATED #include "rRender.h" #include "rTexture.h" + +#ifdef HAVE_FTGL_H +// single include. practical. #include <ftgl.h> +#else +// alternative includes go here +#include <FTGLPixmapFont.h> +#include <FTGLBitmapFont.h> +#include <FTGLTextureFont.h> +#include <FTGLPolygonFont.h> +#include <FTGLOutlineFont.h> +#include <FTGLExtrdFont.h> +#endif + //#include <GL/gl> //#include <SDL> @@ -44,14 +57,23 @@ #include <iconv.h> #include <errno.h> -//! like wcsnlen, but that's nonstandard :-( -static size_t my_wcsnlen(wchar_t const *c, size_t i) { - wchar_t const *begin = c; - wchar_t const *end = c + i; +//! like strnlen, but that's nonstandard :-( +//! also replaces the equally nonstandard wcsnlen. +static size_t my_strnlen(FTGL_CHAR const * c, size_t i) { + FTGL_CHAR const *begin = c; + FTGL_CHAR const *end = c + i; for(; *c && c != end; ++c) ; return c - begin; } +// more defines for interface with FTGL +#ifdef FTGL_HAS_UTF8 +// string compare +#define my_strncmp strncmp +#else +#define my_strncmp wcnncmp + +// conversion functions utf8->wstring wchar_t sr_utf8216(tString::const_iterator &c, tString::const_iterator const &end) { unsigned char char1 = *c; if(char1 < 128) { @@ -134,6 +156,7 @@ out += sr_utf8216(c, in.end()); } } +#endif // FTGL_HAS_UTF8 int sr_fontType = sr_fontTexture; static tConfItem< int > sr_fontTypeConf( "FONT_TYPE", sr_fontType, &sr_ReloadFont); @@ -158,10 +181,10 @@ } } */ - float GetWidth(std::wstring const &str, float height) { + float GetWidth(FTGL_STRING const &str, float height) { return GetFont(height).Advance(str.c_str())/sr_screenWidth*2.; } - void Render(std::wstring const &str, float height, tCoord const &where) { + void Render(FTGL_STRING const &str, float height, tCoord const &where) { //std::cerr << "len: " << str.size() << std::endl; if(sr_fontType >= sr_fontTexture) { glPushMatrix(); @@ -196,7 +219,7 @@ return New(size); } } - void BBox(std::wstring const &str, float height, tCoord where, float &l, float &b, float &r, float &t) { + void BBox(FTGL_STRING const &str, float height, tCoord where, float &l, float &b, float &r, float &t) { if(sr_fontType != sr_fontOld) { float rubbish; GetFont(height).BBox(str.c_str(), l, b, rubbish, r, t, rubbish); @@ -336,7 +359,7 @@ void rTextField::FlushLine(int len,bool newline){ #ifndef DEDICATED float realTop = top-y*cheight; - std::wstring str(buffer.substr(realx, len)); + FTGL_STRING str(buffer.substr(realx, len)); realx += len; if (len >= cursorPos && cursorPos >= 0) { cursor_y=realTop; @@ -420,7 +443,7 @@ FlushLine(buffer.size()-realx,newline); } -inline void rTextField::WriteChar(wchar_t c) +inline void rTextField::WriteChar(FTGL_CHAR c) { switch(c){ case('\n'): @@ -471,19 +494,19 @@ } */ -rTextField & rTextField::StringOutput(const wchar_t * c, ColorMode colorMode) +rTextField & rTextField::StringOutput(const FTGL_CHAR * c, ColorMode colorMode) { #ifndef DEDICATED //float currentWidth = nextx - left; float const &maxWidth = width; bool lastIsNewline = true; bool trouble = false; // Do we have a word that won't fit on a line? - static std::wstring spaces; + static FTGL_STRING spaces; // run through string while (*c!='\0') { - if (trouble && !(*c=='0' && my_wcsnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE)) { - std::wstring str; + if (trouble && !(*c=='0' && my_strnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE)) { + FTGL_STRING str; str += *c; currentWidth += sr_Font.GetWidth(str, cheight); if(isspace(*c)) { @@ -505,11 +528,11 @@ { lastIsNewline = false; // count number of nonblank characters following - wchar_t const * nextSpace = c+1; + FTGL_CHAR const * nextSpace = c+1; int wordLen = 0; while ( *nextSpace != '\0' && *nextSpace != '\n' && !isblank(*nextSpace) ) { - if (*nextSpace=='0' && my_wcsnlen(nextSpace, 8)>=8 && nextSpace[1]=='x' && colorMode != COLOR_IGNORE ) + if (*nextSpace=='0' && my_strnlen(nextSpace, 8)>=8 && nextSpace[1]=='x' && colorMode != COLOR_IGNORE ) { // skip color code nextSpace += 8; @@ -521,7 +544,7 @@ wordLen++; } } - std::wstring str(c, nextSpace); + FTGL_STRING str(c, nextSpace); //TODO: fix //str = tColoredString::RemoveColors(str.c_str()); float wordWidth = sr_Font.GetWidth(str, cheight); @@ -564,22 +587,22 @@ //} // detect presence of color code - if (*c=='0' && my_wcsnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE ) + if (*c=='0' && my_strnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE ) { tColor color; bool use = false; - wchar_t const resett[] = { - static_cast<wchar_t>('0'), - static_cast<wchar_t>('x'), - static_cast<wchar_t>('R'), - static_cast<wchar_t>('E'), - static_cast<wchar_t>('S'), - static_cast<wchar_t>('E'), - static_cast<wchar_t>('T'), - static_cast<wchar_t>('T'), + FTGL_CHAR const resett[] = { + static_cast<FTGL_CHAR>('0'), + static_cast<FTGL_CHAR>('x'), + static_cast<FTGL_CHAR>('R'), + static_cast<FTGL_CHAR>('E'), + static_cast<FTGL_CHAR>('S'), + static_cast<FTGL_CHAR>('E'), + static_cast<FTGL_CHAR>('T'), + static_cast<FTGL_CHAR>('T'), 0}; - if ( 0 ==wcsncmp(c,resett,8) ) + if ( 0 == my_strncmp(c,resett,8) ) { // color reset to default requested color = defaultColor_; @@ -622,14 +645,13 @@ return *this; } -rTextField & operator<<(rTextField &c,const std::wstring &x){ +rTextField & operator<<(rTextField &c,const FTGL_STRING &x){ return c.StringOutput(x.c_str()); } void DisplayText(REAL x,REAL y,REAL h,const char *text,sr_fontClass type,int center,int cursor,int cursorPos, rTextField::ColorMode colorMode){ #ifndef DEDICATED - static std::wstring str; - sr_utf8216(tString(text), str); + STRING_TO_FTGL( tString(text), str ); float height; float width = rTextField::GetTextLength(str, h, true, true, &height); @@ -755,8 +777,7 @@ //! @param resultingHeight address to store the number of lines (height times the number of newlines+1) //! @returns the width of the string if it was printed float rTextField::GetTextLength (tString const &utf8str, float height, bool stripColors, bool useNewline, float *resultingHeight) { - static std::wstring str; - sr_utf8216(utf8str, str); + STRING_TO_FTGL( utf8str, str ); //if(stripColors) { // return sr_Font.GetWidth(tColoredString::RemoveColors(str.c_str()), height); //TODO: Implement all the rest! //} @@ -770,7 +791,7 @@ //! @param useNewline should newlines be recognized (and the longest line be found)? //! @param resultingHeight address to store the number of lines (height times the number of newlines+1) //! @returns the width of the string if it was printed -float rTextField::GetTextLength (std::wstring const &str, float height, bool stripColors, bool useNewline, float *resultingHeight) { +float rTextField::GetTextLength (FTGL_STRING const &str, float height, bool stripColors, bool useNewline, float *resultingHeight) { //if(stripColors) { // return sr_Font.GetWidth(tColoredString::RemoveColors(str.c_str()), height); //TODO: Implement all the rest! //} @@ -798,18 +819,17 @@ } void rTextBox::SetText(tString const &utf8str) { - static std::wstring str; - sr_utf8216(utf8str, str); - typedef std::pair<tColor, std::wstring> colorText; + STRING_TO_FTGL( utf8str, str ); + typedef std::pair<tColor, FTGL_STRING> colorText; typedef std::vector<colorText> line; typedef std::vector<line> lineVector; lineVector lines; lines.push_back(line()); - lines.back().push_back(colorText(rColor(1.,1.,1.,1.), std::wstring())); - for(std::wstring::const_iterator c = str.begin(); c != str.end(); ++c) { + lines.back().push_back(colorText(rColor(1.,1.,1.,1.), FTGL_STRING())); + for(FTGL_STRING::const_iterator c = str.begin(); c != str.end(); ++c) { if(*c == '\n') { lines.push_back(line()); - lines.back().push_back(colorText(rColor(1.,1.,1.,1.), std::wstring())); + lines.back().push_back(colorText(rColor(1.,1.,1.,1.), FTGL_STRING())); continue; } if(*c == '0' && (c+1) != str.end() && c[1] == 'x') { @@ -821,7 +841,7 @@ } if(!end) { tColor color = tColor( &(*c) ); - lines.back().push_back(colorText(color, std::wstring())); + lines.back().push_back(colorText(color, FTGL_STRING())); c+=8; break; } @@ -851,7 +871,7 @@ float smallstep = false; // do 1-char steps now? while (biggest+1 < smallest) { //std::cerr << "Checking: " << i->second.substr(0, length) << std::endl; - std::wstring checkedString = i->second.substr(0, length); + FTGL_STRING checkedString = i->second.substr(0, length); float width = sr_Font.GetWidth(checkedString, m_size); if(smallstep) { if(width > targetWidth) { Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.h =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.h 2009-01-17 20:59:02 UTC (rev 8846) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.h 2009-01-17 21:56:51 UTC (rev 8847) @@ -39,6 +39,29 @@ #include <map> #include <vector> +#ifdef HAVE_FTGL_H +// also, the installed version of ftgl then has utf8 support. presumably. use it. +#define FTGL_HAS_UTF8 +#else +// alternative includes go here +#endif + +// defines for interface with FTGL +#ifdef FTGL_HAS_UTF8 +// typedefs for chars and strings +#define FTGL_CHAR char +#define FTGL_STRING std::string +// macro expecting a tString as 'in' and producing at least a 'const FTGL_STRING &' as out, living at least as long as in does. +#define STRING_TO_FTGL( in, out ) FTGL_STRING const & out = in +#else +// description: see other branch +#define FTGL_CHAR wchar_t +#define FTGL_STRING std::wstring +// function to convert utf8 to wchar strings. Only needed if utf8 is not supported natively. +void sr_utf8216(tString const &in, std::wstring &out); +#define STRING_TO_FTGL( in, out ) FTGL_STRING out; sr_utf8216(in, out) +#endif // FTGL_HAS_UTF8 + //! Different types of fonts, they might get different font files assigned enum sr_fontClass { sr_fontConsole = 00001, //!< for the console @@ -71,7 +94,7 @@ // maybe make this a child of std::ostream... class rTextField{ - std::wstring buffer; // buffer where we store stuff before we print it + FTGL_STRING buffer; // buffer where we store stuff before we print it float width; // width in openGL units int parIndent; // number of spaces to insert after automatic newline REAL left,top; // top left corner of the console @@ -162,7 +185,7 @@ COLOR_SHOW // use color codes, but print them as well }; - rTextField & StringOutput(const wchar_t *c, ColorMode colorMode = COLOR_USE ); + rTextField & StringOutput(const FTGL_CHAR *c, ColorMode colorMode = COLOR_USE ); int Lines(){ return y; @@ -179,10 +202,10 @@ static void GetBlendColor( tColor & blendColor ); //!< Gets color all other colors are multiplied with static float GetTextLength (tString const &str, float height, bool stripColors=false, bool useNewline=true, float *resultingHeight=0); //!< Predict the dimenstions of a string - static float GetTextLength (std::wstring const &str, float height, bool stripColors=false, bool useNewline=true, float *resultingHeight=0); //!< Predict the dimenstions of a string + static float GetTextLength (FTGL_STRING const &str, float height, bool stripColors=false, bool useNewline=true, float *resultingHeight=0); //!< Predict the dimenstions of a string private: - inline void WriteChar(wchar_t c); //!< writes a single character as it is, no automatic newline breaking + inline void WriteChar(FTGL_CHAR c); //!< writes a single character as it is, no automatic newline breaking }; //! Text box class with wrapping: unlike rTextField this is designed to stay in memory all the time and only re- wrap/interpret colors if the contents change @@ -196,10 +219,10 @@ class item { tCoord m_pos; //!< the top- left position of the text float m_size; //!< the color to be used - std::wstring m_text; //!< the text to be rendered + FTGL_STRING m_text; //!< the text to be rendered rColor m_color; //!< the color to be used public: - inline item(tCoord const &pos, float size, std::wstring const &text, tColor const &color); //!< default constructor + inline item(tCoord const &pos, float size, FTGL_STRING const &text, tColor const &color); //!< default constructor void Render(void) const; //!< renders the text }; float m_size; //!< the size of the font to be used @@ -213,21 +236,18 @@ //! @param size the height of the text //! @param text the text to be rendered //! @param color the color to be used -inline rTextBox::item::item(tCoord const &pos, float size, std::wstring const &text, tColor const &color) : +inline rTextBox::item::item(tCoord const &pos, float size, FTGL_STRING const &text, tColor const &color) : m_pos(pos), m_size(size), m_text(text), m_color(color) {} -void sr_utf8216(tString const &in, std::wstring &out); - -rTextField & operator<<(rTextField &c,const std::wstring &x); +rTextField & operator<<(rTextField &c,const FTGL_STRING &x); template<class T> rTextField & operator<<(rTextField &c,const T &x){ tColoredString out; out << x; - std::wstring str; - sr_utf8216(out, str); + STRING_TO_FTGL( out, str ); return c.StringOutput(str.c_str()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-17 22:55:22
|
Revision: 8848 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8848&view=rev Author: bazaarmagetron Date: 2009-01-17 21:57:51 +0000 (Sat, 17 Jan 2009) Log Message: ----------- Manuel Moos: Failed check for ftgl.h is no longer fatal. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/configure.ac Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-17 22:47:25.974999905 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-17 22:49:05.911999941 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n Modified: armagetronad/branches/utf8/armagetronad/configure.ac =================================================================== --- armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-17 21:56:51 UTC (rev 8847) +++ armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-17 21:57:51 UTC (rev 8848) @@ -874,11 +874,8 @@ ) # FTGL again. Check for the header. -AC_CHECK_HEADERS(ftgl.h,, -AC_MSG_ERROR([$FTGL_ERROR]) -) +AC_CHECK_HEADERS(ftgl.h) - # end of dedicated server if/else fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-17 23:50:24
|
Revision: 8849 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8849&view=rev Author: bazaarmagetron Date: 2009-01-17 23:50:15 +0000 (Sat, 17 Jan 2009) Log Message: ----------- Manuel Moos: Fixed function typo. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-17 22:49:05.911999941 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-18 00:43:25.638999939 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-17 21:57:51 UTC (rev 8848) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-17 23:50:15 UTC (rev 8849) @@ -71,7 +71,7 @@ // string compare #define my_strncmp strncmp #else -#define my_strncmp wcnncmp +#define my_strncmp wcsncmp // conversion functions utf8->wstring wchar_t sr_utf8216(tString::const_iterator &c, tString::const_iterator const &end) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-17 23:51:07
|
Revision: 8850 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8850&view=rev Author: bazaarmagetron Date: 2009-01-17 23:51:03 +0000 (Sat, 17 Jan 2009) Log Message: ----------- Manuel Moos: Better test for ftgl.h: check whether individual headers are deprecated first. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/configure.ac Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-18 00:43:25.638999939 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-18 00:43:42.002000093 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp Modified: armagetronad/branches/utf8/armagetronad/configure.ac =================================================================== --- armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-17 23:50:15 UTC (rev 8849) +++ armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-17 23:51:03 UTC (rev 8850) @@ -854,7 +854,7 @@ done if test ${found} = false; then - AC_MSG_RESULT(not found) + AC_MSG_RESULT([not found]) AC_MSG_ERROR([FTGL headers not found on your system. Please pass the correct location via --with-ftgl=<path to FTGL include directory>.]) fi fi @@ -873,8 +873,17 @@ AC_MSG_ERROR([You need the library freetype to compile Armagetron. Read the file doc/install_linux.html.]) ) -# FTGL again. Check for the header. -AC_CHECK_HEADERS(ftgl.h) +dnl FTGL again. Check for the headers. First, try the individual header. +dnl Use modified pedantic CXXFLAGS for that. If the headers are deprecated, +dnl the test will fail. +CXXFLAGS_SAVE="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS -Werror -pedantic" +AC_MSG_CHECKING([whether FTGLPixmapFont.h is deprecated]) +AC_TRY_COMPILE([#include <FTGLPixmapFont.h>],return 0,[AC_MSG_RESULT([no, not checking <ftgl.h>.])], +[AC_MSG_RESULT([yes]) +AC_CHECK_HEADERS(ftgl.h)] +) +CXXFLAGS="$CXXFLAGS_SAVE" # end of dedicated server if/else fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-18 02:55:41
|
Revision: 8852 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8852&view=rev Author: bazaarmagetron Date: 2009-01-18 01:47:17 +0000 (Sun, 18 Jan 2009) Log Message: ----------- author: Manuel Moos Added option to leave language files as latin1 by adding a line reading "encoding latin1" Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp armagetronad/branches/utf8/armagetronad/src/tools/tLocale.cpp armagetronad/branches/utf8/armagetronad/src/tools/tLocale.h Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-18 00:43:42.002000093 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-18 02:36:38.888000011 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs Modified: armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp 2009-01-18 00:48:12 UTC (rev 8851) +++ armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp 2009-01-18 01:47:17 UTC (rev 8852) @@ -1219,33 +1219,6 @@ s += c; } -static tColoredString latin1_to_utf8( tColoredString const & s ) -{ - try - { - tColoredString copy; - - tColoredString::const_iterator reader = s.begin(); - std::back_insert_iterator< tColoredString > writer = back_inserter(copy); - - while ( reader != s.end() ) - { - // just convert every byte of the original latin1 into utf8, unicode matches latin1 - // where latin1 is defined. - utf8::append( (unsigned char)*reader, writer ); - ++reader; - } - - return copy; - } - catch( ... ) - { - // ok, not the best error handling in the world, but actually the above code - // should never fail. - return tColoredString( "Latin1 to UTF8 conversion error" ); - } -} - nMessage& nMessage::ReadRaw(tString &s ) { s.Clear(); @@ -1297,7 +1270,7 @@ // that does not support unicode. // if ( sn_GetNetState() == nSERVER ? !unicode.Supported( SenderID() ) : !ServerSendsUnicode() ) { - s = latin1_to_utf8(s); + s = st_Latin1ToUTF8(s); } /* // Z-Man: commented out looking for a better way, please don't delete yet until we have a proper @@ -1308,7 +1281,7 @@ // no invalid utf8 string is supposed to be able to enter the system. Maybe it's just a // stray latin1 string? If not, it's set to an error string. if ( !utf8::is_valid( s.begin(), s.end() ) ) - s = latin1_to_utf8(s); + s = st_Latin1ToUTF8(s); } */ Modified: armagetronad/branches/utf8/armagetronad/src/tools/tLocale.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tools/tLocale.cpp 2009-01-18 00:48:12 UTC (rev 8851) +++ armagetronad/branches/utf8/armagetronad/src/tools/tLocale.cpp 2009-01-18 01:47:17 UTC (rev 8852) @@ -34,7 +34,36 @@ #include <fstream> #include <string> #include <map> +#include "utf8.h" +//! transform a string from latin1 to utf8 unicode +tColoredString st_Latin1ToUTF8( tString const & s ) +{ + try + { + tColoredString copy; + + tColoredString::const_iterator reader = s.begin(); + std::back_insert_iterator< tColoredString > writer = back_inserter(copy); + + while ( reader != s.end() ) + { + // just convert every byte of the original latin1 into utf8, unicode matches latin1 + // where latin1 is defined. + utf8::append( (unsigned char)*reader, writer ); + ++reader; + } + + return copy; + } + catch( ... ) + { + // ok, not the best error handling in the world, but actually the above code + // should never fail. + return tColoredString( "Latin1 to UTF8 conversion error" ); + } +} + class tLocaleSubItem; // identifies a single string in a single language static tArray<tString> st_TemplateParameters; @@ -359,12 +388,20 @@ static const tString LANGUAGE("language"); static const tString INCLUDE("include"); +static const tString ENCODING("encoding"); // static const tString CHECK("check"); +enum tEncoding +{ + tEncoding_utf8, tEncoding_latin1 +}; + void tLocaleItem::Load(const char *file, bool complete) // load the language definitions from a file { // bool check = false; { + tEncoding encoding = tEncoding_utf8; + tString f; f << "language/" << file; @@ -374,6 +411,7 @@ { while (!s.eof() && s.good()) { + // read first word (including whitespace after it) tString id; s >> id; @@ -382,18 +420,27 @@ continue; } + // read rest of line + tString rest; + rest.ReadLine(s); + if(id[0] == '#') { - tString dummy; - dummy.ReadLine(s); continue; } + // transform rest of line to utf8 if required + if ( tEncoding_latin1 == encoding ) + { + rest = st_Latin1ToUTF8( rest ); + } + + // theoretically, the identifiers would need transoding, too. But they're all ascii. + tASSERT( st_Latin1ToUTF8( id ) == id ); + if (LANGUAGE == id) { - tString lang; - lang.ReadLine(s); - currentLanguage = tLanguage::Find(lang); + currentLanguage = tLanguage::Find(rest); // delayed loading if (!complete) @@ -404,11 +451,27 @@ continue; } + if (ENCODING == id) + { + if ( "utf8" == rest ) + { + encoding = tEncoding_utf8; + } + else if ( "latin1" == rest ) + { + encoding = tEncoding_latin1; + } + else + { + tERR_ERROR( "Unsupported encoding." ); + } + + continue; + } + if (INCLUDE == id) { - tString inc; - inc.ReadLine(s); - Load(inc, complete); + Load(rest, complete); continue; } @@ -446,10 +509,10 @@ // << currentLanguage->Name() << ".\n"; } - tString pre; - pre.ReadLine(s); r->translation.Clear(); + tString & pre = rest; + for (size_t i=0; i< pre.Size(); i++) { char c = pre(i); Modified: armagetronad/branches/utf8/armagetronad/src/tools/tLocale.h =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tools/tLocale.h 2009-01-18 00:48:12 UTC (rev 8851) +++ armagetronad/branches/utf8/armagetronad/src/tools/tLocale.h 2009-01-18 01:47:17 UTC (rev 8852) @@ -36,6 +36,9 @@ class tLocaleItem; class tOutputItemBase; +//! transform a string from latin1 to utf8 unicode +tColoredString st_Latin1ToUTF8( tString const & s ); + class tLanguage: public tListItem<tLanguage> // identifies a language { tString name; //!< the language's name This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-18 19:31:49
|
Revision: 8856 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8856&view=rev Author: bazaarmagetron Date: 2009-01-18 19:31:38 +0000 (Sun, 18 Jan 2009) Log Message: ----------- Manuel Moos: Merging changes from trunk (bugfixes and hoop's zone rendering patch). Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/AUTHORS armagetronad/branches/utf8/armagetronad/acinclude.m4 armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp armagetronad/branches/utf8/armagetronad/src/engine/eVoter.cpp armagetronad/branches/utf8/armagetronad/src/network/nAuthentication.cpp armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp armagetronad/branches/utf8/armagetronad/src/network/nServerInfo.cpp armagetronad/branches/utf8/armagetronad/src/network/nServerInfo.h Added Paths: ----------- armagetronad/branches/utf8/armagetronad/src/tron/gWinZone.cpp armagetronad/branches/utf8/armagetronad/src/tron/gWinZone.h Removed Paths: ------------- armagetronad/branches/utf8/armagetronad/src/tron/gWinZone.cpp armagetronad/branches/utf8/armagetronad/src/tron/gWinZone.h Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-18 02:36:38.888000011 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-18 20:22:33.319000006 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi z-...@us...-20090112103632-yroyhl5crs8uad38 ma...@mo...-20090112112802-yk5fp7eetdy8ef48 ma...@mo...-20090112115717-sd79x6ml6zk0noom z-...@us...-20090113073533-hmwz45y2gj2ptcpk + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi z-...@us...-20090112103632-yroyhl5crs8uad38 ma...@mo...-20090112112802-yk5fp7eetdy8ef48 ma...@mo...-20090112115717-sd79x6ml6zk0noom z-...@us...-20090113073533-hmwz45y2gj2ptcpk svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8855 Modified: bzr:file-ids - + src/tron/gWinZone.h 8853@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftron%2FgWinZone.h src/tron/gWinZone.cpp 8853@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftron%2FgWinZone.cpp Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f Modified: svk:merge - 02982148-85d2-4202-9ec6-589ac3039d34:/local/armagetronad:107d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8394 7d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8715 7d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8754 + 02982148-85d2-4202-9ec6-589ac3039d34:/local/armagetronad:107d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8394 7d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8715 7d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8754 7d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8855 Modified: armagetronad/branches/utf8/armagetronad/AUTHORS =================================================================== --- armagetronad/branches/utf8/armagetronad/AUTHORS 2009-01-18 19:16:07 UTC (rev 8855) +++ armagetronad/branches/utf8/armagetronad/AUTHORS 2009-01-18 19:31:38 UTC (rev 8856) @@ -91,6 +91,9 @@ Tomas Birraux french accents in font +hoop + Zone rendering settings + External code merged in from ============================ Modified: armagetronad/branches/utf8/armagetronad/acinclude.m4 =================================================================== --- armagetronad/branches/utf8/armagetronad/acinclude.m4 2009-01-18 19:16:07 UTC (rev 8855) +++ armagetronad/branches/utf8/armagetronad/acinclude.m4 2009-01-18 19:31:38 UTC (rev 8856) @@ -863,12 +863,14 @@ else echo "*** Could not run ZThread test program, checking why..." + CC_OLD=${CC} + CC=${CXX} CXXFLAGS="$CXXFLAGS $ZTHREAD_CXXFLAGS" LIBS="$LIBS $ZTHREAD_LIBS" echo $LIBS; - AC_TRY_LINK([#include "zthread/ZThread.h"], + AC_TRY_LINK([#include "zthread/Task.h"], [ return 0; ], [ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding ZThread or finding the wrong" @@ -883,6 +885,8 @@ echo "*** exact error that occured. This usually means ZThread was incorrectly installed" echo "*** or that you have moved ZThread since it was installed. In the latter case, you" echo "*** may want to edit the zthread-config script: $ZTHREAD_CONFIG" ]) + + CC=${CC_OLD} CFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" Modified: armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp 2009-01-18 19:16:07 UTC (rev 8855) +++ armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp 2009-01-18 19:31:38 UTC (rev 8856) @@ -2181,6 +2181,8 @@ static void se_ChangeAccess( ePlayerNetID * admin, std::istream & s, char const * command, OPFUNC F ) { + bool isexplicit = false; + if ( admin->GetAccessLevel() <= se_opAccessLevel ) { ePlayerNetID * victim = se_FindPlayerInChatCommand( admin, command, s ); @@ -2204,9 +2206,9 @@ } char first; s >> first; - if ( !s.eof() && !s.fail() ) { + isexplicit = true; s.unget(); int newLevel = 0; s >> newLevel; @@ -2230,8 +2232,19 @@ accessLevel = static_cast< tAccessLevel >( level ); - if ( accessLevel > admin->GetAccessLevel() ) + if ( accessLevel == victim->GetAccessLevel() ) { + if ( isexplicit ) + { + sn_ConsoleOut( tOutput( "$access_level_op_same", command ), admin->Owner() ); + } + else + { + sn_ConsoleOut( tOutput( "$access_level_op_unclear", command ), admin->Owner() ); + } + } + else if ( accessLevel > admin->GetAccessLevel() ) + { (*F)( admin, victim, accessLevel ); } else Modified: armagetronad/branches/utf8/armagetronad/src/engine/eVoter.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/engine/eVoter.cpp 2009-01-18 19:16:07 UTC (rev 8855) +++ armagetronad/branches/utf8/armagetronad/src/engine/eVoter.cpp 2009-01-18 19:31:38 UTC (rev 8856) @@ -1369,10 +1369,7 @@ protected: virtual bool DoFillFromMessage( nMessage& m ) { - // should never be called on the client - tASSERT( sn_GetNetState() != nCLIENT ); - - // deletage + // delegate bool ret = eVoteItemHarm::DoFillFromMessage( m ); // fill in description Modified: armagetronad/branches/utf8/armagetronad/src/network/nAuthentication.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/network/nAuthentication.cpp 2009-01-18 19:16:07 UTC (rev 8855) +++ armagetronad/branches/utf8/armagetronad/src/network/nAuthentication.cpp 2009-01-18 19:31:38 UTC (rev 8856) @@ -35,6 +35,7 @@ #include "nNetwork.h" #include "nNetObject.h" #include "nSocket.h" +#include "nServerInfo.h" #include <memory> #include <string> @@ -406,6 +407,7 @@ public: nLoginProcess( int userID ) : nMachineDecorator( nMachine::GetMachine( userID ) ) + , checkAddress( true ) { // install self reference to keep this object alive selfReference_ = this; @@ -469,7 +471,7 @@ void ProcessClientAnswer( nMessage & answer ); // sanity check the server address - bool CheckServerAddress( nMessage & m ); + bool CheckServerAddress(); // and here we go again: a background task talks with the authority // and determines whether the client is authorized or not. @@ -506,6 +508,15 @@ //! pointer to self to keep the object alive while the machine exists SelfPointer selfReference_; + + //! address of socket receiving the login message + nAddress serverSocketAddress; + + //! address of login message sender + tString peerAddress; + + //! flag indicating whether the sent server address needs checking + bool checkAddress; }; @@ -897,22 +908,32 @@ // read the server address the client used for scrambling m >> serverAddress; - // sanity check it, of course :) - if ( !CheckServerAddress( m ) ) - { - // no use going on, the server address won't match, password checking will fail. - return; - } + // sanity check it later } else { serverAddress = sn_GetMyAddress(); - + if ( method.method != "bmd5" ) { con << "WARNING, client did not send the server address. Password checks may fail.\n"; } + else + { + checkAddress = false; + } } + + // store receiving socket address + nSocket const * socket = sn_Connections[m.SenderID()].socket; + if ( !socket ) + { + ReportAuthorityError( "Internal error, no receiving socket of authentication message." ); + } + serverSocketAddress = socket->GetAddress(); + + // store peer address + sn_GetAdr( m.SenderID(), peerAddress ); // and go on nMemberFunctionRunner::ScheduleMayBlock( *this, &nLoginProcess::Authorize, authority != "" ); @@ -922,51 +943,78 @@ static tSettingItem< bool > sn_TrustLANConf( "TRUST_LAN", sn_trustLAN ); // sanity check the server address -bool nLoginProcess::CheckServerAddress( nMessage & m ) +bool nLoginProcess::CheckServerAddress() { + // if no check is requested (only canm happen for old bmd5 protocol), don't check. + if ( !checkAddress ) + { + return true; + } + + // serverAddress given from client never can be *.*.*.*:*. This would + // give false positive check results because some of the methods below + // compare serverAddress to strings that may be *.*.*.*:*, and checking + // serverAddress once here is the safest and easiest way. + if ( serverAddress.StartsWith("*") ) + { + return ReportAuthorityError( tOutput("$login_error_pharm_cheap" ) ); + } + // check whether we can read our IP from the socket - nSocket const * socket = sn_Connections[m.SenderID()].socket; - if ( socket ) + tString compareAddress = serverSocketAddress.ToString(); + if ( compareAddress == serverAddress ) { - tString compareAddress = socket->GetAddress().ToString(); - if ( !compareAddress.StartsWith("*") && compareAddress == serverAddress ) - { - // everything is fine, adresses match - return true; - } + // everything is fine, adresses match + return true; } // check the incoming address, clients from the LAN should be safe if ( sn_trustLAN ) { - tString peerAddress; - sn_GetAdr( m.SenderID(), peerAddress ); if ( sn_IsLANAddress( peerAddress ) && sn_IsLANAddress( serverAddress ) ) { return true; } } - std::cout << serverAddress; + // std::cout << serverAddress; - if ( sn_GetMyAddress() == serverAddress ) + // fetch our server address. First, try the basic networking system. + tString trueServerAddress = sn_GetMyAddress(); + + if ( trueServerAddress == serverAddress ) { // all's well return true; } - tString hisServerAddress = serverAddress; - serverAddress = sn_GetMyAddress(); + // if SERVER_DNS is set, the client most likely will connect over that IP. Use it. + if ( sn_GetMyDNSName().Len() > 1 ) + { + // resolve DNS. Yes, do this every time someone logs in, IPs can change. + // after all, that's the point of setting SERVER_DNS :) + nAddress address; + address.SetHostname( sn_GetMyDNSName() ); + + address.SetPort( serverSocketAddress.GetPort() ); - // if we don't know our own address, - if ( sn_GetMyAddress().StartsWith("*") ) + // transform back to string + trueServerAddress = address.ToString(); + } + + if ( trueServerAddress == serverAddress ) { - // reject authentication. - return ReportAuthorityError( tOutput("$login_error_pharm", hisServerAddress, sn_GetMyAddress() ) ); + // all's well + return true; } + // Z-Man: can't remember what this swapping is for. Possibly to accept + // the login anyway for debugging purposes. + tString hisServerAddress = serverAddress; + serverAddress = trueServerAddress; + // reject authentication. - return ReportAuthorityError( tOutput("$login_error_pharm", hisServerAddress, sn_GetMyAddress() ) ); + return ReportAuthorityError( tOutput("$login_error_pharm", hisServerAddress, trueServerAddress ) ); } // and here we go again: a background task talks with the authority @@ -981,6 +1029,13 @@ } else { + // sanity check it server address + if ( !CheckServerAddress() ) + { + // no use going on, the server address won't match, password checking will fail. + return; + } + if ( !tRecorder::IsPlayingBack() ) { nKrawall::CheckScrambledPassword( *this, *this ); Modified: armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp 2009-01-18 19:16:07 UTC (rev 8855) +++ armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp 2009-01-18 19:31:38 UTC (rev 8856) @@ -3383,8 +3383,12 @@ // clear peer info used for receiving memset( &peers[MAXCLIENTS+1], 0, sizeof(sockaddr) ); + // copy socket info over to [MAXCLIENTS+1] and receive. The copy + // step is important, nAuthentication.cpp relies on the socket being set. if((sn_Connections[MAXCLIENTS+1].socket = (*i).CheckNewConnection() ) != NULL) + { rec_peer(MAXCLIENTS+1); + } } } // z-man: after much thought, the server does also need to listen to the Modified: armagetronad/branches/utf8/armagetronad/src/network/nServerInfo.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/network/nServerInfo.cpp 2009-01-18 19:16:07 UTC (rev 8855) +++ armagetronad/branches/utf8/armagetronad/src/network/nServerInfo.cpp 2009-01-18 19:31:38 UTC (rev 8856) @@ -2637,6 +2637,11 @@ static tConfItemLine sn_sbtip_official("SERVER_DNS", net_dns); +tString const & sn_GetMyDNSName() +{ + return net_dns; +} + // ******************************************************************************************* // * // * DoGetFrom Modified: armagetronad/branches/utf8/armagetronad/src/network/nServerInfo.h =================================================================== --- armagetronad/branches/utf8/armagetronad/src/network/nServerInfo.h 2009-01-18 19:16:07 UTC (rev 8855) +++ armagetronad/branches/utf8/armagetronad/src/network/nServerInfo.h 2009-01-18 19:31:38 UTC (rev 8856) @@ -43,6 +43,9 @@ typedef nServerInfo* (sn_ServerInfoCreator)(); +//! return the DNS name of this machine, if set +tString const & sn_GetMyDNSName(); + //! Basic server information: everything you need to connect class nServerInfoBase { Deleted: armagetronad/branches/utf8/armagetronad/src/tron/gWinZone.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tron/gWinZone.cpp 2009-01-18 19:16:07 UTC (rev 8855) +++ armagetronad/branches/utf8/armagetronad/src/tron/gWinZone.cpp 2009-01-18 19:31:38 UTC (rev 8856) @@ -1,1611 +0,0 @@ -/* - -************************************************************************* - -ArmageTron -- Just another Tron Lightcycle Game in 3D. -Copyright (C) 2000 Manuel Moos (ma...@mo...) - -************************************************************************** - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*************************************************************************** - -*/ - -#include "rSDL.h" - -#include "gWinZone.h" -#include "eFloor.h" -#include "eTimer.h" -#include "eGrid.h" -#include "gCycle.h" -#include "gGame.h" -#include "eTeam.h" -#include "ePlayer.h" -#include "rRender.h" -#include "nConfig.h" -#include "tString.h" -#include "rScreen.h" -#include "eSoundMixer.h" - -#include <time.h> -#include <algorithm> -#include <functional> -#include <deque> - -static int sg_zoneAlphaToggle = 0; -static tSettingItem<int> sg_zoneAlphaToggleConf( "ZONE_ALPHA_TOGGLE", sg_zoneAlphaToggle ); - -std::deque<gZone *> sg_Zones; - -static int sg_zoneDeath = 1; -static tSettingItem<int> sg_zoneDeathConf( "WIN_ZONE_DEATHS", sg_zoneDeath ); - -REAL sg_expansionSpeed = 1.0f; -REAL sg_initialSize = 5.0f; - -static nSettingItem< REAL > sg_expansionSpeedConf( "WIN_ZONE_EXPANSION", sg_expansionSpeed ); -static nSettingItem< REAL > sg_initialSizeConf( "WIN_ZONE_INITIAL_SIZE", sg_initialSize ); - -//! creates a win or death zone (according to configuration) at the specified position -gZone * sg_CreateWinDeathZone( eGrid * grid, const eCoord & pos ) -{ - gZone * ret = NULL; - if ( sg_zoneDeath ) - { - ret = tNEW( gDeathZoneHack( grid, pos ) ); - sn_ConsoleOut( "$instant_death_activated" ); - } - else - { - ret = tNEW( gWinZoneHack( grid, pos ) ); - if ( sg_currentSettings->gameType != gFREESTYLE ) - { - sn_ConsoleOut( "$instant_win_activated" ); - } - else - { - sn_ConsoleOut( "$instant_round_end_activated" ); - } - } - - // initialize radius and expansion speed - static_cast<eGameObject*>(ret)->Timestep( se_GameTime() ); - ret->SetReferenceTime(); - ret->SetRadius( sg_initialSize ); - ret->SetExpansionSpeed( sg_expansionSpeed ); - ret->SetRotationSpeed( .3f ); - - return ret; -} - -// number of segments to render a zone with -static const int sg_segments = 11; - -// ******************************************************************************* -// * -// * EvaluateFunctionNow -// * -// ******************************************************************************* -//! -//! @param f function to evaluate -//! @return the function's value at lastTime - referenceTime_ -//! -// ******************************************************************************* - -inline REAL gZone::EvaluateFunctionNow( tFunction const & f ) const -{ - return f( lastTime - referenceTime_ ); -} - -// ******************************************************************************* -// * -// * SetFunctionNow -// * -// ******************************************************************************* -//! -//! @param f function to modify -//! @param value value the function should have at lastTime - referenceTime_ -//! -// ******************************************************************************* - -inline void gZone::SetFunctionNow( tFunction & f, REAL value ) const -{ - f.SetOffset( value + f.GetSlope() * ( referenceTime_ - lastTime ) ); -} - -// ******************************************************************************* -// * -// * gZone -// * -// ******************************************************************************* -//! -//! @param grid Grid to put the zone into -//! @param pos Position to spawn the zone at -//! -// ******************************************************************************* - -gZone::gZone( eGrid * grid, const eCoord & pos ) - :eNetGameObject( grid, pos, eCoord( 0,0 ), NULL, true ), rotation_(1,0) -{ - // store creation time - referenceTime_ = createTime_ = lastTime = 0; - - // add to game grid - this->AddToList(); - - sg_Zones.push_back(this); - - // initialize position functions - SetPosition( pos ); - eSoundMixer* mixer = eSoundMixer::GetMixer(); - mixer->PushButton(ZONE_SPAWN, pos); -} - -// ******************************************************************************* -// * -// * gZone -// * -// ******************************************************************************* -//! -//! @param m Message to read creation data from -//! -// ******************************************************************************* - -gZone::gZone( nMessage & m ) - :eNetGameObject( m ), rotation_(1,0) -{ - // read creation time - m >> createTime_; - referenceTime_ = lastTime = createTime_; - - // initialize color to white, ReadSync will fill in the true value if available - color_.r_ = color_.g_ = color_.b_ = 1.0f; - - // add to game grid - this->AddToList(); - - sg_Zones.push_back(this); - - // initialize position functions - SetPosition( pos ); - eSoundMixer* mixer = eSoundMixer::GetMixer(); - mixer->PushButton(ZONE_SPAWN, pos); -} - -// ******************************************************************************* -// * -// * ~gZone -// * -// ******************************************************************************* -//! -//! -// ******************************************************************************* - -gZone::~gZone( void ) -{ - sg_Zones.erase( - std::find_if( - sg_Zones.begin(), - sg_Zones.end(), - std::bind2nd( - std::equal_to<gZone *>(), - this) - ) - ); -} - -// ******************************************************************************* -// * -// * WriteCreate -// * -// ******************************************************************************* -//! -//! @param m Message to write creation data to -//! -// ******************************************************************************* - -void gZone::WriteCreate( nMessage & m ) -{ - // delegate - eNetGameObject::WriteCreate( m ); - - m << createTime_; -} - -// ******************************************************************************* -// * -// * WriteSync -// * -// ******************************************************************************* -//! -//! @param m Message to write sync data to -//! -// ******************************************************************************* - -void gZone::WriteSync( nMessage & m ) -{ - // delegate - eNetGameObject::WriteSync( m ); - - // write color - m << color_.r_; - m << color_.g_; - m << color_.b_; - - // write reference time and functions - m << referenceTime_; - m << posx_; - m << posy_; - m << radius_; - - // write rotation speed - m << rotationSpeed_; -} - -// ******************************************************************************* -// * -// * ReadSync -// * -// ******************************************************************************* -//! -//! @param m Message to read sync data from -//! -// ******************************************************************************* - -void gZone::ReadSync( nMessage & m ) -{ - // delegage - eNetGameObject::ReadSync( m ); - - // read color - if (!m.End()) - { - m >> color_.r_; - m >> color_.g_; - m >> color_.b_; - se_MakeColorValid(color_.r_, color_.g_, color_.b_, 1.0f); - } - - // read reference time and functions - if (!m.End()) - { - m >> referenceTime_; - m >> posx_; - m >> posy_; - m >> radius_; - } - else - { - referenceTime_ = createTime_; - - // take old default values - this->radius_.SetOffset( sg_initialSize ); - this->radius_.SetSlope( sg_expansionSpeed ); - SetPosition( pos ); - SetVelocity( eCoord() ); - } - - // read rotation speed - if (!m.End()) - { - m >> rotationSpeed_; - } - else - { - // set fixed values - SetRotationSpeed( .3f ); - SetRotationAcceleration( 0.0f ); - } -} - -// ******************************************************************************* -// * -// * Timestep -// * -// ******************************************************************************* -//! -//! @param time the current time -//! -// ******************************************************************************* - -bool gZone::Timestep( REAL time ) -{ - // rotate - REAL speed = GetRotationSpeed(); - REAL angle = ( time - lastTime ) * speed; - // angle /= ( 1 + 2 * 3.14159 * angle/sg_segments ); - rotation_ = rotation_.Turn( cos( angle ), sin( angle ) ); - - // move to new position - REAL dt = time - referenceTime_; - Move( eCoord( posx_( dt ), posy_( dt ) ), lastTime, time ); - - // update time - lastTime = time; - - // kill this zone if it shrunk down to zero radius - if ( GetExpansionSpeed() < 0 && GetRadius() <= 0 ) - { - OnVanish(); - return true; - } - - return false; -} - -// ******************************************************************************* -// * -// * OnVanish -// * -// ******************************************************************************* -//! -//! -// ******************************************************************************* - -void gZone::OnVanish( void ) -{ -} - -// ******************************************************************************* -// * -// * InteractWith -// * -// ******************************************************************************* -//! -//! @param target the other game object -//! @param time the current time -//! @param recursion if set to true, don't recurse into other InteractWith functions (quite silly now that I think about it...) -//! -// ******************************************************************************* - -void gZone::InteractWith( eGameObject * target, REAL time, int recursion ) -{ - gCycle* prey = dynamic_cast< gCycle* >( target ); - if ( prey ) - { - REAL r = this->Radius(); - if ( ( prey->Position() - this->Position() ).NormSquared() < r*r ) - { - if ( prey->Player() && prey->Alive() ) - { - OnEnter( prey, time ); - } - } - } -} - -// ******************************************************************************* -// * -// * OnEnter -// * -// ******************************************************************************* -//! -//! @param target the cycle that has been found inside the zone -//! @param time the current time -//! -// ******************************************************************************* - -void gZone::OnEnter( gCycle * target, REAL time ) -{ -} - -// the zone's network initializator -static nNOInitialisator<gZone> zone_init(340,"zone"); - -// ******************************************************************************* -// * -// * CreatorDescriptor -// * -// ******************************************************************************* -//! -//! @return -//! -// ******************************************************************************* - -nDescriptor & gZone::CreatorDescriptor( void ) const -{ - return zone_init; -} - -// ******************************************************************************* -// * -// * Radius -// * -// ******************************************************************************* -//! -//! @return -//! -// ******************************************************************************* - -REAL gZone::Radius( void ) const -{ - return GetRadius(); -} - -// ******************************************************************************* -// * -// * Render -// * -// ******************************************************************************* -//! -//! @param cam the camera used for rendering -//! -// ******************************************************************************* - -void gZone::Render( const eCamera * cam ) -{ -#ifndef DEDICATED - - color_.a_ = ( lastTime - createTime_ ) * .2f; - if ( color_.a_ > .7f ) - color_.a_ = .7f; - if ( color_.a_ <= 0 ) - return; - - GLfloat m[4][4]={{rotation_.x,rotation_.y,0,0}, - {-rotation_.y,rotation_.x,0,0}, - {0,0,1,0}, - {pos.x,pos.y,0,1}}; - - ModelMatrix(); - glPushMatrix(); - - glDisable(GL_LIGHT0); - glDisable(GL_LIGHT1); - glDisable(GL_LIGHTING); - glDisable(GL_CULL_FACE); - glDepthMask(GL_FALSE); - glBlendFunc( GL_SRC_ALPHA, GL_ONE ); - - - //glDisable(GL_TEXTURE); - glDisable(GL_TEXTURE_2D); - - // glTranslatef(pos.x,pos.y,0); - - glMultMatrixf(&m[0][0]); - // glScalef(.5,.5,.5); - - bool useAlpha = sr_alphaBlend ? !sg_zoneAlphaToggle : sg_zoneAlphaToggle; - - if ( useAlpha ) - BeginQuads(); - else - BeginLineStrip(); - - const REAL seglen = .2f; - const REAL bot = 0.0f; - const REAL top = 5.0f; // + ( lastTime - createTime_ ) * .1f; - - color_.Apply(); - - REAL r = Radius(); - for ( int i = sg_segments - 1; i>=0; --i ) - { - REAL a = i * 2 * 3.14159 / REAL( sg_segments ); - REAL b = a + seglen; - - REAL sa = r * sin(a); - REAL ca = r * cos(a); - REAL sb = r * sin(b); - REAL cb = r * cos(b); - - glVertex3f(sa, ca, bot); - glVertex3f(sa, ca, top); - glVertex3f(sb, cb, top); - glVertex3f(sb, cb, bot); - - if ( !useAlpha ) - { - glVertex3f(sa, ca, bot); - RenderEnd(); - BeginLineStrip(); - } - } - - RenderEnd(); - - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - glDepthMask(GL_TRUE); - - glPopMatrix(); -#endif -} - -void gZone::Render2D(tCoord) const { -#ifndef DEDICATED - if ( color_.a_ <= 0 ) - return; - - GLfloat m[4][4]={{rotation_.x,rotation_.y,0,0}, - {-rotation_.y,rotation_.x,0,0}, - {0,0,1,0}, - {pos.x,pos.y,0,1}}; - - ModelMatrix(); - glPushMatrix(); - - glMultMatrixf(&m[0][0]); - // glScalef(.5,.5,.5); - - BeginLines(); - - const REAL seglen = .2f; - - color_.Apply(); - - REAL r = Radius(); - for ( int i = sg_segments - 1; i>=0; --i ) - { - REAL a = i * 2 * 3.14159 / REAL( sg_segments ); - REAL b = a + seglen; - - REAL sa = r * sin(a); - REAL ca = r * cos(a); - REAL sb = r * sin(b); - REAL cb = r * cos(b); - - glVertex2f(sa, ca); - glVertex2f(sb, cb); - } - - RenderEnd(); - - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - glDepthMask(GL_TRUE); - - glPopMatrix(); -#endif -} - - -// ******************************************************************************* -// * -// * RendersAlpha -// * -// ******************************************************************************* -//! -//! @return True if alpha blending is used -//! -// ******************************************************************************* -bool gZone::RendersAlpha() const -{ - return sr_alphaBlend; -} - -// ******************************************************************************* -// * -// * gWinZoneHack -// * -// ******************************************************************************* -//! -//! @param grid Grid to put the zone into -//! @param pos Position to spawn the zone at -//! -// ******************************************************************************* - -gWinZoneHack::gWinZoneHack( eGrid * grid, const eCoord & pos ) - :gZone( grid, pos ) -{ - color_.r_ = 0.0f; - color_.g_ = 1.0f; - color_.b_ = 0.0f; -} - -// ******************************************************************************* -// * -// * gWinZoneHack -// * -// ******************************************************************************* -//! -//! @param m Message to read creation data from -//! @param null -//! -// ******************************************************************************* - -gWinZoneHack::gWinZoneHack( nMessage & m ) - : gZone( m ) -{ -} - -// ******************************************************************************* -// * -// * ~gWinZoneHack -// * -// ******************************************************************************* -//! -//! -// ******************************************************************************* - -gWinZoneHack::~gWinZoneHack( void ) -{ -} - -// ******************************************************************************* -// * -// * OnEnter -// * -// ******************************************************************************* -//! -//! @param target the cycle that has been found inside the zone -//! @param time the current time -//! -// ******************************************************************************* - -void gWinZoneHack::OnEnter( gCycle * target, REAL time ) -{ - static const char* message="$player_win_instant"; - sg_DeclareWinner( target->Player()->CurrentTeam(), message ); - - // let zone vanish - if ( GetExpansionSpeed() >= 0 ) - { - SetReferenceTime(); - SetExpansionSpeed( -GetRadius()*.5 ); - RequestSync(); - } -} - -// ******************************************************************************* -// * -// * gDeathZoneHack -// * -// ******************************************************************************* -//! -//! @param grid Grid to put the zone into -//! @param pos Position to spawn the zone at -//! -// ******************************************************************************* - -gDeathZoneHack::gDeathZoneHack( eGrid * grid, const eCoord & pos ) - :gZone( grid, pos ) -{ - color_.r_ = 1.0f; - color_.g_ = 0.0f; - color_.b_ = 0.0f; -} - -// ******************************************************************************* -// * -// * gDeathZoneHack -// * -// ******************************************************************************* -//! -//! @param m Message to read creation data from -//! @param null -//! -// ******************************************************************************* - -gDeathZoneHack::gDeathZoneHack( nMessage & m ) - : gZone( m ) -{ -} - -// ******************************************************************************* -// * -// * ~gDeathZoneHack -// * -// ******************************************************************************* -//! -//! -// ******************************************************************************* - -gDeathZoneHack::~gDeathZoneHack( void ) -{ -} - -static int score_deathzone=-1; -static tSettingItem<int> s_dz("SCORE_DEATHZONE",score_deathzone); - -// ******************************************************************************* -// * -// * OnEnter -// * -// ******************************************************************************* -//! -//! @param target the cycle that has been found inside the zone -//! @param time the current time -//! -// ******************************************************************************* - -void gDeathZoneHack::OnEnter( gCycle * target, REAL time ) -{ - target->Player()->AddScore(score_deathzone, tOutput(), "$player_lose_suicide"); - target->Kill(); -} - -// ******************************************************************************* -// * -// * gBaseZoneHack -// * -// ******************************************************************************* -//! -//! @param grid Grid to put the zone into -//! @param pos Position to spawn the zone at -//! -// ******************************************************************************* - -gBaseZoneHack::gBaseZoneHack( eGrid * grid, const eCoord & pos ) - :gZone( grid, pos), onlySurvivor_( false ), currentState_( State_Safe ) -{ - enemiesInside_ = ownersInside_ = 0; - conquered_ = 0; - lastSync_ = -10; - teamDistance_ = 0; - lastEnemyContact_ = se_GameTime(); -} - -// ******************************************************************************* -// * -// * gBaseZoneHack -// * -// ******************************************************************************* -//! -//! @param m Message to read creation data from -//! -// ******************************************************************************* - -gBaseZoneHack::gBaseZoneHack( nMessage & m ) - : gZone( m ), onlySurvivor_( false ), currentState_( State_Safe ) -{ - enemiesInside_ = ownersInside_ = 0; - conquered_ = 0; - lastSync_ = -10; - teamDistance_ = 0; - lastEnemyContact_ = se_GameTime(); -} - -// ******************************************************************************* -// * -// * ~gBaseZoneHack -// * -// ******************************************************************************* -//! -//! -// ******************************************************************************* - -gBaseZoneHack::~gBaseZoneHack( void ) -{ -} - -REAL sg_conquestRate = .5; -REAL sg_defendRate = .25; -REAL sg_conquestDecayRate = .1; - -static tSettingItem< REAL > sg_conquestRateConf( "FORTRESS_CONQUEST_RATE", sg_conquestRate ); -static tSettingItem< REAL > sg_defendRateConf( "FORTRESS_DEFEND_RATE", sg_defendRate ); -static tSettingItem< REAL > sg_conquestDecayRateConf( "FORTRESS_CONQUEST_DECAY_RATE", sg_conquestDecayRate ); - -// time with no enemy inside a zone before it collapses harmlessly -static REAL sg_conquestTimeout = 0; -static tSettingItem< REAL > sg_conquestTimeoutConf( "FORTRESS_CONQUEST_TIMEOUT", sg_conquestTimeout ); - -// kill at least than many players from the team that just got its zone conquered -static int sg_onConquestKillMin = 0; -static tSettingItem< int > sg_onConquestKillMinConfig( "FORTRESS_CONQUERED_KILL_MIN", sg_onConquestKillMin ); - -// and at least this ratio -static REAL sg_onConquestKillRatio = 0; -static tSettingItem< REAL > sg_onConquestKillRationConfig( "FORTRESS_CONQUERED_KILL_RATIO", sg_onConquestKillRatio ); - -// score you get for conquering a zone -static int sg_onConquestScore = 0; -static tSettingItem< int > sg_onConquestConquestScoreConfig( "FORTRESS_CONQUERED_SCORE", sg_onConquestScore ); - -// flag indicating whether the team conquering the first zone wins (good for one on one matches) -static int sg_onConquestWin = 1; -static tSettingItem< int > sg_onConquestConquestWinConfig( "FORTRESS_CONQUERED_WIN", sg_onConquestWin ); - -// maximal number of base zones ownable by a team -static int sg_baseZonesPerTeam = 0; -static tSettingItem< int > sg_baseZonesPerTeamConfig( "FORTRESS_MAX_PER_TEAM", sg_baseZonesPerTeam ); - -// count zones belonging to the given team. -// fill in count and the zone that is farthest to the team. -void gBaseZoneHack::CountZonesOfTeam( eGrid const * grid, eTeam * otherTeam, int & count, gBaseZoneHack * & farthest ) -{ - count = 0; - farthest = NULL; - - // check whether other zones are already registered to that team - const tList<eGameObject>& gameObjects = grid->GameObjects(); - for (int j=gameObjects.Len()-1;j>=0;j--) - { - gBaseZoneHack *otherZone=dynamic_cast<gBaseZoneHack *>(gameObjects(j)); - - if ( otherZone && otherTeam == otherZone->Team() ) - { - count++; - if ( !farthest || otherZone->teamDistance_ > farthest->teamDistance_ ) - farthest = otherZone; - } - } -} - - -// ******************************************************************************* -// * -// * Timestep -// * -// ******************************************************************************* -//! -//! @param time the current time -//! -// ******************************************************************************* - -bool gBaseZoneHack::Timestep( REAL time ) -{ - if ( currentState_ == State_Conquering ) - { - // let zone vanish - SetReferenceTime(); - SetExpansionSpeed( -GetRadius()*.5 ); - SetRotationAcceleration( -GetRotationSpeed()*.4 ); - RequestSync(); - - currentState_ = State_Conquered; - } - - REAL dt = time - lastTime; - - // conquest going on - REAL conquest = sg_conquestRate * enemiesInside_ - sg_defendRate * ownersInside_ - sg_conquestDecayRate; - conquered_ += dt * conquest; - - // clamp - if ( conquered_ < 0 ) - { - conquered_ = 0; - conquest = 0; - } - if ( conquered_ > 1.01 ) - { - conquered_ = 1.01; - conquest = 0; - } - - // set speed according to conquest status - if ( currentState_ == State_Safe ) - { - REAL maxSpeed = 10 * ( 2 * 3.141 ) / sg_segments; - REAL omega = .3 + conquered_ * conquered_ * maxSpeed; - REAL omegaDot = 2 * conquered_ * conquest * maxSpeed; - - // determine the time since the last sync (exaggerate for smoother motion in local games) - REAL timeStep = lastTime - lastSync_; - if ( sn_GetNetState() != nSERVER ) - timeStep *= 100; - - if ( sn_GetNetState() != nCLIENT && - ( ( fabs( omega - GetRotationSpeed() ) + fabs( omegaDot - GetRotationAcceleration() ) ) * timeStep > .5 ) ) - { - SetRotationSpeed( omega ); - SetRotationAcceleration( omegaDot ); - SetReferenceTime(); - RequestSync(); - lastSync_ = lastTime; - } - - - // check for enemy contact timeout - if ( sg_conquestTimeout > 0 && lastEnemyContact_ + sg_conquestTimeout < time ) - { - enemies_.clear(); - - // if the zone would collapse without defenders, let it collapse now. A smart defender would - // have left the zone to let it collapse anyway. - if ( sg_conquestDecayRate < 0 ) - { - if ( team ) - sn_ConsoleOut( tOutput( "$zone_collapse_harmless", team->Name() ) ); - conquered_ = 1.0; - } - } - - // check whether the zone got conquered - if ( conquered_ >= 1 ) - { - currentState_ = State_Conquering; - OnConquest(); - } - } - - - // reset counts - enemiesInside_ = ownersInside_ = 0; - - // determine the owning team: the one that has a player spawned closest - - // find the closest player - if ( !team ) - { - teamDistance_ = 0; - const tList<eGameObject>& gameObjects = Grid()->GameObjects(); - gCycle * closest = NULL; - REAL closestDistance = 0; - for (int i=gameObjects.Len()-1;i>=0;i--) - { - gCycle *other=dynamic_cast<gCycle *>(gameObjects(i)); - - if (other ) - { - eTeam * otherTeam = other->Player()->CurrentTeam(); - eCoord otherpos = other->Position() - pos; - REAL distance = otherpos.NormSquared(); - if ( !closest || distance < closestDistance ) - { - // check whether other zones are already registered to that team - gBaseZoneHack * farthest = NULL; - int count = 0; - if ( sg_baseZonesPerTeam > 0 ) - CountZonesOfTeam( Grid(), otherTeam, count, farthest ); - - // only set team if not too many closer other zones are registered - if ( sg_baseZonesPerTeam == 0 || count < sg_baseZonesPerTeam || farthest->teamDistance_ > distance ) - { - closest = other; - closestDistance = distance; - } - } - } - } - - if ( closest ) - { - // take over team and color - team = closest->Player()->CurrentTeam(); - color_.r_ = team->R()/15.0; - color_.g_ = team->G()/15.0; - color_.b_ = team->B()/15.0; - teamDistance_ = closestDistance; - - RequestSync(); - } - - // if this zone does not belong to a team, discard it. - if ( !team ) - { - return true; - } - - // check other zones owned by the same team. Discard the one farthest away - // if the max count is exceeded - if ( team && sg_baseZonesPerTeam > 0 ) - { - gBaseZoneHack * farthest = 0; - int count = 0; - CountZonesOfTeam( Grid(), team, count, farthest ); - - // discard team of farthest zone - if ( count > sg_baseZonesPerTeam ) - farthest->team = NULL; - } - } - - - // delegate - bool ret = gZone::Timestep( time ); - - // reward survival - if ( !ret && onlySurvivor_ ) - { - const char* message= ( eTeam::teams.Len() > 2 || sg_onConquestScore ) ? "$player_win_survive" : "$player_win_conquest"; - sg_DeclareWinner( team, message ); - } - - return ret; -} - -// ******************************************************************************* -// * -// * OnVanish -// * -// ******************************************************************************* -//! -//! -// **********************************... [truncated message content] |
From: <baz...@us...> - 2009-01-18 22:55:24
|
Revision: 8858 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8858&view=rev Author: bazaarmagetron Date: 2009-01-18 21:45:01 +0000 (Sun, 18 Jan 2009) Log Message: ----------- mathias: Fixed length calculation of colored strings Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-18 22:31:08.217999935 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-18 21:36:08.525000095 +0100 committer: mathias <mathias@earth> properties: branch-nick: utf8-armagetronad-work Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-18 21:39:11 UTC (rev 8857) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-18 21:45:01 UTC (rev 8858) @@ -777,12 +777,15 @@ //! @param resultingHeight address to store the number of lines (height times the number of newlines+1) //! @returns the width of the string if it was printed float rTextField::GetTextLength (tString const &utf8str, float height, bool stripColors, bool useNewline, float *resultingHeight) { - STRING_TO_FTGL( utf8str, str ); - //if(stripColors) { - // return sr_Font.GetWidth(tColoredString::RemoveColors(str.c_str()), height); //TODO: Implement all the rest! - //} - //std::cerr << "GetTextLength: " << str.size() << std::endl; - return sr_Font.GetWidth(str, height); //TODO: Implement all the rest! + if(stripColors) { + tString colorlessstr = tColoredString::RemoveColors(utf8str.c_str()); + STRING_TO_FTGL(colorlessstr, str); + return sr_Font.GetWidth(str, height); + } else { + STRING_TO_FTGL( utf8str, str ); + return sr_Font.GetWidth(str, height); + } + //TODO: Implement all the rest! } //! @param str the string to be used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-18 22:55:31
|
Revision: 8857 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8857&view=rev Author: bazaarmagetron Date: 2009-01-18 21:39:11 +0000 (Sun, 18 Jan 2009) Log Message: ----------- Manuel Moos: tCharacterFilter and its users now work with utf8. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp armagetronad/branches/utf8/armagetronad/src/tools/tString.h Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-18 20:22:33.319000006 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-18 22:31:08.217999935 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:file-ids - src/tron/gWinZone.h 8853@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftron%2FgWinZone.h src/tron/gWinZone.cpp 8853@7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:src%2Ftron%2FgWinZone.cpp + Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz Modified: armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp 2009-01-18 19:31:38 UTC (rev 8856) +++ armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp 2009-01-18 21:39:11 UTC (rev 8857) @@ -8397,18 +8397,10 @@ void ePlayerNetID::FilterName( tString const & in, tString & out ) { - int i; static ePlayerCharacterFilter filter; - out = tColoredString::RemoveColors( in ); + tString temp = tColoredString::RemoveColors( in ); + out = filter.FilterString( temp ); - // filter out illegal characters - for ( i = out.Size()-1; i>=0; --i ) - { - char & c = out[i]; - - c = filter.Filter( c ); - } - // strip leading and trailing unknown characters se_StripMatchingEnds( out, se_IsUnderscore, se_IsUnderscore ); } Modified: armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp 2009-01-18 19:31:38 UTC (rev 8856) +++ armagetronad/branches/utf8/armagetronad/src/network/nNetwork.cpp 2009-01-18 21:39:11 UTC (rev 8857) @@ -1249,19 +1249,6 @@ // read the raw data ReadRaw( s ); - // filter client string messages - if ( sn_GetNetState() == nSERVER ) - { - s.NetFilter(); - s.RemoveTrailingColor(); - } - - // filter color codes away - if ( sn_filterColorStrings ) - s = tColoredString::RemoveColors( s, false ); - else if ( sn_filterDarkColorStrings ) - s = tColoredString::RemoveColors( s, true ); - // convert latin1 encoding to utf8 // The server knows which clients support unicode precisely; every unicode supporting client // sends in utf8 to a unicode supporting server. However, the server has to send back latin1 @@ -1285,6 +1272,19 @@ } */ + // filter client string messages + if ( sn_GetNetState() == nSERVER ) + { + s.NetFilter(); + s.RemoveTrailingColor(); + } + + // filter color codes away + if ( sn_filterColorStrings ) + s = tColoredString::RemoveColors( s, false ); + else if ( sn_filterDarkColorStrings ) + s = tColoredString::RemoveColors( s, true ); + return *this; } Modified: armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp 2009-01-18 19:31:38 UTC (rev 8856) +++ armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp 2009-01-18 21:39:11 UTC (rev 8857) @@ -34,6 +34,7 @@ #include <ctype.h> #include <string> #include <iostream> +#include "utf8.h" // ******************************************************************************* // * @@ -1669,10 +1670,53 @@ void tString::NetFilter( void ) { - static tNetCharacterFilter filter; + // output string + tString out; - // run through string - *this = filter.FilterString( *this ); + // prepare reader and writer + tString::iterator reader = begin(); + std::back_insert_iterator< tString > writer = back_inserter(out); + + try + { + // filter out illegal characters + while( reader != end() ) + { + // convert from utf8 + wchar_t c = utf8::next( reader, end() ); + + // ignore backspace + if ( c != 0x7f ) + { + // filter + if ( isblank(c) ) + { + // unify whitespace to regular space + c = ' '; + } + else if ( c < 32 ) + { + // nonprintable characters -> underscore + c = '_'; + } + // everything else is legal. + + // convert back to utf8 + utf8::append( c, writer ); + } + } + } + catch(...) + { + // just leave the conversion incomplete in case of encoding errors + + // but not in debug mode. This shoudln't happen. +#ifdef DEBUG + tERR_ERROR( "Invalid utf8 strings in the system." ); +#endif + } + + *this = out; } bool st_colorStrings=true; @@ -2265,14 +2309,22 @@ //! // ********************************************************************** -char tCharacterFilter::Filter( unsigned char in ) +wchar_t tCharacterFilter::Filter( wchar_t in ) { - return filter[ in ]; + if ( in < filter.Len() ) + { + return filter[ in ]; + } + else + { + // unknown characters get mapped to underscores. + return '_'; + } } // ********************************************************************** // * -// * Filter +// * FilterByteString // * // ********************************************************************** //! @@ -2280,7 +2332,7 @@ //! // ********************************************************************** -tString tCharacterFilter::FilterString( tString & s ) +tString tCharacterFilter::FilterByteString( tString & s ) { int len = s.Len() -1; tString out; @@ -2293,28 +2345,54 @@ out << c; } } - // std::cout << "Filtered name for " /*<< ( IP? "IP ":"" )*/ << "'" << s << "' : '" << out << "'\n"; return out; } // ********************************************************************** // * -// * SetMap +// * FilterString // * // ********************************************************************** //! -//! @param in1 Begin of the character range to process filters on -//! @param in2 End of the character range -//! @param out Filtered character +//! @param in Character to process filters on //! // ********************************************************************** -void tCharacterFilter::SetMap( unsigned char in1, unsigned char in2, unsigned char out) +tString tCharacterFilter::FilterString( tString & s ) { - tASSERT( in1 < in2 ); - for( unsigned char i = in2; i >= in1; --i ) - filter[ i ] = out; + // output string + tString out; + + // prepare reader and writer + tString::iterator reader = s.begin(); + std::back_insert_iterator< tString > writer = back_inserter(out); + + try + { + // filter out illegal characters + while( reader != s.end() ) + { + // convert from utf8 + wchar_t c = utf8::next( reader, s.end() ); + if ( c != 0x7f ) + { + // filter and convert back to utf8 + utf8::append( Filter( c ), writer ); + } + } + } + catch(...) + { + // just leave the conversion incomplete in case of encoding errors + + // but not in debug mode. This shoudln't happen. +#ifdef DEBUG + tERR_ERROR( "Invalid utf8 strings in the system." ); +#endif + } + + return out; } // ********************************************************************** @@ -2323,47 +2401,39 @@ // * // ********************************************************************** //! -//! @param in Character to process filters on +//! @param in1 Begin of the character range to process filters on +//! @param in2 End of the character range //! @param out Filtered character //! // ********************************************************************** -void tCharacterFilter::SetMap( unsigned char in, unsigned char out ) +void tCharacterFilter::SetMap( wchar_t in1, wchar_t in2, wchar_t out) { - filter[ in ] = out; + // fill gaps with underscores + for( wchar_t i = filter.Len(); i < in1; ++i ) + { + filter[ i ] = '_'; + } + + tASSERT( in1 <= in2 ); + for( wchar_t i = in2; i >= in1; --i ) + filter[ i ] = out; } // ********************************************************************** // * -// * tNetCharacterFilter +// * SetMap // * // ********************************************************************** //! +//! @param in Character to process filters on +//! @param out Filtered character //! // ********************************************************************** -tNetCharacterFilter::tNetCharacterFilter ( void ) +void tCharacterFilter::SetMap( wchar_t in, wchar_t out ) { - unsigned int i; - filter[0]=0; - - // map all unknown characters to underscores - for (i=255; i > 0; i--) - { - filter[i] = '_'; - } - - // no, leave all ISO Latin 1 characters as they are - for (i=255; i >= 32; --i) - { - filter[i] = i; - } - - // map return and tab to space - SetMap('\n',' '); - SetMap('\t',' '); - - + SetMap( in, in, out ); } tString st_GetCurrentTime( char const * szFormat ) Modified: armagetronad/branches/utf8/armagetronad/src/tools/tString.h =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tools/tString.h 2009-01-18 19:31:38 UTC (rev 8856) +++ armagetronad/branches/utf8/armagetronad/src/tools/tString.h 2009-01-18 21:39:11 UTC (rev 8857) @@ -33,6 +33,8 @@ #include "defs.h" +#include "tArray.h" + #include <string> #include <sstream> #include <iostream> @@ -296,23 +298,23 @@ class tCharacterFilter { public: - char Filter ( unsigned char ); + // filter a single character + wchar_t Filter ( wchar_t ); + + // filter a whole string, byte for byte + tString FilterByteString ( tString & ); + + // filter a whole utf8 string tString FilterString ( tString & ); protected: - tCharacterFilter ( void ) {} // To use a tCharacterFilter, make your own class herit of this one and define the constructor + tCharacterFilter ( void ) {} // To use a tCharacterFilter, make your own class inherit of this one and define the constructor - void SetMap ( unsigned char, unsigned char, unsigned char ); - void SetMap ( unsigned char, unsigned char ); + void SetMap ( wchar_t, wchar_t, wchar_t ); + void SetMap ( wchar_t, wchar_t ); - char filter[256]; + tArray< wchar_t > filter; }; -class tNetCharacterFilter: public tCharacterFilter -{ -public: - tNetCharacterFilter ( void ); -}; - #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-18 23:11:54
|
Revision: 8859 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8859&view=rev Author: bazaarmagetron Date: 2009-01-18 23:11:44 +0000 (Sun, 18 Jan 2009) Log Message: ----------- author: Manuel Moos Made it so that the cursor position always is in storage units (char or wchar_t) and not characters visible on screen, and clarified it in the comments. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp armagetronad/branches/utf8/armagetronad/src/render/rFont.h Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-18 21:36:08.525000095 +0100 committer: mathias <mathias@earth> properties: branch-nick: utf8-armagetronad-work + timestamp: 2009-01-19 00:03:26.691999912 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-18 21:45:01 UTC (rev 8858) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-18 23:11:44 UTC (rev 8859) @@ -649,9 +649,10 @@ return c.StringOutput(x.c_str()); } -void DisplayText(REAL x,REAL y,REAL h,const char *text,sr_fontClass type,int center,int cursor,int cursorPos, rTextField::ColorMode colorMode){ +void DisplayText(REAL x,REAL y,REAL h,const char *t,sr_fontClass type,int center,int cursor,int cursorPos, rTextField::ColorMode colorMode){ #ifndef DEDICATED - STRING_TO_FTGL( tString(text), str ); + tString text( t ); + STRING_TO_FTGL( text, str ); float height; float width = rTextField::GetTextLength(str, h, true, true, &height); @@ -671,7 +672,13 @@ c.SetIndent(5); if (cursor) + { +#ifndef FTGL_HAS_UTF8 + // translate cursor position from byte index to character index + cursorPos = text.LenUtf8(0, cursorPos); +#endif c.SetCursor(cursor,cursorPos); + } c.StringOutput(str.c_str(), colorMode ); #endif } Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.h =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.h 2009-01-18 21:45:01 UTC (rev 8858) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.h 2009-01-18 23:11:44 UTC (rev 8859) @@ -112,7 +112,7 @@ static tColor blendColor_; //!< color all other colors are multiplied with int cursor; // display mode of the cursor; 0: disabled, 1: low, 2: high - int cursorPos; // position of the cursor (number of chars to come) + int cursorPos; // position of the cursor (number of FTGL_CHARs to come) REAL cursor_x,cursor_y; // position on the screen @@ -163,6 +163,7 @@ return parIndent; } + // sets the cursor mode position. Cursor position is in FTGL_CHARs, so not true characters in utf8 mode. void SetCursor(int c,int p){ cursor=c; cursorPos=p; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-18 23:12:47
|
Revision: 8860 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8860&view=rev Author: bazaarmagetron Date: 2009-01-18 23:12:42 +0000 (Sun, 18 Jan 2009) Log Message: ----------- Manuel Moos: Small optimization :) Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-19 00:03:26.691999912 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-19 00:04:48.211999893 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 Modified: armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp 2009-01-18 23:11:44 UTC (rev 8859) +++ armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp 2009-01-18 23:12:42 UTC (rev 8860) @@ -1023,7 +1023,7 @@ int strLen = size(); if ( length < 0 ) { start += length; - length = abs( length ); + length = -length; } if ( start + length > strLen || start < 0 || length == 0 ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-18 23:14:09
|
Revision: 8861 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8861&view=rev Author: bazaarmagetron Date: 2009-01-18 23:13:59 +0000 (Sun, 18 Jan 2009) Log Message: ----------- Manuel Moos: Got rid of redundant cursorPos variable. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp armagetronad/branches/utf8/armagetronad/src/ui/uMenu.cpp armagetronad/branches/utf8/armagetronad/src/ui/uMenu.h Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-19 00:04:48.211999893 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-19 00:04:57.130000114 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs Modified: armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp 2009-01-18 23:12:42 UTC (rev 8860) +++ armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp 2009-01-18 23:13:59 UTC (rev 8861) @@ -3969,8 +3969,8 @@ { if ( content->Len() + insertion.insertion_.Len() <= maxLength_ ) { - *content = content->SubStr( 0, cursorPos ) + insertion.insertion_ + content->SubStr( cursorPos ); - cursorPos += insertion.insertion_.Len()-1; + *content = content->SubStr( 0, realCursorPos ) + insertion.insertion_ + content->SubStr( realCursorPos ); + realCursorPos += insertion.insertion_.Len()-1; } return true; Modified: armagetronad/branches/utf8/armagetronad/src/ui/uMenu.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/ui/uMenu.cpp 2009-01-18 23:12:42 UTC (rev 8860) +++ armagetronad/branches/utf8/armagetronad/src/ui/uMenu.cpp 2009-01-18 23:13:59 UTC (rev 8861) @@ -740,12 +740,11 @@ const tOutput& help, tString &c, int maxLength ) - :uMenuItem(M,help),description(de),content(&c),cursorPos(0),realCursorPos(0), maxLength_( maxLength ){ + :uMenuItem(M,help),description(de),content(&c),realCursorPos(0), maxLength_( maxLength ){ // int len=content->Len(); // if (len==0 || (*content)(len-1)!=0) // (*content)[len]=0; realCursorPos=content->size(); - cursorPos=content->LenUtf8(); colorMode_ = rTextField::COLOR_SHOW; } @@ -767,7 +766,7 @@ colorMode = rTextField::COLOR_USE; DisplayText(x-.02,y,description,selected,alpha,1); - DisplayText(x+.02,y,*content,selected,alpha,-1,cmode,cursorPos,colorMode); + DisplayText(x+.02,y,*content,selected,alpha,-1,cmode,realCursorPos,colorMode); #endif } @@ -781,8 +780,6 @@ bool moveWordLeft, moveWordRight, deleteWordLeft, deleteWordRight, moveBeginning, moveEnd, killForwards; moveWordLeft = moveWordRight = deleteWordLeft = deleteWordRight = moveBeginning = moveEnd = killForwards = false; - int realLength = content->LenUtf8(); - #if defined (MACOSX) // For moving over/deleting words if (mod & KMOD_ALT) { @@ -848,51 +845,43 @@ if (moveWordLeft) { realCursorPos += content->PosWordLeft(realCursorPos); - cursorPos = content->LenUtf8(0, realCursorPos); } else if (moveWordRight) { realCursorPos += content->PosWordRight(realCursorPos); - cursorPos = content->LenUtf8(0, realCursorPos); } else if (deleteWordLeft) { realCursorPos += content->RemoveWordLeft(realCursorPos); - cursorPos = content->LenUtf8(0, realCursorPos); } else if (deleteWordRight) { - content->RemoveWordRight(cursorPos); + content->RemoveWordRight(realCursorPos); } else if (moveBeginning) { - cursorPos = 0; realCursorPos = 0; } else if (moveEnd) { - cursorPos = realLength; realCursorPos = content->size(); } else if (killForwards) { - content->RemoveSubStr(realCursorPos,content->size()-cursorPos); + content->RemoveSubStr(realCursorPos,content->size()-realCursorPos); } else if (c.sym == SDLK_LEFT) { - if (cursorPos > 0) { - cursorPos--; + if (realCursorPos > 0) { while(((*content)[--realCursorPos]&0xc0) == 0x80) ; } } else if (c.sym == SDLK_RIGHT) { - if (cursorPos < realLength) { - cursorPos++; - while(++realCursorPos < static_cast<int>(content->size()) && ((*content)[realCursorPos]&0xc0) == 0x80) ; + if ( realCursorPos < content->size() ) { + while(++realCursorPos < content->size() && ((*content)[realCursorPos]&0xc0) == 0x80) ; } } else if (c.sym == SDLK_DELETE) { - if (cursorPos < content->Len()-1) { - content->RemoveSubStrUtf8(cursorPos,1); + if (realCursorPos < content->size() ) { + content->RemoveSubStrUtf8(realCursorPos,1); } } else if (c.sym == SDLK_BACKSPACE) { - if (cursorPos > 0) { + if (realCursorPos > 0) { realCursorPos -= content->RemoveSubStrUtf8(realCursorPos,-1); - --cursorPos; } } else if (c.sym == SDLK_KP_ENTER || c.sym == SDLK_RETURN) { @@ -946,18 +935,9 @@ #endif else { ret = InsertChar(c.unicode); - if ( ret ) - { - ++realLength; - } } - if(cursorPos<0 || realCursorPos<0) { - cursorPos=0; - realCursorPos=0; - } - if(cursorPos > realLength || static_cast<tString::size_type>(realCursorPos) > content->size()) { - cursorPos=realLength; + if( realCursorPos > content->size()) { realCursorPos=content->size(); } @@ -972,7 +952,7 @@ if (32 <= unicode) { // insert character if there is room - if (content->Len() < maxLength_) + if ( content->LenUtf8() < maxLength_ ) { tString utf8string; unsigned short utf16string[1]; @@ -980,7 +960,6 @@ utf8::utf16to8(utf16string, utf16string+1, back_inserter(utf8string)); content->insert(realCursorPos, utf8string); realCursorPos+=utf8string.size(); - ++cursorPos; } return true; @@ -1234,7 +1213,6 @@ m_HistoryPos++; *content = m_History[m_HistoryPos]; realCursorPos = content->size(); - cursorPos = content->LenUtf8(); } return true; @@ -1246,7 +1224,6 @@ m_HistoryPos--; *content = m_History[m_HistoryPos]; realCursorPos = content->size(); - cursorPos = content->LenUtf8(); } return true; @@ -1258,8 +1235,8 @@ m_History.push_front(tString()); } content->erase(); + realCursorPos=0; m_HistoryPos++; - cursorPos=0; m_SearchFailing=false; return true; } @@ -1267,7 +1244,6 @@ (e.key.keysym.sym==SDLK_TAB && !m_Searchmode)){ if(m_Completer != 0) { realCursorPos = m_Completer->Complete(*content, realCursorPos); - cursorPos = content->LenUtf8(0, realCursorPos); } return true; @@ -1276,7 +1252,7 @@ if(e.key.keysym.sym==SDLK_LEFT || e.key.keysym.sym==SDLK_RIGHT) { *content = m_History[m_HistoryPos]; m_Searchmode = false; - cursorPos=0; + realCursorPos=0; return true; } bool ret = uMenuItemString::Event(e); Modified: armagetronad/branches/utf8/armagetronad/src/ui/uMenu.h =================================================================== --- armagetronad/branches/utf8/armagetronad/src/ui/uMenu.h 2009-01-18 23:12:42 UTC (rev 8860) +++ armagetronad/branches/utf8/armagetronad/src/ui/uMenu.h 2009-01-18 23:13:59 UTC (rev 8861) @@ -403,8 +403,7 @@ protected: tOutput description; tString *content; - int cursorPos; //as displayed, complete chars - int realCursorPos; //in bytes + unsigned int realCursorPos; // position of cursor as byte offset into string int maxLength_; bool InsertChar(int unicode); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-18 23:43:25
|
Revision: 8862 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8862&view=rev Author: bazaarmagetron Date: 2009-01-18 23:43:15 +0000 (Sun, 18 Jan 2009) Log Message: ----------- Manuel Moos: Adapted serverside player name length limitation to utf8 strings. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-19 00:04:57.130000114 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-19 00:32:14.252000093 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh Modified: armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp 2009-01-18 23:13:59 UTC (rev 8861) +++ armagetronad/branches/utf8/armagetronad/src/engine/ePlayer.cpp 2009-01-18 23:43:15 UTC (rev 8862) @@ -5387,10 +5387,13 @@ // makes sure the passed string is not longer than the given maximum static void se_CutString( tColoredString & string, int maxLen ) { - if (string.Len() > maxLen ) + if ( string.LenUtf8() > maxLen ) { - string = string.SubStr(0, maxLen); - //string[string.Len()-1]='\0'; + // nibble away one character at a time (not very efficient) + while ( string.LenUtf8() > maxLen ) + { + string.RemoveSubStrUtf8( string.size() - 1, 1 ); + } string.RemoveTrailingColor(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-19 00:53:20
|
Revision: 8865 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8865&view=rev Author: bazaarmagetron Date: 2009-01-19 00:53:10 +0000 (Mon, 19 Jan 2009) Log Message: ----------- Manuel Moos: Fixed text alignment. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-19 00:32:14.252000093 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-19 01:43:01.996000051 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh 812 z-...@us...-20090119004301-qimh29037yc3ft3y Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-19 00:39:35 UTC (rev 8864) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-19 00:53:10 UTC (rev 8865) @@ -652,9 +652,12 @@ void DisplayText(REAL x,REAL y,REAL h,const char *t,sr_fontClass type,int center,int cursor,int cursorPos, rTextField::ColorMode colorMode){ #ifndef DEDICATED tString text( t ); + // transform string for FTGL STRING_TO_FTGL( text, str ); + // do so again, with colors removed + STRING_TO_FTGL( tColoredString::RemoveColors(t), str_colorless ); float height; - float width = rTextField::GetTextLength(str, h, true, true, &height); + float width = rTextField::GetTextLength(str_colorless, h, true, true, &height); // shrink fields that don't fit the screen REAL maxw = 1.95 - x; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-19 10:03:31
|
Revision: 8866 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8866&view=rev Author: bazaarmagetron Date: 2009-01-19 10:03:26 +0000 (Mon, 19 Jan 2009) Log Message: ----------- Manuel Moos: Fixed line breaking crash in utf8 mode. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp armagetronad/branches/utf8/armagetronad/src/tools/tLocale.cpp Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-19 01:43:01.996000051 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-19 10:54:59.430999994 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh 812 z-...@us...-20090119004301-qimh29037yc3ft3y + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh 812 z-...@us...-20090119004301-qimh29037yc3ft3y 813 z-...@us...-20090119095459-ijj7haliyhlk5p8b Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-19 00:53:10 UTC (rev 8865) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-19 10:03:26 UTC (rev 8866) @@ -508,6 +508,22 @@ if (trouble && !(*c=='0' && my_strnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE)) { FTGL_STRING str; str += *c; +#ifdef FTGL_HAS_UTF8 + // be sure to add full utf8 character sequences + if ( (*c & 0x80) == 0x80 ) + { + c++; + while ((*c & 0xc0) == 0x80 ) + { + str += *(c); + c++; + } + + // gone one step too far + c--; + } + // ( we don't need to worry about the isspace() tests, they'll fail) +#endif currentWidth += sr_Font.GetWidth(str, cheight); if(isspace(*c)) { trouble = false; @@ -545,8 +561,10 @@ } } FTGL_STRING str(c, nextSpace); - //TODO: fix - //str = tColoredString::RemoveColors(str.c_str()); + //TODO: fix for non-utf8 rendering, too +#ifdef FTGL_HAS_UTF8 + str = tColoredString::RemoveColors(str.c_str()); +#endif float wordWidth = sr_Font.GetWidth(str, cheight); currentWidth += wordWidth; Modified: armagetronad/branches/utf8/armagetronad/src/tools/tLocale.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tools/tLocale.cpp 2009-01-19 00:53:10 UTC (rev 8865) +++ armagetronad/branches/utf8/armagetronad/src/tools/tLocale.cpp 2009-01-19 10:03:26 UTC (rev 8866) @@ -453,7 +453,7 @@ if (ENCODING == id) { - if ( "utf8" == rest ) + if ( "utf8" == rest || "utf-8" == rest ) { encoding = tEncoding_utf8; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-19 10:38:20
|
Revision: 8867 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8867&view=rev Author: bazaarmagetron Date: 2009-01-19 10:38:03 +0000 (Mon, 19 Jan 2009) Log Message: ----------- author: Manuel Moos Gave rTextField::GetTextLength overloads different names and argument lists so one can call them selectively. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp armagetronad/branches/utf8/armagetronad/src/render/rFont.h Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-19 10:54:59.430999994 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-19 11:28:48.292999983 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh 812 z-...@us...-20090119004301-qimh29037yc3ft3y 813 z-...@us...-20090119095459-ijj7haliyhlk5p8b + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh 812 z-...@us...-20090119004301-qimh29037yc3ft3y 813 z-...@us...-20090119095459-ijj7haliyhlk5p8b 814 z-...@us...-20090119102848-enzl6pdweyr61idb Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-19 10:03:26 UTC (rev 8866) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.cpp 2009-01-19 10:38:03 UTC (rev 8867) @@ -675,7 +675,7 @@ // do so again, with colors removed STRING_TO_FTGL( tColoredString::RemoveColors(t), str_colorless ); float height; - float width = rTextField::GetTextLength(str_colorless, h, true, true, &height); + float width = rTextField::GetTextLengthRaw(str_colorless, h, true, &height); // shrink fields that don't fit the screen REAL maxw = 1.95 - x; @@ -804,28 +804,23 @@ //! @param useNewline should newlines be recognized (and the longest line be found)? //! @param resultingHeight address to store the number of lines (height times the number of newlines+1) //! @returns the width of the string if it was printed -float rTextField::GetTextLength (tString const &utf8str, float height, bool stripColors, bool useNewline, float *resultingHeight) { +float rTextField::GetTextLength (std::string const &utf8str, float height, bool stripColors, bool useNewline, float *resultingHeight) { if(stripColors) { tString colorlessstr = tColoredString::RemoveColors(utf8str.c_str()); STRING_TO_FTGL(colorlessstr, str); - return sr_Font.GetWidth(str, height); + return GetTextLengthRaw( str, height, useNewline, resultingHeight ); } else { STRING_TO_FTGL( utf8str, str ); - return sr_Font.GetWidth(str, height); + return GetTextLengthRaw( str, height, useNewline, resultingHeight ); } - //TODO: Implement all the rest! } //! @param str the string to be used //! @param height the height of one character -//! @param stripColors should colors be recognized? //! @param useNewline should newlines be recognized (and the longest line be found)? //! @param resultingHeight address to store the number of lines (height times the number of newlines+1) //! @returns the width of the string if it was printed -float rTextField::GetTextLength (FTGL_STRING const &str, float height, bool stripColors, bool useNewline, float *resultingHeight) { - //if(stripColors) { - // return sr_Font.GetWidth(tColoredString::RemoveColors(str.c_str()), height); //TODO: Implement all the rest! - //} +float rTextField::GetTextLengthRaw (FTGL_STRING const &str, float height, bool useNewline, float *resultingHeight) { return sr_Font.GetWidth(str, height); //TODO: Implement all the rest! } Modified: armagetronad/branches/utf8/armagetronad/src/render/rFont.h =================================================================== --- armagetronad/branches/utf8/armagetronad/src/render/rFont.h 2009-01-19 10:03:26 UTC (rev 8866) +++ armagetronad/branches/utf8/armagetronad/src/render/rFont.h 2009-01-19 10:38:03 UTC (rev 8867) @@ -202,8 +202,8 @@ static tColor const & GetBlendColor( void ); //!< Gets color all other colors are multiplied with static void GetBlendColor( tColor & blendColor ); //!< Gets color all other colors are multiplied with - static float GetTextLength (tString const &str, float height, bool stripColors=false, bool useNewline=true, float *resultingHeight=0); //!< Predict the dimenstions of a string - static float GetTextLength (FTGL_STRING const &str, float height, bool stripColors=false, bool useNewline=true, float *resultingHeight=0); //!< Predict the dimenstions of a string + static float GetTextLength (std::string const &str, float height, bool stripColors=false, bool useNewline=true, float *resultingHeight=0); //!< Predict the dimenstions of a string + static float GetTextLengthRaw (FTGL_STRING const &str, float height, bool useNewline=true, float *resultingHeight=0); //!< Predict the dimenstions of a string private: inline void WriteChar(FTGL_CHAR c); //!< writes a single character as it is, no automatic newline breaking This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-19 11:13:35
|
Revision: 8868 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8868&view=rev Author: bazaarmagetron Date: 2009-01-19 11:13:31 +0000 (Mon, 19 Jan 2009) Log Message: ----------- author: Manuel Moos Old user configuration files are now read in latin1 mode, and the validity of the utf8 of new files is verified. Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/src/tools/tConfiguration.cpp armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp armagetronad/branches/utf8/armagetronad/src/tools/tString.h Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-19 11:28:48.292999983 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-19 12:06:39.637000084 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh 812 z-...@us...-20090119004301-qimh29037yc3ft3y 813 z-...@us...-20090119095459-ijj7haliyhlk5p8b 814 z-...@us...-20090119102848-enzl6pdweyr61idb + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh 812 z-...@us...-20090119004301-qimh29037yc3ft3y 813 z-...@us...-20090119095459-ijj7haliyhlk5p8b 814 z-...@us...-20090119102848-enzl6pdweyr61idb 815 z-...@us...-20090119110639-wbmlekh83ahhkpoz Modified: armagetronad/branches/utf8/armagetronad/src/tools/tConfiguration.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tools/tConfiguration.cpp 2009-01-19 10:38:03 UTC (rev 8867) +++ armagetronad/branches/utf8/armagetronad/src/tools/tConfiguration.cpp 2009-01-19 11:13:31 UTC (rev 8868) @@ -43,6 +43,7 @@ #include "tCommandLine.h" #include "tResourceManager.h" #include "tError.h" +#include "utf8.h" #include <vector> #include <string.h> @@ -54,6 +55,8 @@ bool tConfItemBase::printChange=true; bool tConfItemBase::printErrors=true; +// flag indicating the currently loaded config is in latin1 encoding (default: utf8) +static bool st_loadAsLatin1 = false; //! @param newLevel the new access level to set over the course of the lifetime of this object //! @param allowElevation only if set to true, getting higher access rights is possible. Use with extreme care. @@ -626,6 +629,32 @@ line << rest; } + // convert to utf8 + if ( st_loadAsLatin1 ) + { + line = st_Latin1ToUTF8( line ); + } + + // and check. No invalid utf8 string must enter the system. + { + tString::iterator reader = line.begin(); + try + { + while( reader != line.end() ) + { + // convert from utf8 + utf8::next( reader, line.end() ); + } + } + catch(...) + { + con << "Illegal utf8 found in config file, ignoring most of it.\n"; + + // save what there is to save + line.NetFilter(); + } + } + if ( line.Len() <= 1 ) continue; @@ -835,10 +864,32 @@ // configuration files to load. The first one found will be loaded, and // only the very first one will be written to. Use it to protect stable client's // config from the experimental client's wrath. -char const * st_userConfigs[] = { "user_3_1.cfg", "user_3_0.cfg", "user.cfg", 0 }; +char const * st_userConfigs[] = { "user_3_1_utf8.cfg", 0 }; +char const * st_userConfigsLatin1[] = { "user_3_1.cfg", "user_3_0.cfg", "user.cfg", 0 }; static void st_InstallSigHupHandler(); +static bool st_LoadUserConfigs( char const * const * userConfig, bool latin1 ) +{ + const tPath& var = tDirectories::Var(); + + st_loadAsLatin1 = latin1; + + // load the first available user configuration file + while ( *userConfig ) + { + if ( Load( var, *userConfig ) ) + { + st_loadAsLatin1 = false; + return true; + } + userConfig++; + } + + st_loadAsLatin1 = false; + return false; +} + void st_LoadConfig( bool printChange ) { // default include files are executed at owner level @@ -854,12 +905,8 @@ #ifdef DEDICATED tConfItemBase::printErrors=false; #endif - { - // load the first available user configuration file - char const * const * userConfig = st_userConfigs; - while ( *userConfig && !Load( var, *userConfig ) ) - userConfig++; - } + st_LoadUserConfigs( st_userConfigs, false ) || st_LoadUserConfigs( st_userConfigsLatin1, true ); + tConfItemBase::printErrors=true; Load( config, "settings.cfg" ); Modified: armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp 2009-01-19 10:38:03 UTC (rev 8867) +++ armagetronad/branches/utf8/armagetronad/src/tools/tString.cpp 2009-01-19 11:13:31 UTC (rev 8868) @@ -1665,10 +1665,11 @@ // * // ******************************************************************************************* //! +//! @param filterWhitespace whether whitespace should be filtered away //! // ******************************************************************************************* -void tString::NetFilter( void ) +void tString::NetFilter( bool filterWhitespace ) { // output string tString out; Modified: armagetronad/branches/utf8/armagetronad/src/tools/tString.h =================================================================== --- armagetronad/branches/utf8/armagetronad/src/tools/tString.h 2009-01-19 10:38:03 UTC (rev 8867) +++ armagetronad/branches/utf8/armagetronad/src/tools/tString.h 2009-01-19 11:13:31 UTC (rev 8868) @@ -179,7 +179,7 @@ void SetLen( int len ); //!< sets the allocated length - void NetFilter(); //!< filters strings from the net for strange things like newlines + void NetFilter( bool filterWhitespace = true ); //!< filters strings from the net for strange things like newlines }; //! proxy class for inserting color markings This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-25 20:43:49
|
Revision: 8888 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8888&view=rev Author: bazaarmagetron Date: 2009-01-25 20:43:43 +0000 (Sun, 25 Jan 2009) Log Message: ----------- Automatic merging of commits that would change history order: ------------------------------------------------------------ revno: 815.2.1 committer: Bazaarmagetron <z-...@us...> branch nick: utf8-armagetronad-sync timestamp: Sun 2009-01-25 17:58:03 +0100 message: Automatic merging of commits that would change history order: ------------------------------------------------------------ revno: 815.1.3 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Sat 2009-01-24 23:27:19 +0100 message: Merging from trunk. ------------------------------------------------------------ revno: 789.1.6 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Mon 2009-01-19 16:24:06 +0100 message: Added binary resources used by default cockpit. ------------------------------------------------------------ revno: 789.1.5 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Mon 2009-01-19 16:23:29 +0100 message: Added place for binary resources from where they?re just copied over to the included resource directory. ------------------------------------------------------------ revno: 789.1.4 committer: z-man timestamp: Mon 2009-01-19 00:39:35 +0000 message: Merging branch 0.2.8 from revision 8854 to 8863: ------------------------------------------------------------------------ r8863 | bazaarmagetron | 2009-01-19 01:32:55 +0100 (Mon, 19 Jan 2009) | 5 lines author: Manuel Moos Worked around SDL/input system bug: composite characters (" + a -> ?) never send SDL_KEYUP events when the last key is released, so the key repeat system needs to ignore them. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 815.1.2 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Sat 2009-01-24 23:18:48 +0100 message: Explicitly ignoring some return values so GCC doesn't complain. ------------------------------------------------------------ revno: 815.1.1 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Sat 2009-01-24 23:18:32 +0100 message: Better ftgl check. ------------------------------------------------------------ revno: 815.1.3 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Sat 2009-01-24 23:27:19 +0100 message: Merging from trunk. ------------------------------------------------------------ revno: 789.1.6 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Mon 2009-01-19 16:24:06 +0100 message: Added binary resources used by default cockpit. ------------------------------------------------------------ revno: 789.1.5 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Mon 2009-01-19 16:23:29 +0100 message: Added place for binary resources from where they?re just copied over to the included resource directory. ------------------------------------------------------------ revno: 789.1.4 committer: z-man timestamp: Mon 2009-01-19 00:39:35 +0000 message: Merging branch 0.2.8 from revision 8854 to 8863: ------------------------------------------------------------------------ r8863 | bazaarmagetron | 2009-01-19 01:32:55 +0100 (Mon, 19 Jan 2009) | 5 lines author: Manuel Moos Worked around SDL/input system bug: composite characters (" + a -> ?) never send SDL_KEYUP events when the last key is released, so the key repeat system needs to ignore them. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 815.1.2 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Sat 2009-01-24 23:18:48 +0100 message: Explicitly ignoring some return values so GCC doesn't complain. ------------------------------------------------------------ revno: 815.1.1 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Sat 2009-01-24 23:18:32 +0100 message: Better ftgl check. Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8854&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8854&view=rev Modified Paths: -------------- armagetronad/branches/utf8/armagetronad/configure.ac armagetronad/branches/utf8/armagetronad/resource/Makefile.am armagetronad/branches/utf8/armagetronad/src/render/rSysdep.cpp armagetronad/branches/utf8/armagetronad/src/resource/tResourceManager.cpp armagetronad/branches/utf8/armagetronad/src/ui/uMenu.cpp Added Paths: ----------- armagetronad/branches/utf8/armagetronad/resource/binary/ armagetronad/branches/utf8/armagetronad/resource/binary/wrtlprnft/ armagetronad/branches/utf8/armagetronad/resource/binary/wrtlprnft/benboisclock-1.aatex.png armagetronad/branches/utf8/armagetronad/resource/binary/wrtlprnft/floor-1.aatex.png armagetronad/branches/utf8/armagetronad/resource/binary/wrtlprnft/gauge_horizontal-1.aatex.png armagetronad/branches/utf8/armagetronad/resource/binary/wrtlprnft/gauge_horizontal_filled-1.aatex.png Property Changed: ---------------- armagetronad/branches/utf8/armagetronad/ Property changes on: armagetronad/branches/utf8/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-19 12:06:39.637000084 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-25 18:16:12.326999903 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: utf8-armagetronad-sync Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi z-...@us...-20090112103632-yroyhl5crs8uad38 ma...@mo...-20090112112802-yk5fp7eetdy8ef48 ma...@mo...-20090112115717-sd79x6ml6zk0noom z-...@us...-20090113073533-hmwz45y2gj2ptcpk svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8855 + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi z-...@us...-20090112103632-yroyhl5crs8uad38 ma...@mo...-20090112112802-yk5fp7eetdy8ef48 ma...@mo...-20090112115717-sd79x6ml6zk0noom z-...@us...-20090113073533-hmwz45y2gj2ptcpk svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8855 z-...@us...-20090125165803-45x17nanw70n5nd6 Modified: bzr:file-ids - + resource/binary binary-20090119152048-8q3w0gfk6cvduxdp-1 resource/binary/wrtlprnft wrtlprnft-20090119152401-rj67i3c7f43bdava-1 resource/binary/wrtlprnft/gauge_horizontal-1.aatex.png gauge_horizontal1.aa-20090119152401-rj67i3c7f43bdava-4 resource/binary/wrtlprnft/gauge_horizontal_filled-1.aatex.png gauge_horizontal_fil-20090119152401-rj67i3c7f43bdava-5 resource/binary/wrtlprnft/floor-1.aatex.png floor1.aatex.png-20090119152401-rj67i3c7f43bdava-3 resource/binary/wrtlprnft/benboisclock-1.aatex.png benboisclock1.aatex.-20090119152401-rj67i3c7f43bdava-2 Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh 812 z-...@us...-20090119004301-qimh29037yc3ft3y 813 z-...@us...-20090119095459-ijj7haliyhlk5p8b 814 z-...@us...-20090119102848-enzl6pdweyr61idb 815 z-...@us...-20090119110639-wbmlekh83ahhkpoz + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk 782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j 783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf 784 lee...@gm...-20090112214315-r8akrgn38um8llfc 785 z-...@us...-20090115005714-uscid6wcwnjqzcht 787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym 788 z-...@us...-20090116160116-47he0b9dhkvzfo8e 789 z-...@us...-20090116160130-yu0foyldpp0w651o 795 z-...@us...-20090117122344-comx3bxy0d41qpwd 796 mathias@earth-20090117150753-nhe4uiepl6tygf3i 797 z-...@us...-20090117195331-6gc1v90xckw6hscm 798 z-...@us...-20090117203629-of7hakl55vftnfiy 799 z-...@us...-20090117204902-42gcsuz3i4gxnfjn 800 z-...@us...-20090117214725-sas6xmcy28cfdf5j 801 z-...@us...-20090117214905-nagdvts9p9avev4n 802 z-...@us...-20090117234325-da4cduc5if9isv09 803 z-...@us...-20090117234342-9n4gkfl4uq07bmbp 804 z-...@us...-20090118013638-zk6n9i23iy3kikcs 805 z-...@us...-20090118192233-p8y9d18pgsjwpk3f 806 z-...@us...-20090118213108-p1nhbalpb5z1yjtz 807 mathias@earth-20090118203608-hpkb7nusbkgfedcv 808 z-...@us...-20090118230326-t6fj8wq4c6ecsng9 809 z-...@us...-20090118230448-58gvyvdyrujtfez0 810 z-...@us...-20090118230457-d68h7tht11w8p5qs 811 z-...@us...-20090118233214-qynv9j3ea8qyh0nh 812 z-...@us...-20090119004301-qimh29037yc3ft3y 813 z-...@us...-20090119095459-ijj7haliyhlk5p8b 814 z-...@us...-20090119102848-enzl6pdweyr61idb 815 z-...@us...-20090119110639-wbmlekh83ahhkpoz 816 z-...@us...-20090125171612-2rca0fdcn6062019 Modified: armagetronad/branches/utf8/armagetronad/configure.ac =================================================================== --- armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-25 12:30:31 UTC (rev 8887) +++ armagetronad/branches/utf8/armagetronad/configure.ac 2009-01-25 20:43:43 UTC (rev 8888) @@ -816,7 +816,7 @@ FTGL_ERROR="You need the library ftgl in at least version 2.1.3~rc5 to compile Armagetron. Read the file doc/install_linux.html." -AC_CHECK_LIB(ftgl,FT_Render_Glyph, +AC_CHECK_LIB(ftgl,ftglRenderGlyph, CPPFLAGS="$CPPFLAGS $FTGL_CFLAGS" LIBS="$LIBS $FTGL_LIBS" , Modified: armagetronad/branches/utf8/armagetronad/resource/Makefile.am =================================================================== --- armagetronad/branches/utf8/armagetronad/resource/Makefile.am 2009-01-25 12:30:31 UTC (rev 8887) +++ armagetronad/branches/utf8/armagetronad/resource/Makefile.am 2009-01-25 20:43:43 UTC (rev 8888) @@ -6,7 +6,7 @@ sourcefiles = $(shell test -d ${srcdir}/proto && find ${srcdir}/proto -type f | grep -v CVS | grep -v "~") included: ${sourcefiles} ${top_srcdir}/batch/make/sortresources.py ${top_srcdir}/batch/make/copyresources.py Makefile - if test -d ${srcdir}/proto; then python ${top_srcdir}/batch/make/copyresources.py ${srcdir}/proto $@; fi + if test -d ${srcdir}/proto; then python ${top_srcdir}/batch/make/copyresources.py ${srcdir}/proto $@ && cp -r ${srcdir}/binary/* $@/; fi # @sh ${top_srcdir}/batch/make/sortresources ${srcdir}/proto $@ ${top_srcdir}/batch/make/sortresources.py || { rm -rf $@; false; } all: included Added: armagetronad/branches/utf8/armagetronad/resource/binary/wrtlprnft/benboisclock-1.aatex.png =================================================================== --- armagetronad/branches/utf8/armagetronad/resource/binary/wrtlprnft/benboisclock-1.aatex.png (rev 0) +++ armagetronad/branches/utf8/armagetronad/resource/binary/wrtlprnft/benboisclock-1.aatex.png 2009-01-25 20:43:43 UTC (rev 8888) @@ -0,0 +1,145 @@ +\x89PNG + + |