Commit Graph

204 Commits

Author SHA1 Message Date
peter1138
20cdd71c9f (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
b618b75c9b (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
f227b9b77c (svn r5055) -Fix: Correct some errors in the bridge sprite numbers 2006-05-31 06:43:05 +00:00
tron
d508e76ada (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
7fb02749ac (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
d76279144d (svn r4639) -Feature: Turkish town names (jnmbk) 2006-05-01 09:25:23 +00:00
belugas
910825b1d5 (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
4cd5c56e84 (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
dbb73b9c98 (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
5ea5ceaab4 (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
31c0641bd3 (svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether. 2006-04-24 21:10:56 +00:00
belugas
50029ac60a (svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values 2006-04-24 17:32:09 +00:00
belugas
235082dfcd (svn r4513) Codechange : Assemble a bit the scattered parts of Cargo types. 2006-04-22 01:37:31 +00:00
Darkvater
1cfd43d145 (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
e81a1821f1 (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
24f871deba (svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections 2006-04-10 14:27:26 +00:00
celestar
0d0f2f6d98 (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
1bf4b195f3 (svn r4282) -Cleanup: Re-arranged the ignore groups into a more readable arrangement 2006-04-05 08:45:29 +00:00
celestar
0a79bc8357 (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
6ead57890c (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
6c44bf5012 (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
ed86c3d818 (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
fc6874a52e (svn r4004) -CodeChange : Renaming sprites and functions 2006-03-21 23:22:21 +00:00
belugas
f91b027bea (svn r3991) -Fix : Last remaining separation of SpriteID from Palette 2006-03-20 16:20:37 +00:00
tron
ec34ed24ef (svn r3982) Fix last commit. I got confused by some strange test, which did nothing 2006-03-19 14:43:23 +00:00
tron
23d5188b7b (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
058ccfb157 (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
6ab5bb6070 (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
6863d21382 (svn r3685) Include a file missed from r3684... 2006-02-28 08:16:00 +00:00
peter1138
ee9f64ecf4 (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
8caedb4898 (svn r3586) - NewGRF: Load callback masks for all vehicle types. 2006-02-11 07:34:05 +00:00
tron
087fe86ed2 (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
23d2bfb8b2 (svn r3523) Undefine helper macros after using them 2006-02-03 07:45:58 +00:00
peter1138
e369081657 (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
9712d6f639 (svn r3510) Fiddle with whitespace and parentheses 2006-02-01 06:32:03 +00:00
Darkvater
3853c886e1 (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
d956c5d5da (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
e1f9b72c82 (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
e62c3e6f39 (svn r3314) Add 2 times static 2005-12-18 12:17:53 +00:00
tron
9822b4d755 (svn r3297) Staticise 2005-12-14 06:20:23 +00:00
tron
17aab1797b (svn r3289) 32 times static 2005-12-11 10:36:48 +00:00
Darkvater
d85b9bde49 (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
3bdb92446c (svn r3196) Use structs instead of magic offsets into arrays 2005-11-16 12:01:46 +00:00
tron
db012c135e (svn r3195) Use bitfields instead of explicit shifting/masking 2005-11-16 11:55:06 +00:00
tron
9d0e7b6458 (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
34c503cabf (svn r3148) -NewGRF, Feature: Add support for cargo refitting specification by cargo classes. 2005-11-06 13:42:26 +00:00
tron
170de2019a (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
47f0e22853 (svn r3125) Symbolic names for skiping sprites and the end of the sprite list 2005-11-03 15:25:45 +00:00
tron
6a585f5430 (svn r3118) Name 3 palette modifiers properly (belugas) 2005-11-02 13:06:07 +00:00
tron
c81119b371 (svn r3114) Close two gaps in the sprite array when loading openttd.grf. That's seven more free sprite slots, yay! 2005-11-01 06:38:23 +00:00
tron
3a925e230f (svn r3108) Confine the use of SPR_OPENTTD_BASE to table/sprites.h by adding/using some sprite enums 2005-10-31 10:23:58 +00:00
Darkvater
7a09fffa3a (svn r3102) - Fix (regression): Newly added sprite had problems when newgrf's where loaded. Thanks Tron for explaining what the problem was and how it should be solved. 2005-10-29 22:27:34 +00:00
Darkvater
71fb375f8c (svn r3096) - Feature: 'HOME' icon to saveload dialogs that jumps to the default save/load directory based on the dialog (added icon to openttd.grf, introduced FIOS_TYPE_DIRECT that allows arbitrary directory jumping).
- Fix: on Win32 capitalize the drive-letter in the saveload dialog windows when it is first opened.
2005-10-28 00:09:59 +00:00
tron
0b936c3222 (svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
nothing spectacular, just some stuff, which piled up
2005-10-22 06:39:32 +00:00
tron
b17b87469c (svn r3064) Replace some numbers by sprite names 2005-10-19 06:46:41 +00:00
celestar
d50ef14992 (svn r3063) -Codechange: Demystified and commented bridge_land.h. Also removed two arrays that are not referred to 2005-10-19 06:17:11 +00:00
tron
24253c17cc (svn r3059) Use bitfields to encode railtype and climates of engines instead of manual shifting/anding 2005-10-18 11:23:58 +00:00
tron
e6b0b1e33d (svn r3050) Augment the rail vehicle table with symbolic names for dual-head engines and wagons 2005-10-16 12:22:16 +00:00
tron
53a4a6a0f4 (svn r3046) Replace some numbers with sprite names and fix a typo in the sprite list 2005-10-15 11:06:54 +00:00
tron
8d4ed0840b (svn r3040) Don't deduce the cursor sprites when building rails from magic numbers, but fetch them from the central rail info array. 2005-10-14 08:11:18 +00:00
tron
4529d1fc8e (svn r3037) Don't deduce the sprites for tunnels and level crossings from magic numbers, but fetch them from the central rail info array. This is a preparation step for electrified rails 2005-10-13 16:00:14 +00:00
tron
2f6f8215ac (svn r3035) Augment the engine table with symbolic names for rail types and climates 2005-10-13 12:33:03 +00:00
peter1138
aac5e2c131 (svn r2989) - Make engine/vehicle information tables constant. Duplicate them so NewGRF data can be loaded without wiping out the default data. 2005-09-26 18:43:58 +00:00
Darkvater
4d7e916a09 (svn r2957) - Feature: [ 1263280 ] Danish town names (fey_dk) 2005-09-16 10:37:21 +00:00
tron
b62887b973 (svn r2815) Store the currency information in one central place instead of scattering it in several unrelated files 2005-08-06 14:59:54 +00:00
ludde
9a060a0f24 (svn r2781) Fix some of the issues with variables in .h files. 2005-08-01 16:31:19 +00:00
bjarni
059ae19626 (svn r2764) -Feature: Clone vehicles
-This allows a player to clone an excisting vehicle of his own
  -[fix]: this uncovered an excisting bug in CmdBuildRailVehicle() where depots could build trains of the wrong track type. This is fixed
  -Thanks to Celestar for drawing the sprites and _luca_ for including them in openttd.grf
2005-07-31 13:08:08 +00:00
celestar
fcd012e7ec (svn r2736) -Codechange: De-mystified GfxDrawFillRect a bit, and used enums from table/sprites.h. You can now change the number of bits used for sprites and switches in the SpriteSetup enum and the rest should work automagically. Can be used to increase the number of active sprites to 2^19 in case there are no colortables (recolor sprites) in any newgrf. We should possibly move the the colortables to an own list, but how to detect them in a newgrf. 2005-07-28 09:17:32 +00:00
tron
2faf06f4cd (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build 2005-07-25 07:16:10 +00:00
celestar
a3739aecdf (svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
by enums. There remains work in gfx.c to move the "transparency" and
"recolor" bits around to make space for more sprites. However, 2800
additional sprites can now be loaded. There also remains cleanup and
Doxygen work on many of the header files.
2005-07-24 15:56:31 +00:00
tron
647cbd6bdd (svn r2701) Insert Id tags into all source files 2005-07-24 14:12:37 +00:00
tron
126fed74d6 (svn r2685) -Codechange: Split the music/sound/video drivers into separate files and move them into subfolders.
This results in shorter and hopefully easier to maintain files.
Note: I had to change paths in #include statements of some unrelated files, because I added the ottd base directory to the include path (-I.)
2005-07-23 15:16:57 +00:00
celestar
7bce410f61 (svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
that railtypes do not be in ascending order of appearance. Allows easier
implementation or more railtypes
2005-07-20 22:02:58 +00:00
celestar
c6dccce69e (svn r2639) -Add: Added the vehicle names in table/engines.h so that you know what line represents what vehicle (I hope I didn't mess that up). Added some comments while I'm at it and include the table/ directory in the Doxygen generation 2005-07-19 20:45:47 +00:00
tron
11421beed1 (svn r2534) Small cleanup 2005-07-08 21:24:27 +00:00
hackykid
dad7e8f486 (svn r2532) - Fix: Don't waste space using an int where a byte would suffice. (ludde) 2005-07-08 19:02:26 +00:00
hackykid
ab9c6f126d (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
- Feature: [pbs] Implement autoplacement of pbs blocks, when a block has an entry and an exit pbs signal, covert the entire block to pbs. Can be turned off in the patch settings.
 - Feature: [pbs] Allow showing of reserved status by making the tracks darker, when the pbs debug level is at least 1.
2005-07-04 14:58:55 +00:00
celestar
d07e1a875e (svn r2515) -Codechange: Removed a good deal of magic sprite numbers in the rail drawing code, and placed neatly into arrays and enums. This also makes way to implement more railtypes without having to do tons of ugly hacks. 2005-07-04 10:01:06 +00:00
tron
6319c11b1f (svn r2497) Use a struct array for palette entries instead of a flat byte array 2005-06-30 05:27:32 +00:00
hackykid
daae0d315a (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
- Codechange: Remove some magic numbers (PALETTE_CRASH)
2005-06-06 22:44:11 +00:00
Darkvater
4198418d77 (svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area. 2005-06-06 15:58:58 +00:00
Darkvater
095cdb9df1 (svn r2421) - how come you didn't get committed you evil file? Be gone! 2005-06-06 14:07:50 +00:00
Darkvater
c3c69ff5cb (svn r2420) - Codechange: magic number elminitation of cursorsprites. 2005-06-06 13:47:06 +00:00
hackykid
26e87892e2 (svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it. 2005-06-06 00:19:24 +00:00
hackykid
52ebf02f2f (svn r2401) - Fix: [newgrf] Finish up callback mechanism, implement 'refit capacity' callback slightly more correct. 2005-06-03 10:39:30 +00:00
Darkvater
ba8c649fac (svn r2397) - CodeChange: rename all "ttd" files to "openttd" files. 2005-06-02 19:30:21 +00:00
Darkvater
b43331c931 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :)
- CodeChange: To correctly accept engine-prototypes, the best-player checking has been moved to its own function, I hope it functions the same as before.
- CodeChange: Added symbolic types of PlayerID, OrderID and EngineID. For engines also added GetEngine() and IsEngineIndex(), similar to the other such functions.
- CodeChange: To correctly build industries, some tables have been moved to build_industry.h. The only way to find out currently if an industry is valid in a climate is by looping all industries and checking if it matches. Also to comply with the patch setting build_rawmaterial_industries, it is assumed that these industries do not accept any cargo of any type. This can and probably should changed in the future to some flag in their struct. Also use _opt_ptr instead of _opt.
- CodeChange: implemented the HQ checking code inspired by MarkR2 in "[ 1190944 ] Many commands not checked for security".  Unfortunately it is impossible to prevent only deleting a HQ by a modified client atm.
- CodeChange: For insert order and modify order their parameters are implicitely truncated to 8 bits, instead of the 16 bits said in the comments.
2005-05-11 00:00:27 +00:00
Darkvater
6d349b6284 (svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
- CodeChange: changed the airport gui airport-type checking. Added function GetValidAirports() that returns bitmasked availibility, is also used for checking.
- CodeChange: to check tree-planting, 2 const arrays have been moved to table/tree_land.h (type and count)
- CodeChange: added IsTownIndex() in following of IsStationIndex(), etc.
- Fix (regression): road tunnels did not work anymore, forgot that their type was 0x200 (documented now)
2005-05-09 22:33:00 +00:00
Darkvater
e9f8449d55 (svn r2229) - Fix: [ 1188777 ] Non-existing sprite #5125 (presignal). The DOS grf file trgi.grf has 6 less sprites than the windows one. This results in some segfaults for certain sprites. Fixed it by added a dummy grf file consisting ofr 6 sprites and loaded when using DOS gfx at the appropiate place. 2005-04-24 21:44:45 +00:00
Darkvater
b05713285e (svn r2136) - Fix: [ 1174313 ] terrain hotkeys nonfunctional in scenario editor (D,Q,W,E,R,T,Y,U fltr)
- Fix: 'L' no longer opens ingame terraform bar in scenario editor bar, but the land generator one
- Feature: [ 1095110 ] Create Lake and draggable Create Desert tools (initial implementation GoneWacko), also added sticky buttons to land generator and town generator
- CodeChange: moved around some of the draggable tools, demystifying them
- CodeChange: change CmdBuildCanal to allow for XANDY dragging not only X or Y (only scenario editor)
- CodeChange: add some more enums to sprites.
- TODO: merge most of the ingame and scenario editor land terraform code. This can only be done after OnClickButton function is changed so it also includes the backreference to the widget being clicked, postponed to after 0.4.0
2005-04-02 23:05:09 +00:00
Darkvater
4089c85653 (svn r2066) - Fix: [ 1164248 ] game crash while AI builds bridge. Also protect bridge building against invalid bridges and some safeguards when drawing. 2005-03-25 17:30:54 +00:00
truelight
1b2aaed4ad (svn r2048) -Fix: deleted a word somehow :s (Tnx Tron!) 2005-03-24 17:33:27 +00:00
truelight
d1e158d6f7 (svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
-Codechange: rewrote some functions while moving waypoint-stuff
-Add: added support for 64k waypoints
-Fix: made the waypoint struct a bit more logic (no bit-fucking)
2005-03-24 17:03:37 +00:00
tron
0f44f9af60 (svn r1977) Typedef some enums and struct plus some minor style changes 2005-03-09 19:42:37 +00:00
pasky
5420bd97da (svn r1975) Minor tweaking of the Czech name generator tables. 2005-03-09 18:19:13 +00:00
pasky
274f19a2bf (svn r1949) Fixed the CzechChoose usage in the Czech word tables. Now selecting colours actually works. 2005-03-06 21:20:34 +00:00
pasky
18821a1fa3 (svn r1948) Add an explicit copyright notice regarding the Czech town names generator and an offer to help. :-) 2005-03-06 17:09:08 +00:00
pasky
0566d80b16 (svn r1931) Added Krystofova, Udoli and Hut. Zdar is s. masc., not s. neut. 2005-03-05 22:21:43 +00:00
pasky
c91d290e67 (svn r1929) Feature: [namegen] Support for dynamic generation of the Czech town names.
The static names are still used in 1/4 of cases. I think the tables for
dynamic generation must look pretty spectacular. :-) New stems are still
needed and there can be occasional glitches, please let me know.

I guess that this method of dynamic generation could be used for at least
Slovak town names, too. And possibly other Slavic languages?
2005-03-05 21:00:13 +00:00
pasky
e6db813ec9 (svn r1926) Codechange: Renamed some of the predefined town names arrays for consistent naming.
- name_spanish_1, name_french_1, name_czech_1, name_romanian_1, name_finnish_1
  and name_german_hardcoded were renamed to *_real.
- name_slovakish_1 was renamed to name_slovak_real.
- name_finnish_2[ab] was renamed to name_finnish[12].
- Added comment near the town_names setting definition about the "Slovakish"
  pigginess.
2005-03-05 14:54:11 +00:00