~ubuntu-branches/debian/squeeze/openttd/squeeze

Committer: Bazaar Package Importer
Author(s): Matthijs Kooijman
Date: 2010-07-01 08:14:02 UTC
mfrom: (1.1.12 upstream)
Revision ID: james.westby@ubuntu.com-20100701081402-98jmva0t3sqywxmi

Tags: 1.0.2-1

* [00c4efe] New upstream release 1.0.2.
* [c7b38fd] Break older openttd versions instead of Conflicting with
them.
* [36bd61f] Bump standards version to 3.9.0.

files added:
.pc/debian-changes-1.0.2-1

.pc/debian-changes-1.0.2-1/media

.pc/debian-changes-1.0.2-1/media/openttd.desktop.in

debian/patches/debian-changes-1.0.2-1

media/openttd.desktop.translation.awk

src/lang/unfinished/irish.txt

src/lang/unfinished/maltese.txt

files modified:
.pc/applied-patches

.pc/run-openttd-wrapper.patch/media/openttd.desktop.in

Makefile.bundle.in

Makefile.in

bin/ai/regression/regression.txt

changelog.txt

config.lib

debian/changelog

debian/control

debian/copyright

debian/patches/run-openttd-wrapper.patch *

debian/patches/series

known-bugs.txt

media/openttd.desktop.in

os/debian/changelog

os/os2/installer/make_installer.cmd

os/windows/installer/install.nsi

projects/determineversion.vbs

readme.txt

src/ai/api/ai_bridge.hpp

src/ai/api/ai_changelog.hpp

src/ai/api/ai_engine.cpp

src/ai/api/ai_industrytype.cpp

src/bridge_gui.cpp

src/build_vehicle_gui.cpp

src/clear_cmd.cpp

src/console.cpp

src/console_cmds.cpp

src/currency.cpp

src/engine.cpp

src/fileio.cpp

src/fileio_func.h

src/fontcache.cpp

src/genworld.cpp

src/group_gui.cpp

src/industry_cmd.cpp

src/industry_gui.cpp

src/landscape.cpp

src/lang/brazilian_portuguese.txt

src/lang/catalan.txt

src/lang/croatian.txt

src/lang/czech.txt

src/lang/danish.txt

src/lang/dutch.txt

src/lang/english.txt

src/lang/esperanto.txt

src/lang/estonian.txt

src/lang/finnish.txt

src/lang/french.txt

src/lang/galician.txt

src/lang/german.txt

src/lang/greek.txt

src/lang/hebrew.txt

src/lang/hungarian.txt

src/lang/indonesian.txt

src/lang/italian.txt

src/lang/korean.txt

src/lang/latvian.txt

src/lang/lithuanian.txt

src/lang/luxembourgish.txt

src/lang/norwegian_bokmal.txt

src/lang/norwegian_nynorsk.txt

src/lang/polish.txt

src/lang/portuguese.txt

src/lang/romanian.txt

src/lang/russian.txt

src/lang/serbian.txt

src/lang/slovak.txt

src/lang/slovenian.txt

src/lang/spanish.txt

src/lang/swedish.txt

src/lang/traditional_chinese.txt

src/lang/turkish.txt

src/lang/ukrainian.txt

src/lang/unfinished/basque.txt

src/lang/unfinished/frisian.txt

src/lang/unfinished/ido.txt

src/lang/unfinished/macedonian.txt

src/lang/unfinished/persian.txt

src/lang/unfinished/thai.txt

src/lang/unfinished/urdu.txt

src/lang/vietnamese.txt

src/misc_cmd.cpp

src/network/core/os_abstraction.h

src/network/core/tcp_game.h

src/network/network.cpp

src/network/network_content.cpp

src/network/network_func.h

src/network/network_gui.cpp

src/network/network_server.cpp

src/newgrf.cpp

src/newgrf_engine.cpp

src/newgrf_gui.cpp

src/newgrf_house.cpp

src/newgrf_house.h

src/newgrf_industries.cpp

src/newgrf_industrytiles.cpp

src/newgrf_spritegroup.h

src/news_gui.cpp

src/openttd.cpp

src/os/unix/crashlog_unix.cpp

src/os/unix/unix.cpp

src/os/windows/ottdres.rc.in

src/pathfinder/yapf/yapf_costrail.hpp

src/pathfinder/yapf/yapf_road.cpp

src/rail_cmd.cpp

src/rev.cpp.in

src/roadveh_cmd.cpp

src/saveload/afterload.cpp

src/script/script_scanner.cpp

src/settings.cpp

src/settings_internal.h

src/station.cpp

src/station_cmd.cpp

src/station_gui.cpp

src/station_gui.h

src/stdafx.h

src/strgen/strgen.cpp

src/string.cpp

src/string_func.h

src/string_type.h

src/strings.cpp

src/table/settings.h

src/table/station_land.h

src/terraform_gui.cpp

src/tile_map.h

src/town_cmd.cpp

src/train_cmd.cpp

src/tunnelbridge_cmd.cpp

src/vehicle_gui.cpp

src/vehicle_gui.h

src/viewport.cpp

src/waypoint.cpp

src/waypoint_gui.cpp

src/widgets/dropdown.cpp

src/window.cpp

src/window_gui.h

Show diffs side-by-side

added added

removed removed

src/settings.cpp

/* $Id: settings.cpp 19430 2010-03-15 22:52:39Z rubidium $ */

/* $Id: settings.cpp 19875 2010-05-21 16:03:29Z rubidium $ */

* This file is part of OpenTTD.

1643

* Set a setting value with a string.

1644

* @param index the settings index.

1645

* @param value the value to write

1646

* @note CANNOT BE SAVED IN THE SAVEGAME.

1646

* @param force_newgame force the newgame settings

1647

* @note Strings WILL NOT be synced over the network

1647

1648

bool SetSettingValue(uint index, const char *value)

1649

bool SetSettingValue(uint index, const char *value, bool force_newgame)

1649

1650

{

1650

1651

const SettingDesc *sd = &_settings[index];

1651

1652

assert(sd->save.conv & SLF_NETWORK_NO);

1652

1653

char *var = (char*)GetVariableAddress(NULL, &sd->save);

1654

ttd_strlcpy(var, value, sd->save.length);

1654

if (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ) {

1655

char **var = (char**)GetVariableAddress((_game_mode == GM_MENU || force_newgame) ? &_settings_newgame : &_settings_game, &sd->save);

1656

free(*var);

1657

*var = strcmp(value, "(null)") == 0 ? NULL : strdup(value);

1658

} else {

1659

char *var = (char*)GetVariableAddress(NULL, &sd->save);

1660

ttd_strlcpy(var, value, sd->save.length);

1661

}

1655

1662

if (sd->desc.proc != NULL) sd->desc.proc(0);

1656

1663

1657

1664

return true;

1708

1715

1709

1716

bool success;

1710

1717

if (sd->desc.cmd == SDT_STRING) {

1711

success = SetSettingValue(index, value);

1718

success = SetSettingValue(index, value, force_newgame);

1712

1719

} else {

1713

1720

uint32 val;

1714

1721

extern bool GetArgumentInteger(uint32 *value, const char *arg);

1758

1765

ptr = GetVariableAddress((_game_mode == GM_MENU || force_newgame) ? &_settings_newgame : &_settings_game, &sd->save);

1759

1766

1760

1767

if (sd->desc.cmd == SDT_STRING) {

1761

IConsolePrintF(CC_WARNING, "Current value for '%s' is: '%s'", name, (const char *)ptr);

1768

IConsolePrintF(CC_WARNING, "Current value for '%s' is: '%s'", name, (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ) ? *(const char **)ptr : (const char *)ptr);

1762

1769

} else {

1763

1770

if (sd->desc.cmd == SDT_BOOLX) {

1764

1771

snprintf(value, sizeof(value), (*(bool*)ptr == 1) ? "on" : "off");

1789

1796

if (sd->desc.cmd == SDT_BOOLX) {

1790

1797

snprintf(value, lengthof(value), (*(bool*)ptr == 1) ? "on" : "off");

1791

1798

} else if (sd->desc.cmd == SDT_STRING) {

1792

snprintf(value, sizeof(value), "%s", (const char *)ptr);

1799

snprintf(value, sizeof(value), "%s", (GetVarMemType(sd->save.conv) == SLE_VAR_STRQ) ? *(const char **)ptr : (const char *)ptr);

1793

1800

} else {

1794

1801

snprintf(value, lengthof(value), "%d", (uint32)ReadValue(ptr, sd->save.conv));

1795

1802

}

Older »