Aircraft queueing & planespeed

Benbo · Post by **Benbo** » 30 Jan 2006 18:10

That is the one thing I need. You ought to start a topic on it, and see if you could get someone to create a patch for that.

CobraA1 · Post by **CobraA1** » 02 Feb 2006 01:48

about the bug with concorde landing to fast and taxying above runway (if it's what xyz was talking about),

Yeah - apparently at 1000+ MPH @ x8 speeds, the landing is barely a couple of cycles of the game loop, and that throws everything out of whack.

I'm implementing a couple of solutions:

a) Clamping the aircraft to the correct height when it lands.

b) Decreasing the speed of the aircraft as it approaches the airport. It's silly & unrealistic for the aircraft to go from 1000 MPH to a stop in the blink of an eye.

i'v just got an idea:
is it posible to put a "open/close aeroport" button that will keep all the airplains in the queue. this will be usefull when updating the aeroports.

Excellent idea! Start a new thread for this, though: Although I love the idea, that's not part of the purpose of my patch. I may, however, take a look into this if I have time.

Gotta remember when creating language packs that the europeans use "aeroport," and Americans use "airport."

multiply by _patches.aircraft_speed_coeff isn't needed 'cause v->max_speed isn't modified by your patch.

Hmm, it seems you're correct. Fixed.

If you're interested by having plane altitude depending of it's current speed

Not really. Other than the holding pattern, it should be the same as the unpatched OpenTTD, which already has this in place.

The original code is:

Code: Select all

	switch (v->max_speed) {
		case 37: return 162;
		case 74: return 171;
		default: return 180;

Edit: I've uploaded my changes. The supersonic aircraft should now slow down to subsonic before entering the landing sequence, and landed aircraft should be forced to ground level.

Gedemon · Post by **Gedemon** » 02 Feb 2006 13:31

problems appear with the (switch...case) with newgrf : planes have more than 3 different speed, and slow planes can fly at same altitude as concorde allowing a "go throught another plane".

but that's not a big problem anyway

(and is not related to your patch but defaut ottd)

CobraA1 · Post by **CobraA1** » 05 Mar 2006 02:40

Another update - and I'm thinking about doing as a summer project (after the current college semester is over) some more major changes, based upon my experiences with playing Falcon 4.0: Allied Force.

If you've never experienced Falcon 4.0: AF's campaign engine, and you are a flight/combat sim enthusiast - you don't know what you're missing

. This isn't the canned missions of most other flight sims: In AF, the computer is simulating an actual war, and generates missions to accomplish its goals. Each and every plane, vehicle, etc is on a mission trying to accomplish something.

IMHO, they model the the landing system of a real airport quite well - the aircraft controllers give me directions, and since I'm not the only plane landing (I'm part of a real simulated war), they'll have me land as part of a sequence & stuff. I may attempt to duplicate that in future versions of the patch.

Anyways, I needed to do an update of the patch, because the devs decided to completely rework part of the patch UI. This will affect *everybody's* patches, BTW - so if you made a patch, update it!!

IN_human · Post by **IN_human** » 13 Mar 2006 08:58

Hi, I've just tried to install the patch and got the error msg:

Cannot open file 'C:\Program Files\OpenTTD\data\2ccmap.grf
Where can I get that .grf?

P.S. Noob alert!!!

Darkvater · Post by **Darkvater** » 13 Mar 2006 09:26

from SVN (or one of the nightlies)

http://svn.openttd.org/cgi-bin/trac.cgi ... format=raw

CobraA1 · Post by **CobraA1** » 13 Mar 2006 21:12

The patch is designed to work with the current SVN, which recently added that file. It will not work with the currently released code.

CobraA1 · Post by **CobraA1** » 23 Mar 2006 15:06

They changed the way patches work again - and fixed the problem with a bunch of hardcoded numbers

. Patch updated to reflect that.

Michi_cc · Post by **Michi_cc** » 09 Apr 2006 21:07

Hi,

I found some bugs in your patch. Four times I think you've put code inside an assert(), which is a big no-no, as everything inside an assert will be completely striped out in a release build. Asserts must never contain actual code, only debugging aids. As it stands right now, only debug builds are working correctly.

-- Michael Lutz

DaleStan · Post by **DaleStan** » 10 Apr 2006 19:45

I can only find three:
assert(st->airport_queue->push(st->airport_queue, v)); //near aircraft_cmd.c:900
assert(st->airport_queue->push(st->airport_queue, v)); //near aircraft_cmd.c:1670
assert(st->helicopter_queue->push(st->helicopter_queue, v)); //near aircraft_cmd.c:1675

And yes, that is absolutely broken. My version of the C library has #define assert(x) ((void)0) in non-debug builds. Other versions probably use similar constructs.
Either (1) implement and use verify:

Code: Select all

#ifdef _DEBUG // IIRC, _DEBUG is #defined only for debug builds. If that's not the case, use the appropriate symbol.
#define verify(x) assert(x)
#else
#define verify(x) (x)
#endif

or (2) move the queue manipulations outside the assert.

Michi_cc · Post by **Michi_cc** » 10 Apr 2006 21:37

DaleStan wrote:I can only find three:

Yes, you're right. Counting is overrated anyway

All remaining asserts in the code do look okay.

-- Michael Lutz

richk67 · Post by **richk67** » 10 Apr 2006 22:58

Hi Cobra - can you make sure your patch is up to date with current SVN, and I'll add it to the Integrated Nightly build. Thanks.

Tiberius · Post by **Tiberius** » 10 Jun 2006 16:49

Code: Select all

			if (u->type == VEH_Aircraft) {
				/* Take out of airport queue
				*/
				if(u->queue_item != NULL)
				{
					v->queue_item->queue->del(v->queue_item->queue, v);
				}
			}

I guess that inner "v" should actually be "u" instead?

CobraA1 · Post by **CobraA1** » 13 Jun 2006 03:43

Sorry that I haven't been working on my patch. I've been working on other stuff, and just don't have the time. Perhaps in a few months I may get back to working on the patch again, but for now I won't be working on it.

CobraA1 · Post by **CobraA1** » 18 Jun 2006 17:35

Alright, looks like everybody wants it in the nightlies.

I've taken a bit of time to fix the assertions and the uv problems, and updated it for the latest SVN.

Other than that, no changes.

My idea of redoing the landing sequence, alas, won't come to be this year, as I've been busy with other projects.

CobraA1 · Post by **CobraA1** » 25 Jun 2006 13:16

I need help merging some changes (this is the MiniIN code - MiniIn players rejoice, I am working on it!):

Code: Select all

<<<<<<< .mine
			case OT_LOADING:
				SetDParam(0, v->current_order.station);
				SetDParam(1, v->cur_speed * 8 / _patches.aircraft_speed_coeff);
				str = STR_882F_LOADING_UNLOADING;
				break;
=======
			case OT_LOADING: {
				// Vehicle window displays the amount loaded and total capacity while loading in a station
                                const Vehicle *u;
                                uint16 cargo_count=0, cargo_cap=0;

>>>>>>> .theirs

                                u = v->next;

				cargo_count = v->cargo_count + u->cargo_count;
				cargo_cap = v->cargo_cap + u->cargo_cap;

                                if (cargo_count == 0 && !(v->current_order.flags & OF_FULL_LOAD)) {
                                        // Total cargo = 0 and order for current station is not Full Load means we're unloading
                                        str = STR_VEHICLE_UNLOADING;
                                } else {
                                        str = STR_VEHICLE_LOADING;
                                        if (cargo_count > 0) {
                                                // common notation (cargo_count/cargo_cap)*100 won't work because uint16/uint16 returns a uint16
                                                // making the display show either 0% or 100%
                                                SetDParam(0, ((cargo_count*100)/cargo_cap));
                                        } else {
                                                // Can't divide by zero. This shouldn't happen, but in case it does...  display 0%
                                                // if total capacity is 0.
                                                SetDParam(0, 0);
                                        }
                                }
                                break;
                        }

I can't really see what they're doing, it seems like the code's changed pretty radically - suggestions?

gigajum · Post by **gigajum** » 26 Jun 2006 03:57

i have no idea from where you fetched that code.
i'll take a look at miniIN diffs and i hope i can finde something.

Next time please write somewhere where you get that code from, that will help a lot

i found the part, at least i hope i found the right. Is aircraft_gui.c right?

I'll add the code in some minutes

edit1:
so here it is:
the strings to display are:

Code: Select all

STR_VEHICLE_LOADING                                             :{LTBLUE}Loading {NUM}%  
STR_VEHICLE_UNLOADING                                           :{LTBLUE}Unloading  
STR_VEHICLE_DEPARTING                                           :{LTBLUE}Departing

But you use

Code: Select all

STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Loading / Unloading

which has no params, but you set two by using SetDParam.
So i can't give yome help here without any further code. For me it looks like the two "SetDParam..." lines are never used, they got set, right but no lang string requires them as far as i can see

to your question about merging

Code: Select all

					....
					// Can't divide by zero. This shouldn't happen, but in case it does...  display 0%  
					// if total capacity is 0.  
					SetDParam(0, 0);  
					}  
				SetDParam(0, v->current_order.station); 
				SetDParam(1, v->cur_speed * 8 / _patches.aircraft_speed_coeff); 
				}  
				break;  
			}

some edits:
btw your code is outdated, you need to update your miniIN working copy

CobraA1 · Post by **CobraA1** » 26 Jun 2006 04:12

yes, aircraft_gui.c, around line 547.

CobraA1 · Post by **CobraA1** » 02 Jul 2006 13:25

Alright, looks like you're right.

The second parameter is the aircraft's speed indicator, which is carelessley copied from the other case statements, even though it isn't used in this particular string.

Thanks for pointing that out, it'll need to be fixed in both the MiniIN and the trunk patches.

More than likely, I can just dump my code and use theirs - it looks like I don't need any modifications for that section of code.

In addition, I finally got the MiniIN code to compile, so I'm going to create a new savegame with an intercontinential airport for testing my patch with.

btw your code is outdated, you need to update your miniIN working copy

I know, I'll do that also now that I can finish editing my patch.

I hope now to see what the problem is with the largest airport, and should have a MiniIN patch available soon.

EDIT: MiniIN Patch is here! Attached to this post.

richk67 · Post by **richk67** » 07 Jul 2006 22:32

CobraA1 wrote:I hope now to see what the problem is with the largest airport, and should have a MiniIN patch available soon.

EDIT: MiniIN Patch is here! Attached to this post.

Thanks CobraA1. Ive not checked it with the Intercontinental, but have definitely got problems with the Helistation. The helicopters stop in mid air someway short of the helistation, never to proceed further.

Also, your settings vars need to be CONDVARs with the min version number of 35; in vehicle.c you also need to update the min/max version numbers to be 0..34, and 35..SL_MAX_VERSION.

At the mo, I'll hold fire uploading this, as it definitely breaks the helistations. Any chance of an update? Thanks.

Transport Tycoon Forums

Aircraft queueing & planespeed

Who is online