Changeset - r14126:f23988064e74
[Not reviewed]
master
0 16 0
rubidium - 14 years ago 2010-01-01 18:45:40
rubidium@openttd.org
(svn r18683) -Fix: it's not an other
16 files changed with 19 insertions and 19 deletions:
0 comments (0 inline, 0 general)
changelog.txt
Show inline comments
 
@@ -2354,13 +2354,13 @@ 0.3.5 (2004-12-24)
 
- Fix: Game options (like drive side) are not taken from the scenario when using 'new game' command
 
- Fix: Order checker now correctly detects station with invalid facilities
 
- Fix: Polished GUI in a lot of ways
 
- Fix: Saving or loading a map doesnt pauses the game anymore
 
- Fix: Some bridge part is not displayed transparent in transparent mode
 
- Fix: Starting with -r option allows all resolutions
 
- Fix: The pathfinder no longer sees rail with an other owner as a possible route
 
- Fix: The pathfinder no longer sees rail with another owner as a possible route
 
- Fix: Unable to select other screenshot format in Game Option
 
- Fix: Unwanted town renaming
 
- Fix: Vehicles slow down under bridge if the track is on a foundation
 
- Fix: You can no longer change name of waypoints whom are owned by somebody else
 
- Fix: Shares are now also sold when a company goes bankrupt [SF#1090313]
 
- Fix: It is no longer possible to crash trains of other companies by building a depot close to a station. (even more: trains do no longer enter tiles that do not belong to his owner) [SF#1087701]
docs/32bpp.txt
Show inline comments
 
@@ -24,13 +24,13 @@ in your images, you will need to add a m
 
remapping. The name is simular as above, only you have to put a 'm' behind the
 
SpriteID. This image should be a 8bpp palette image, where the palette is the
 
OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
 
the RGB (not the Alpha) of the original PNG image, and replacing it with a
 
8bpp color remapped and converted to 32bpp.
 

	
 
An other thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
 
Another thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
 
y_offs. This to define the x- and y-offset, of course. Use the tool we supply
 
to add this information. Sadly enough most graphical editors trashes those
 
chunks upon save, so you have to readd it every time you save your image.
 

	
 
Your images should be the same as the grf, in size.
 

	
src/ai/api/ai_abstractlist.hpp
Show inline comments
 
@@ -138,13 +138,13 @@ public:
 
	 * @note the current item stays at the same place.
 
	 * @see SORT_ASCENDING SORT_DESCENDING
 
	 */
 
	void Sort(SorterType sorter, bool ascending);
 

	
 
	/**
 
	 * Add one list to an other one.
 
	 * Add one list to another one.
 
	 * @param list The list that will be added to the caller.
 
	 * @post The list to be added ('list') stays unmodified.
 
	 * @note All added items keep their value as it was in 'list'.
 
	 * @note If the item already exists inside the caller, the value of the
 
	 *  list that is added is set on the item.
 
	 */
src/ai/api/ai_tunnel.hpp
Show inline comments
 
@@ -33,13 +33,13 @@ public:
 
		/** Can't build tunnels on water */
 
		ERR_TUNNEL_CANNOT_BUILD_ON_WATER,            // [STR_ERROR_CAN_T_BUILD_ON_WATER]
 

	
 
		/** The start tile must slope either North, South, West or East */
 
		ERR_TUNNEL_START_SITE_UNSUITABLE,            // [STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL]
 

	
 
		/** An other tunnel is in the way */
 
		/** Another tunnel is in the way */
 
		ERR_TUNNEL_ANOTHER_TUNNEL_IN_THE_WAY,        // [STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY]
 

	
 
		/** Unable to excavate land at the end to create the tunnel's exit */
 
		ERR_TUNNEL_END_SITE_UNSUITABLE,              // [STR_ERROR_UNABLE_TO_EXCAVATE_LAND]
 
	};
 

	
src/debug.h
Show inline comments
 
@@ -69,13 +69,13 @@ const char *GetDebugString();
 
 *   TOC("A name", 5);
 
 * }
 
 *
 
 * Is the correct usage for multiple TIC() / TOC() calls.
 
 *
 
 * TIC() / TOC() creates it's own block, so make sure not the mangle
 
 *  it with an other block.
 
 *  it with another block.
 
 **/
 
#define TIC() {\
 
	extern uint64 ottd_rdtsc();\
 
	uint64 _xxx_ = ottd_rdtsc();\
 
	static uint64 __sum__ = 0;\
 
	static uint32 __i__ = 0;
src/economy.cpp
Show inline comments
 
@@ -301,13 +301,13 @@ void ChangeOwnershipOfCompanyItems(Owner
 
		_current_company = old_owner;
 
		FOR_ALL_COMPANIES(c) {
 
			for (i = 0; i < 4; i++) {
 
				if (c->share_owners[i] == old_owner) {
 
					/* Sell his shares */
 
					CommandCost res = DoCommand(0, c->index, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY);
 
					/* Because we are in a DoCommand, we can't just execute an other one and
 
					/* Because we are in a DoCommand, we can't just execute another one and
 
					 *  expect the money to be removed. We need to do it ourself! */
 
					SubtractMoneyFromCompany(res);
 
				}
 
			}
 
		}
 

	
 
@@ -315,13 +315,13 @@ void ChangeOwnershipOfCompanyItems(Owner
 
		c = Company::Get(old_owner);
 
		for (i = 0; i < 4; i++) {
 
			_current_company = c->share_owners[i];
 
			if (_current_company != INVALID_OWNER) {
 
				/* Sell the shares */
 
				CommandCost res = DoCommand(0, old_owner, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY);
 
				/* Because we are in a DoCommand, we can't just execute an other one and
 
				/* Because we are in a DoCommand, we can't just execute another one and
 
				 *  expect the money to be removed. We need to do it ourself! */
 
				SubtractMoneyFromCompany(res);
 
			}
 
		}
 
	}
 

	
src/map_func.h
Show inline comments
 
@@ -235,13 +235,13 @@ static inline TileIndexDiff ToTileIndexD
 

	
 
#ifndef _DEBUG
 
	/**
 
	 * Adds to tiles together.
 
	 *
 
	 * @param x One tile
 
	 * @param y An other tile to add
 
	 * @param y Another tile to add
 
	 * @return The resulting tile(index)
 
	 */
 
	#define TILE_ADD(x,y) ((x) + (y))
 
#else
 
	extern TileIndex TileAdd(TileIndex tile, TileIndexDiff add,
 
		const char *exp, const char *file, int line);
src/network/network_chat_gui.cpp
Show inline comments
 
@@ -380,13 +380,13 @@ struct NetworkChatWindow : public QueryS
 
		tb_len  = strlen(tb_buf);
 

	
 
		while ((cur_name = ChatTabCompletionNextItem(&item)) != NULL) {
 
			item++;
 

	
 
			if (_chat_tab_completion_active) {
 
				/* We are pressing TAB again on the same name, is there an other name
 
				/* We are pressing TAB again on the same name, is there another name
 
				 *  that starts with this? */
 
				if (!second_scan) {
 
					size_t offset;
 
					size_t length;
 

	
 
					/* If we are completing at the begin of the line, skip the ': ' we added */
src/order_cmd.cpp
Show inline comments
 
@@ -186,13 +186,13 @@ void InvalidateVehicleOrder(const Vehicl
 
	SetWindowDirty(WC_VEHICLE_ORDERS,    v->index);
 
	SetWindowDirty(WC_VEHICLE_TIMETABLE, v->index);
 
}
 

	
 
/**
 
 *
 
 * Assign data to an order (from an other order)
 
 * Assign data to an order (from another order)
 
 *   This function makes sure that the index is maintained correctly
 
 *
 
 */
 
void Order::AssignOrder(const Order &other)
 
{
 
	this->type  = other.type;
 
@@ -1107,13 +1107,13 @@ CommandCost CmdModifyOrder(TileIndex til
 
		}
 
	}
 

	
 
	return CommandCost();
 
}
 

	
 
/** Clone/share/copy an order-list of an other vehicle.
 
/** Clone/share/copy an order-list of another vehicle.
 
 * @param tile unused
 
 * @param flags operation to perform
 
 * @param p1 various bitstuffed elements
 
 * - p1 = (bit  0-15) - destination vehicle to clone orders to (p1 & 0xFFFF)
 
 * - p1 = (bit 16-31) - source vehicle to clone orders from, if any (none for CO_UNSHARE)
 
 * @param p2 mode of cloning: CO_SHARE, CO_COPY, or CO_UNSHARE
src/pathfinder/npf/aystar.cpp
Show inline comments
 
@@ -290,13 +290,13 @@ void init_AyStar(AyStar *aystar, Hash_Ha
 
	/* Allocated the Hash for the OpenList and ClosedList */
 
	init_Hash(&aystar->OpenListHash, hash, num_buckets);
 
	init_Hash(&aystar->ClosedListHash, hash, num_buckets);
 

	
 
	/* Set up our sorting queue
 
	 *  BinaryHeap allocates a block of 1024 nodes
 
	 *  When thatone gets full it reserves an otherone, till this number
 
	 *  When that one gets full it reserves another one, till this number
 
	 *  That is why it can stay this high */
 
	init_BinaryHeap(&aystar->OpenListQueue, 102400);
 

	
 
	aystar->addstart  = AyStarMain_AddStartNode;
 
	aystar->main      = AyStarMain_Main;
 
	aystar->loop      = AyStarMain_Loop;
src/saveload/oldloader.h
Show inline comments
 
@@ -121,13 +121,13 @@ static inline uint32 ReadUint32(Loadgame
 
/* Help:
 
 *  - OCL_SVAR: load 'type' to offset 'offset' in a struct of type 'base', which must also
 
 *       be given via base in LoadChunk() as real pointer
 
 *  - OCL_VAR: load 'type' to a global var
 
 *  - OCL_END: every struct must end with this
 
 *  - OCL_NULL: read 'amount' of bytes and send them to /dev/null or something
 
 *  - OCL_CHUNK: load an other proc to load a part of the savegame, 'amount' times
 
 *  - OCL_CHUNK: load another proc to load a part of the savegame, 'amount' times
 
 *  - OCL_ASSERT: to check if we are really at the place we expect to be.. because old savegames are too binary to be sure ;)
 
 */
 
#define OCL_SVAR(type, base, offset)         { type,                 1,    NULL, (uint)cpp_offsetof(base, offset), NULL }
 
#define OCL_VAR(type, amount, pointer)       { type,            amount, pointer,    0,                             NULL }
 
#define OCL_END()                            { OC_END,               0,    NULL,    0,                             NULL }
 
#define OCL_CNULL(type, amount)              { OC_NULL | type,  amount,    NULL,    0,                             NULL }
src/saveload/order_sl.cpp
Show inline comments
 
@@ -128,14 +128,14 @@ static void Load_ORDR()
 
	if (CheckSavegameVersionOldStyle(5, 2)) {
 
		/* Version older than 5.2 did not have a ->next pointer. Convert them
 
		 * (in the old days, the orderlist was 5000 items big) */
 
		size_t len = SlGetFieldLength();
 

	
 
		if (CheckSavegameVersion(5)) {
 
			/* Pre-version 5 had an other layout for orders
 
			    (uint16 instead of uint32) */
 
			/* Pre-version 5 had another layout for orders
 
			 * (uint16 instead of uint32) */
 
			len /= sizeof(uint16);
 
			uint16 *orders = MallocT<uint16>(len + 1);
 

	
 
			SlArray(orders, len, SLE_UINT16);
 

	
 
			for (size_t i = 0; i < len; ++i) {
src/screenshot.cpp
Show inline comments
 
@@ -350,13 +350,13 @@ static bool MakePCXImage(const char *nam
 
	uint maxlines;
 
	uint y;
 
	PcxHeader pcx;
 
	bool success;
 

	
 
	if (pixelformat == 32) {
 
		DEBUG(misc, 0, "Can't convert a 32bpp screenshot to PCX format. Please pick an other format.");
 
		DEBUG(misc, 0, "Can't convert a 32bpp screenshot to PCX format. Please pick another format.");
 
		return false;
 
	}
 
	if (pixelformat != 8 || w == 0)
 
		return false;
 

	
 
	f = fopen(name, "wb");
src/script/squirrel_std.hpp
Show inline comments
 
@@ -34,13 +34,13 @@ public:
 
	/**
 
	 * Get the highest of two integers.
 
	 */
 
	static SQInteger max(HSQUIRRELVM vm);
 

	
 
	/**
 
	 * Load an other file on runtime.
 
	 * Load another file on runtime.
 
	 * @note This is always loaded on the root-level, no matter where you call this.
 
	 * @note The filename is always relative from the script it is called from. Absolute calls are NOT allowed!
 
	 */
 
	static SQInteger require(HSQUIRRELVM vm);
 

	
 
	/**
src/spriteloader/grf.cpp
Show inline comments
 
@@ -91,13 +91,13 @@ bool SpriteLoaderGrf::LoadSprite(SpriteL
 
	}
 

	
 
	if (num != 0) return WarnCorruptSprite(file_slot, file_pos, __LINE__);
 

	
 
	sprite->AllocateData(sprite->width * sprite->height);
 

	
 
	/* When there are transparency pixels, this format has an other trick.. decode it */
 
	/* When there are transparency pixels, this format has another trick.. decode it */
 
	if (type & 0x08) {
 
		for (int y = 0; y < sprite->height; y++) {
 
			bool last_item = false;
 
			/* Look up in the header-table where the real data is stored for this row */
 
			int offset = (dest_orig[y * 2 + 1] << 8) | dest_orig[y * 2];
 

	
src/viewport.cpp
Show inline comments
 
@@ -1183,13 +1183,13 @@ void ViewportSign::UpdatePosition(int ce
 
 * Mark the sign dirty in all viewports.
 
 *
 
 * @ingroup dirty
 
 */
 
void ViewportSign::MarkDirty() const
 
{
 
	/* We use ZOOM_LVL_MAX here, as every viewport can have an other zoom,
 
	/* We use ZOOM_LVL_MAX here, as every viewport can have another zoom,
 
	 *  and there is no way for us to know which is the biggest. So make the
 
	 *  biggest area dirty, and we are safe for sure.
 
	 * We also add 1 to make sure the whole thing is redrawn. */
 
	MarkAllViewportsDirty(
 
		this->center - ScaleByZoom(this->width_normal / 2 + 1, ZOOM_LVL_MAX),
 
		this->top    - ScaleByZoom(1, ZOOM_LVL_MAX),
0 comments (0 inline, 0 general)