Commit Graph
100 Commits
Author SHA1 Message Date
belugas 1970e657a3 (svn r11094) -Documentation: Add comments on viewport structures and change an obscure variable name to something a little more meaningfull.
Heavily based of frosch's work (FS#1223)
2007-09-13 15:51:50 +00:00
belugas 1e4f8d7a23 (svn r11091) -Codechange: Partial rewrite of the road management code of towns, in order to make it more readable and with improved performance. (FS#1161 by skidd13) 2007-09-12 23:56:21 +00:00
belugas 8141fe0898 (svn r11058) -Fix[FS#1216]: GetTerrainType was a bit too relax with snow line.
After double checking with ttdpatch, behaviour is now more alike (Eddi)
2007-09-08 00:37:37 +00:00
belugas 518fd6aa4d (svn r11050) -Codechange: Use the translated gfx, not the original one. 2007-09-06 03:02:38 +00:00
belugas 41a0bd2b74 (svn r10994) -Codechange: Change some function names to be more representative and more fitting of trunk's naming convention (skidd13) 2007-08-28 01:09:41 +00:00
belugas 6212b29b23 (svn r10993) -Codechange: A few less magical numbers (skidd13) 2007-08-27 23:50:56 +00:00
belugas 36c5b4e1ef (svn r10980) -Fix [FS#1158] : This will hopefully fix the case of an assert that happens when an industry uses a special gfx index (tile spec 0xFF). This 0xFF is the sentinel of a special check done for oil rigs, where water need to be around, but no tile will be constructed on it.
Problem is that the upper limit of gfx tiles is currently at 175.  So, of course the system will assert with 255 ;)
2007-08-26 00:23:32 +00:00
belugas 99158287fd (svn r10972) -Codechange: Implement the counterpart(GetTranslatedIndustryTileID) of getindustileid of TTDPatch. This allows to ensure that the ID of a tile (taken out of the map or not) is still a valid one regarding the possible override it may have been flagged to.
It is not the strict same thing, but is what we need regarding the slightly different approach we took for newindustries.
2007-08-24 00:23:35 +00:00
belugas 604924542c (svn r10971) -Codechange: One less magical number 2007-08-24 00:04:51 +00:00
belugas a079834cfc (svn r10968) -Codechange: Remove a tileloop performed in the AfterLoadCountBuildings function and use the main loop of CheckhouseIDs instead 2007-08-23 18:05:51 +00:00
belugas d921cf88a3 (svn r10963) -Revert(10700): Although the idea was good, it was more prone of errors than usefull.
So now, it will be better to jump to the overriden tile when it is been marked as an override
2007-08-22 01:16:08 +00:00
belugas b5627afcea (svn r10962) -Codechange: protect yourself against an illicit substitution 2007-08-22 00:59:46 +00:00
belugas 116de48fdf (svn r10961) -Codechange: Flag default substitutes of industry/tiles with a value that cannot be legal.
This avoids the forest of coal mine error in the futur
2007-08-22 00:52:25 +00:00
belugas a354a6af96 (svn r10955) -Fix: The substitute prop (0x08) of industry tiles does not behave as prop 0x08 of industry. Therefore, do not disable the old industry with value of 0xFF. Not a bug fix, just a spec compliance correction... 2007-08-21 00:29:10 +00:00
belugas 5f78a404f6 (svn r10926) -Feature: [NewGRF] Add support for variable 67(for real this time) and 68 of Variational Action 2 for Industries
-Fix: a very few codestyle/comments-typo changes
2007-08-17 00:23:33 +00:00
belugas 1b329b1bd9 (svn r10904) -Fix: When using a temporary industry, make sure you do not clear some unreachable tiles upon its destruction.
-Codechange: do not perform something that by all means will not change. A zero offset is really meaningless...
2007-08-15 01:50:13 +00:00
belugas fafe33cdd2 (svn r10903) -Feature: [NewGRF] Add support for variable 44 of Variational Action 2 for Industries 2007-08-15 00:49:34 +00:00
belugas 3f7a7261d6 (svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then. 2007-07-27 03:07:05 +00:00
belugas 8ad3a6f8fd (svn r10700) -Codechange: Enable to jump (by default) to the overriding industry tile spec of the one been queried.
Only on certain very specific circumstances do we need the original spec
2007-07-27 02:41:29 +00:00
belugas d87359a827 (svn r10670) -Fix: Use proper initialization for grf_prop override member 2007-07-24 01:29:42 +00:00
belugas 7da7523caa (svn r10669) -Codechange: Removed redundant comment
-Codechange: Add placeholder for yet another industry "variable" to code
2007-07-24 01:26:57 +00:00
belugas b9b59ec169 (svn r10641) -Fix(r10638): Forgotten Son... err...include 2007-07-20 17:32:27 +00:00
belugas fabd64e1e6 (svn r10640) -Fix(r10638): little typo... 2007-07-20 17:25:07 +00:00
belugas f9d3463af1 (svn r10639) -Codechange: Give meaninfull name to a magic number 2007-07-20 17:14:03 +00:00
belugas d847b30c98 (svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent. 2007-07-20 16:50:11 +00:00
belugas 1b1fbdd331 (svn r10637) -Fix: Enable the Random Industries in scenario editor if setting Number of Industries is not NONE.
Spotted by skiddl13.
Thanks to glx for help in finding and better looking code :)
2007-07-20 16:08:28 +00:00
belugas c0b044ac45 (svn r10635) -Codechange: Correct some typos and code beautifying (a little bit) 2007-07-20 14:49:41 +00:00
belugas 7a656fde4e (svn r10622) -Feature: Introduction of the CBID_INDUSTRY_AVAILABLE's handling, in fund industry window.
In order to stay as much consistent with the specs, the fund window will perform (if required) the callback every game-day.  TTDPatch performs the same call every second, but after discussions with Csaboka, we agreed that it was not required to be that intensive.  So a game-day is plenty enough.
2007-07-19 01:47:32 +00:00
belugas f7f6ad362e (svn r10621) -Codechange: install a struct holding the user's selection from _fund_gui.
-Codechange: merge WE_TIMEOUT and WE_ABORT_PLACE_OBJ, as they both do  the same thing. 
-Feature: Any time you place an industry, even if it fails, the button will reset and the cursor will return to normal.
2007-07-19 01:35:48 +00:00
belugas f47f1e723c (svn r10619) -Codechange: Use shorter variable/member names and add some code separation.
-Codechange: Use a stringID variable instead of always refering to the _fund_gui.text[foo] member
-Documentation: Add a few explanatory comments here and there
2007-07-18 17:05:23 +00:00
belugas c62d0719ae (svn r10618) -Fix(r10167): remove unneeded comment 2007-07-18 16:02:42 +00:00
belugas 0fada78480 (svn r10617) -Codechange: code style changes (removing an erroneous tab plus switch case alignment)
-Codechange: give enum values to widgets
2007-07-18 15:59:08 +00:00
belugas 0f8e7e79be (svn r10600) -Codechange: code-stylising the gui switch-case code 2007-07-16 23:48:25 +00:00
belugas 89d872a625 (svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation 2007-07-15 00:26:12 +00:00
belugas 318f19f5a4 (svn r10572) -Codechange: Add function CheckIfCallBackAllowsAvailability for industries 2007-07-15 00:19:40 +00:00
belugas 6d22aa54cf (svn r10570) -Codechange: Add enum required for Callback 0x22: CBID_INDUSTRY_AVAILABLE
-Documentation: Add documentation for enum IndustryConstructionType, which describes how the industry has been created
2007-07-15 00:03:17 +00:00
belugas fb92e30dfb (svn r10505) -Fix(r10249)[FS#1016]: Town was still trying to gather information for tiles on which it could not build. aising the values to 2 will prevent further invasion of the water-at-the-edge :) 2007-07-11 02:13:00 +00:00
belugas 5111c6205c (svn r10504) -Codechange: Shorten the test if no track bit has been found 2007-07-11 01:45:44 +00:00
belugas 8b17441704 (svn r10503) -Codechange: Mark Callback CBID_INDUSTRY_FUND_MORE_TEXT (cb38) as implemented. 2007-07-11 00:36:03 +00:00
belugas a5da0e6609 (svn r10496) -Feature: Replace all the windows for Industry building by a more flexible one.
Thanks to Csaboka (from TTDPatch dev team) for his hints and original design (which i've found while it was halfway done, so i could make it more compliant ;)).  Don't expect it to be a carbon-copy though.  A few differences can be found here and there.
Thanks to Rubidium for his helping hand. Hope you will like it as we do :)
2007-07-10 00:59:00 +00:00
belugas b690bef878 (svn r10495) -Codechange: Add the Action 00 property handlers for Industries and Industry tiles 2007-07-10 00:10:19 +00:00
belugas 7c2b432670 (svn r10457) -Codechange: Load the newly read definitions of Industries and Industry tiles.
No, this is not the final commit for newindustries (far from it), just another step.
2007-07-06 20:40:58 +00:00
belugas 26a7f3df84 (svn r10456) -Codechange: Enable loading newgrf strings for Industries 2007-07-06 20:36:32 +00:00
belugas b9dad0d82f (svn r10448) -Codechange: Industry Tiles and Houses share almost the same spritegroup format. 2007-07-05 16:39:56 +00:00
belugas f21f6554d8 (svn r10447) -Codechange: Don't need to specify values on an enum when those values are contiguous 2007-07-05 16:26:56 +00:00
belugas a85d72c60d (svn r10426) -Codechange: Activate the reset of industry/tiles mapping upon initialization or new game. 2007-07-04 01:34:28 +00:00
belugas de43302419 (svn r10425) -Fix (r10418): do not compare bitmasks with HASBIT. Strike two. Forgotten code :) 2007-07-04 00:54:38 +00:00
belugas 2c38514a84 (svn r10424) -Fix : Toy shop seems to be working exactly like power stations, water tower and banks, i.e: they require cargo but do nothing with it.
So, make it an INDUSTRYLIFE_BLACK_HOLE, exactly like the above mentioned industries.
Thanks to glx who spotted, and Csaboka who confirmed it could very well be a CS bug.
2007-07-04 00:49:03 +00:00
belugas 42f0593b82 (svn r10379) -Codechange: silence a compiler warning (which was right) about a variable too little for what's been asked to do 2007-06-28 19:03:14 +00:00
belugas c1218e88e1 (svn r10369) -Codechange: Add the IndustryType parameter to the GetIndustryCallback function.
Sometimes, the industry might not be able to provide its type, since it does not exists at all
2007-06-28 02:14:40 +00:00
belugas 15d4a27c89 (svn r10343) -Cleanup: Add documentation of functions and code-style fix.
Thanks of 45 degree patch for bringing it up
2007-06-26 16:58:40 +00:00
belugas 240bba540e (svn r10256) -Add: Addition of IndustryTileOverrideManager 2007-06-21 17:09:10 +00:00
belugas 436eb69a39 (svn r10232) -Fix(r1): _numof_industry_table never was composed of 12 entries. Only 11.
It never hurt before, but it would have...
2007-06-20 03:03:00 +00:00
belugas 2ad0d708cc (svn r10226) -Codechange: Add support for newindustry tiles drawing.
Heavily based on Maedhros's newhouses implementation
2007-06-19 17:33:12 +00:00
belugas 0b2b435c44 (svn r10172) -Fix(r10127): Wrong evaluation order on variable 0x41 for industry tile.
The industry's xy (northernmost tile) should be checked against the relative tile, not the other way around.
2007-06-17 01:01:15 +00:00
belugas 108ee9bc3e (svn r10167) -Codechange: Change the flagging system of grf loaded feature from a bitset to a bool evaluation.
Like easier to read and faster to evaluate :)
2007-06-15 23:55:52 +00:00
belugas 402cf772f0 (svn r10163) -Fix(r8128): Industries had lost their random recoloring. A test was removed and is now reintroduced in another way. 2007-06-15 01:53:43 +00:00
belugas 0b65070b36 (svn r10146) -Codechange: Silence a compiler warning
-Codechange: Comment style beautifying
-Codechange: define (tentatively) var 0x44 and 0x61 for industry tiles
2007-06-13 18:35:06 +00:00
belugas 30863358f9 (svn r10127) -Add: Addition of basic structure for industry tiles callbacks (unfinished).
-Codechange: ResolverObject receives member gfx, making it compatible for both industries and industry tiles
-Codechange: NewIndustryResolver now has his randombits and triggers (even if not implemented)
2007-06-13 02:29:08 +00:00
belugas 4df44a4dff (svn r10115) -Codechange: Create accessors to triggers and random bits for industries.
Implementation will follow soon.
2007-06-12 14:22:28 +00:00
belugas 8efb7e53ec (svn r10108) -Codechange: implement variable 0x60 (Get industry tile ID at offset) for industries.
It is exposed for for industry tiles who will reuse it too, for variable 0x62.
2007-06-12 00:49:50 +00:00
belugas 81c7c87ed7 (svn r10099) -Fix(r9867, FS860): Use the specs of the to-be-created industry instead of the scanned industry
Spotted by Oxygene
2007-06-11 14:25:38 +00:00
belugas 94200b63b8 (svn r10088) -Codechange: A typo and a code-style 2007-06-10 23:40:29 +00:00
belugas 08c9365971 (svn r10078) -Codechange: Centralize all industry counts data and access 2007-06-10 01:25:21 +00:00
belugas 9a4a911bde (svn r10074) -Add: Addition of IndustryOverrideManager as well as the basic (and unfinished) support for callbacks for industries 2007-06-09 02:05:51 +00:00
belugas e8c6d57150 (svn r10066) -Codechange: Expose function GetNearbyTile by moving it to newgrf_commons.[cpp|h]. Will be used by industries in a few. 2007-06-08 17:54:18 +00:00
belugas f51b869e69 (svn r10064) -Fix(r10063): compile again, when changing stuff. DOn't trust first run 2007-06-08 15:59:03 +00:00
belugas 7586143e3b (svn r10063) -Codechange: Change VARDEF for extern
-CodeChange: Add the count of industries, basic support for variable 67, var action02 forindustries
2007-06-08 15:48:48 +00:00
belugas a95fdc8bb5 (svn r10040) -Codechange: Make the function GetTerrainType public, as other functions require it 2007-06-05 01:49:08 +00:00
belugas 4af692558a (svn r10005) -Codechange: Merge two flags (2cc and newhouses) indicating some newgrf features have been loaded, and introduce the newindustry one. 2007-05-31 19:13:41 +00:00
belugas f8da1b6e1a (svn r10001) -Codechange: Add support for removing dynamically allocated newgrf data 2007-05-31 15:40:36 +00:00
belugas 86abe1b229 (svn r9994) -Codechange: Add pointers for Industry and Industry Tiles in the grf file. 2007-05-31 03:35:11 +00:00
belugas 0f6e6d9713 (svn r9992) -Codechange: Remove some hardcoded references to Industry IDs.
A few more to go
2007-05-30 20:20:58 +00:00
belugas 425ea50854 (svn r9984) -Codechange: Remove an obsolete structure and a now meaningless enum, in favor of the "real thing" 2007-05-30 02:08:18 +00:00
belugas f8491407d0 (svn r9983) -Codechange: Use the "enabled" property of the industry spec. 2007-05-30 01:55:11 +00:00
belugas 0cb8413a8f (svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
It will be initialized by the original data upon game start.
Rename some enums to be more consistent too
2007-05-29 17:41:59 +00:00
belugas 0af97d4ab2 (svn r9975) -Codechange: Adjust the industry/tile spec arrays, moving the enabled member out of GRFFileProps (end of previous commit). 2007-05-29 14:44:22 +00:00
belugas 4cb32f903e (svn r9974) -Codechange: Remove the enabled member of GRFFileProps, since it'snot really grf related 2007-05-29 14:32:46 +00:00
belugas 35ccad33dd (svn r9969) -Codechange: Cleanup of industries (Step-14). Remove hardcoded-run-time tile acceptance and put in corresponding tile 2007-05-29 00:15:34 +00:00
belugas f3cf7f6b2d (svn r9906) -Codechange: Add common properties for both industry and industry tiles specs 2007-05-24 01:12:00 +00:00
belugas 88042df6bb (svn r9886) -Codechange: Cleanup of industries (Step-13). Include the sounds table into the industry's spec. 2007-05-20 00:50:06 +00:00
belugas 49570edfe9 (svn r9870) -Codechange: Silence two compiler warnings and give proper type to the "type" member of industry struct 2007-05-18 17:55:07 +00:00
belugas 2196abd71d (svn r9868) -Codechange: bring external declaration of functions togueter and adjust a comment 2007-05-18 14:34:15 +00:00
belugas 380d18fb69 (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. 2007-05-18 00:33:47 +00:00
belugas 3fb4003534 (svn r9850) -Codechange: Introduction of the Override/Substitute manager. Currently only used for newhouses.
Basically, it is more a gathering of IDs from grf files and ingame data.
2007-05-15 21:36:58 +00:00
belugas 2ccc060b4a (svn r9830) -Fix(r9779) : Let the town expand and build new houses along the roads of the users, even in case of "No Road" layout (skiddl13) 2007-05-13 00:11:13 +00:00
belugas aff49954bf (svn r9779) -Feature: Add the possiblity to choose different road patterns for towns to use.
Possible patterns are : 
No Road (not available in scenario editor)
Original (for the nostalgics)
Better Roads (same as original, but based on distance of 2 tiles instead of one)
2x2 grids
3x3 grids
Patch by skiddl13
2007-05-04 16:27:13 +00:00
belugas e4dc1f460b (svn r9769) [newGRF] -Feature: Add translation support for Esperanto, Bulgarian, Japanese and Korean 2007-05-02 15:20:48 +00:00
belugas 9b7a615887 (svn r9762) -Feature: Two new difficulty settings : Very low number of towns and very low number of industries
Based on FS#289, by pitt2
2007-05-01 17:16:51 +00:00
belugas 436cb70988 (svn r9722) -Documentation: Document some functions of town_cmd.cpp. Loosely based on work from TheJosh
More to come.
2007-04-27 02:27:44 +00:00
belugas 5912b08890 (svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
All the tiny fonts industry names should be removed from language files soon.
2007-04-26 20:20:12 +00:00
belugas 3a1e7679d8 (svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
Calculate with a macro (for _industry_anim_offs_toys) the value of x, instead of doing it at run time.
And give some more descriptive names too...
2007-04-21 02:47:33 +00:00
belugas 803b073c59 (svn r9704) -Documentation: Add comments on industry data macro 2007-04-21 02:42:51 +00:00
belugas 15a2c71a01 (svn r9679) -Codechange: use enums to identify transparency widgets and add a bit of documentation (patch by Wolf01) 2007-04-19 18:51:40 +00:00
belugas 95ae29b470 (svn r9676) -Codechange: introduce NUM_INDUSTRYTYPES instead of IT_END.
This makes the code clearer.
2007-04-19 14:50:01 +00:00
belugas 4eb87ac62b (svn r9669) -Documentation: some more doxygen fixes 2007-04-18 18:00:33 +00:00
belugas d6651c1741 (svn r9665) -Documentation: Doxygen corrections,errors, corrections of corrections... 2007-04-18 00:41:09 +00:00
belugas addcae43fa (svn r9664) -Documentation: Doxygen corrections,errors and omissions 2007-04-17 21:09:38 +00:00
belugas 607a55f4ec (svn r9662) -Documentation: Doxygen corrections and @file omissions 2007-04-17 20:23:13 +00:00
belugas c39ab93daa (svn r9658) -Codechange: CT_FOOD is not part of temperate climate, place it accordingly in arctic.
It could be put in tropic too, but it can be placed in both, so first to catch it...
2007-04-17 19:08:00 +00:00