dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,982 Commits 1 Branch 0 Tags
c7d1e2eab54541b806949d269a688e780d584d1a
Commit Graph

156 Commits

Author SHA1 Message Date
tron
be88e269b9 (svn r5155) - Remove the bridge branch merge (revision r5070) 2006-06-07 19:35:21 +00:00
tron
aada042d57 (svn r5136) Fix various style bugs: 
- Trailing whitespace
- Trailing empty lines
- Missing newline at EOF
- Missing svn:eol-style native
 2006-06-05 18:10:43 +00:00
peter1138
5e3dd8dd78 (svn r5105) - NewGRF: Move callbackmask from *VehicleInfo to EngineInfo. This simplifies code that works with more than one vehicle type. 2006-06-04 18:22:32 +00:00
celestar
25a63ec7af (svn r5070) Merged the bridge branch 
-Feature: Bridges can now be placed above:
	Any railway track combination (excluding depots and waypoints)
	Any road combination (excluding depots)
	Clear tiles (duh), including fields
	Tunnel entrances
	Bridge heads

Thanks to Tron for idea and implementation, KUDr for the yapf synchronization and many others for hours of testing

There are still a number of visual problems remaining, especially when electric railways are on or under the bridge.
DO NOT REPORT THOSE BUGS FOR THE TIME BEING please.
 2006-06-02 13:05:41 +00:00
celestar
c1983c3d02 (svn r5055) -Fix: Correct some errors in the bridge sprite numbers 2006-05-31 06:43:05 +00:00
tron
2a3aca6139 (svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions. 
At least in the case of checking for oil industry restrictions this makes the check conditions more clear.
 2006-05-20 16:46:37 +00:00
peter1138
5a65e3301e (svn r4896) - NewGRF: add support for vehicle property 0x25 (user defined data) used by variable 0x42. 2006-05-17 08:20:36 +00:00
celestar
5c677d49f4 (svn r4639) -Feature: Turkish town names (jnmbk) 2006-05-01 09:25:23 +00:00
belugas
7ab8b20faf (svn r4614) CodeChange : Cleanup of industry_cmd (Step-4). 
Removing the _industry_type_costs in favor of IndustrySpec.cost_multiplier;
In order to let industry_gui use the GetIndustrySpec accessor,
some structs had to be moved in industry.h
 2006-04-28 21:58:16 +00:00
belugas
6a31b30a20 (svn r4584) CodeChange : Cleanup of industry_cmd (Step-3). 
Renaming GetIndustrySpecification to GetIndustrySpec. Looks better.
Removing the _industry_prod_up/down/close_strings
in favor of IndustrySpec.closure/production_up/down_text;
A few reformatting along the way.
Work of tfc_team
 2006-04-26 21:10:01 +00:00
belugas
8d622e04f8 (svn r4578) CodeChange : Cleanup of industry_cmd (Step-2). 
Removing the _industry_min_cargo[] in favor of IndustrySpec.minimal_cargo,
IndustrySpec.a,b,c are now conflicting[], add an enum for IndustrySpec.checkproc
Work of tfc_team
 2006-04-26 17:01:27 +00:00
belugas
8443f43d1f (svn r4577) CodeChange : Cleanup of industry_cmd (Step-1). 
Add an accessor to _industry_specs array.
Work of tfc_team
 2006-04-26 14:58:06 +00:00
belugas
ebf6797678 (svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether. 2006-04-24 21:10:56 +00:00
belugas
4f81210980 (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values 2006-04-24 17:32:09 +00:00
belugas
c0acac3a14 (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. 2006-04-22 01:37:31 +00:00
Darkvater
e21b7eebfa (svn r4430) - NewGRF: Use the bridge's sprite layout for drawing high pillars. This fixes newgrf's high-bridge pillars drawing. Also remove the now obsolete _bridge_poles_table which was already integrated into the bridge sprite tables 2006-04-15 16:07:00 +00:00
celestar
bdcb4bbf1d (svn r4384) -Codechange: rail drawing code 
-Added a function to obtain the axis of a waypoint
    -Moved the waypoint layout tables from the depot layout tables into an own one
    -Use GetRailTileSubtype
 2006-04-12 12:50:40 +00:00
celestar
eae5fcc455 (svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections 2006-04-10 14:27:26 +00:00
celestar
0c3a0c7ec0 (svn r4283) -Cleanup: More elrail housekeeping, remove code dublication, more meaningful variable names, simplify control flow.. 2006-04-05 09:17:43 +00:00
celestar
4ccbf2d807 (svn r4282) -Cleanup: Re-arranged the ignore groups into a more readable arrangement 2006-04-05 08:45:29 +00:00
celestar
4acb8d5364 (svn r4281) -Cleanup: Begun cleaning up elrail code a bit, mostly comments and enum/array alignment 2006-04-05 08:28:03 +00:00
celestar
52892863e5 (svn r4278) -Fix: changed char to uint8 because signedness of char is undefined. Thanks to KUDr and Tron for research and stuff. (FS#98) 2006-04-04 19:46:18 +00:00
celestar
a7d8ad0004 (svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas. 2006-03-29 16:30:26 +00:00
belugas
26a5b62865 (svn r4092) CodeChange : Named sprites instead of magic numbers plus create/use helper macro/enum for recoloring scheme 2006-03-24 18:16:39 +00:00
belugas
3b16ae365b (svn r4004) -CodeChange : Renaming sprites and functions 2006-03-21 23:22:21 +00:00
belugas
7bedab1a40 (svn r3991) -Fix : Last remaining separation of SpriteID from Palette 2006-03-20 16:20:37 +00:00
tron
85da306049 (svn r3982) Fix last commit. I got confused by some strange test, which did nothing 2006-03-19 14:43:23 +00:00
tron
f262ae6c8b (svn r3889) Change a part of the bridge drawing code to make it more comprehensible and add the needed accessors 2006-03-15 17:27:15 +00:00
peter1138
741fc26522 (svn r3717) - [2cc] Add 2cc colour maps and use for newgrf engines requiring them. Currently the second colour is fixed to be the player's colour. 2006-03-01 23:14:03 +00:00
bjarni
7a31bb6fb6 (svn r3707) -Fix: made the generated Finnish town names sound more Finnish (ln-) 
note: <ln->     Bjarni: please go ahead and commit it, i'll take the responsibility if something should go wrong.
 2006-03-01 19:20:35 +00:00
peter1138
5e05cd4098 (svn r3685) Include a file missed from r3684... 2006-02-28 08:16:00 +00:00
peter1138
601b226f04 (svn r3602) - Move _railveh_score data to _rail_vehicle_info->ai_rank and remove global variable to return data as we can now access this directly. 2006-02-13 22:13:02 +00:00
peter1138
67573ed605 (svn r3586) - NewGRF: Load callback masks for all vehicle types. 2006-02-11 07:34:05 +00:00
tron
453b30e387 (svn r3564) Several smaller changes: 
- Don't treat non-booleans as booleans
- Reduce variable scope
- Bracing
- Use DeMorgan's law to make conditionals easier to read
- if cascade -> switch
- Replace some magic numbers by symbolic names
- Avoid assignments within other statements
 2006-02-06 09:18:04 +00:00
peter1138
6823be9d03 (svn r3523) Undefine helper macros after using them 2006-02-03 07:45:58 +00:00
peter1138
78c2b9a056 (svn r3522) - Wrap the vehicle info tables with a macro to simplify adding new fields in the future. 2006-02-03 07:42:49 +00:00
tron
22dc05faf2 (svn r3510) Fiddle with whitespace and parentheses 2006-02-01 06:32:03 +00:00
Darkvater
051c5da378 (svn r3464) - Fix: restate some of the sprites in their old spaces. Was missed out because the patch was so huge. Thanks to Tron for pointing out the command of diff to ignore whitespace-only changes (--diff-cmd diff -x -ub) 2006-01-28 13:43:45 +00:00
Darkvater
1a2fac805c (svn r3447) - CodeChange: [ 1360866 ] station_land.h Naming ALL sprites. Also replaced the SPTR_STATUE_GROUND by the more obvious SPR_CONCRETE_GROUND in unmovable_cmd.c. No functional changes except for commenting out PALETTE_RECOLOR_SPRITE in table/sprites.h. (Belugas) 2006-01-26 19:06:16 +00:00
peter1138
e81c316134 (svn r3388) - NewGRF: Allow train running cost class to differ from engine class. Also fix typo in r3384. 2006-01-07 16:47:59 +00:00
tron
3561a3068e (svn r3314) Add 2 times static 2005-12-18 12:17:53 +00:00
tron
23bfc03054 (svn r3297) Staticise 2005-12-14 06:20:23 +00:00
tron
2dc8e0c3d9 (svn r3289) 32 times static 2005-12-11 10:36:48 +00:00
Darkvater
bfeddf1db1 (svn r3254) - Fix: graphical glitch with autorail tool on a certain tile-type. 
- CodeChange: adhere the global variables in autorail.h to the coding style (eg. start with underscore).
 2005-12-02 19:41:35 +00:00
tron
ce9cbb9c47 (svn r3196) Use structs instead of magic offsets into arrays 2005-11-16 12:01:46 +00:00
tron
8d57bfc921 (svn r3195) Use bitfields instead of explicit shifting/masking 2005-11-16 11:55:06 +00:00
tron
f7abff5f96 (svn r3181) -Bracing 
-Indentation
-Whitespace
-DeMorgan's Law
-Test with NULL or 0 for non-booleans
-'\0' instead of 0 for chars
-Remove redundantly redundant comments (like DoFoo(); // Do foo)
-Join multiple short lines with a single statement
-Split single lines with multiple statements
-Avoid assignments in if
 2005-11-14 19:48:04 +00:00
peter1138
bc25cd89bf (svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes. 2005-11-06 13:42:26 +00:00
tron
d42b7649a4 (svn r3135) Use symbolic names in the tables, which hold the information about accepted goods of industry tiles, instead of magic numbers 2005-11-04 16:12:48 +00:00
tron
7c40462d24 (svn r3125) Symbolic names for skiping sprites and the end of the sprite list 2005-11-03 15:25:45 +00:00