[Patch] Lord Aro's Patches. Current: DLC Textfiles

[Lord Aro]

[second half of conversation]

But it already is available to players. When you click on a town the caption of the town details window is "name" for towns and "name (City)" for cities.

Sorry, didn't knew it was already available.

ok, here goes:

I'm having trouble understanding OpenTTD's datatypes so, would this work? :

Code: Select all

/* static */ bool AITown::IsCity(TownID town_id)
{
	if (!IsValidTown(town_id)) return false;

	if (town_id->larger_town) return true;
	else return false;
}

i'm suspecting not...

[MagicBuzz]

It's exactly what I did with my "ratings in town list" patch, and it looks to work.
So I guess it will work for you too

[Lord Aro]

cool!

i personally think there should be a "main" function for this somewhere... (in town_cmd.cpp for example)

[Eddi]

ok, here goes:

Code: Select all

	if (town_id->larger_town) return true;
	else return false;

i haven't checked the correctness of this, but assuming it is, you can shorten this to:

Code: Select all

	return (bool)town_id->larger_town;

also, "else" after a "return" is usually redundant:

Code: Select all

	if (a) return b;
	return c;

has the same execution paths.

other than that, the openttd code style requires that if you have an "else" section, you must use {} to enclose the statements, even if it's only a single one.

that is your friendly programming lesson for today, thanks for your attention.

[MagicBuzz]

I didn't know that for tha else with {}

I'll have to make some clean up in my patches

[Michi_cc]

i haven't checked the correctness of this, but assuming it is, you can shorten this to:

Code: Select all

	return (bool)town_id->larger_town;

The (bool) is superfluous as larger_town already is a bool thus no cast is needed.

-- Michael Lutz

[Lord Aro]

ok,
compilation failed fairly spectacularly with this:

Code: Select all

D:/MinGW/msys/1.0/home/****/ottdsrc/trunk/src/ai/api/ai_town.cpp: In static member function 'static bool AITown::IsCity(TownID)':
D:/MinGW/msys/1.0/home/****/ottdsrc/trunk/src/ai/api/ai_town.cpp:136:16: error: base operand of '->' is not a pointer
D:/MinGW/msys/1.0/home/****/ottdsrc/trunk/src/ai/api/ai_town.cpp:137:1: warning: control reaches end of non-void function
make[1]: *** [ai/api/ai_town.o] Error 1
make[1]: Leaving directory `/home/Margo/ottdsrc/trunk/objs/release'
make: *** [all] Error 1

here be patch...

[Zuu]

The TownID datatype implies that town_id is just a number and not a class instance. Furthermore if TownID was a class type, you would either declare town_id as a pointer using a * or use a dot "." instead of "->" before "larger_town".

In this case you need to lookup which class or struct larger_town is member of and how to get hold of that data structure using a town id.

[Lord Aro]

um help?

this is a bit beyond me
i'll give it a go though...
(don't mind if someone else gets there first!)

[Eddi]

it'd probably be something along the lines of

Code: Select all

Town.Get(town_id)->larger_town

[Zuu]

I would start looking at the place where you found out that the 'larger_town' property exists. If you don't remember, run a grep through the entire source code.

Edit: I see you run msys, in that case you probably have the grep command installed there.

[Lord Aro]

Zuu: I also have Notepad++, with Explorer plugin

Thanks to Eddi, and looking at the other functions, i believe i have a working patch

Now, who knows how to edit regression?...

[Kogut]

Attached here

[Lord Aro]

No one knows how to modify regression?
However, i have noticed that it 'dies unexpectantly' Is this proper?

Kogut: Thanks for that. I don't agree with your function though, what's wrong with mine?

[Kogut]

Kogut: Thanks for that. I don't agree with your function though, what's wrong with mine?

IMHO nothing. My function? What, where, why, wtf?

[Lord Aro]

The function name on the API request thread, that you seem to have made up

Still waiting for regression instructions

[Kogut]

The function name on the API request thread, that you seem to have made up

Still waiting for regression instructions

It was not my idea and name is changed.

[Lord Aro]

update:

[Lord Aro]

final update, now with regression modifications :

[Lord Aro]

Grave dig!

Hello,

I'm currently attempting to give OTTD the ability to view textfiles in the download content window, but have run into some problems (why else would i be posting about it? )

view_content_textfile.diff

hg/git patch, r24358

(7.85 KiB) Downloaded 134 times

I'm having trouble finding the filename of the Content, as this->filename (as seen in patch) seems to be valid only when the file download is in progress

ANyone got any ideas?