dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :)

Browse Source 
- 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.
This commit is contained in:
Darkvater
2005-05-11 00:00:27 +00:00
parent fe223eccf4
commit 5e6923e936
18 changed files with 355 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
industry_cmd.c
View File

@@ -64,18 +64,13 @@ typedef struct DrawIndustrySpec4Struct {
byte image_3;
} DrawIndustrySpec4Struct;
#include "table/industry_land.h"
typedef struct IndustryTileTable {
TileIndexDiffC ti;
byte map5;
} IndustryTileTable;
typedef struct IndustrySpec {
const IndustryTileTable * const * table;
const IndustryTileTable *const *table;
byte num_table;
byte a,b,c;
byte produced_cargo[2];
@@ -84,6 +79,7 @@ typedef struct IndustrySpec {
byte check_proc;
} IndustrySpec;
#include "table/industry_land.h"
#include "table/build_industry.h"
typedef enum IndustryType {
@@ -1549,47 +1545,59 @@ static void DoCreateNewIndustry(Industry *i, uint tile, int type, const Industry
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0);
}
/* p1 = industry type 0-36 */
/** Build/Fund an industry
* @param x,y coordinates where industry is built
* @param p1 industry type @see build_industry.h and @see industry.h
* @param p2 unused
*/
int32 CmdBuildIndustry(int x, int y, uint32 flags, uint32 p1, uint32 p2)
{
uint tile = TILE_FROM_XY(x,y);
Town *t;
Industry *i;
TileIndex tile = TILE_FROM_XY(x,y);
int num;
const IndustryTileTable * const *itt;
const IndustryTileTable *it;
Industry *i;
const IndustrySpec *spec;
SET_EXPENSES_TYPE(EXPENSES_OTHER);
if (!CheckSuitableIndustryPos(tile))
return CMD_ERROR;
if (!CheckSuitableIndustryPos(tile)) return CMD_ERROR;
/* Check if the to-be built/founded industry is available for this climate.
* Unfortunately we have no easy way of checking, except for looping the table */
{ const byte *i;
bool found = false;
for (i = &_build_industry_types[_opt_ptr->landscape][0]; i != endof(_build_industry_types[_opt_ptr->landscape]); i++) {
if (*i == p1) {found = true; break;}
}
if (!found) return CMD_ERROR;
}
spec = &_industry_spec[p1];
/* If the patch for non-raw-material industries is not on, you cannot build raw-material industries.
* Raw material industries are industries that do not accept cargo (at least for now) */
if (!_patches.build_rawmaterial_ind && spec->accepts_cargo[0] == 255 &&
spec->accepts_cargo[1] == 255 && spec->accepts_cargo[2] == 255) return CMD_ERROR;
if (!_check_new_industry_procs[spec->check_proc](tile, p1))
return CMD_ERROR;
if (!_check_new_industry_procs[spec->check_proc](tile, p1)) return CMD_ERROR;
if ((t=CheckMultipleIndustryInTown(tile, p1)) == NULL)
return CMD_ERROR;
if ((t = CheckMultipleIndustryInTown(tile, p1)) == NULL) return CMD_ERROR;
num = spec->num_table;
itt = spec->table;
do {
if (--num < 0)
return_cmd_error(STR_0239_SITE_UNSUITABLE);
} while (!CheckIfIndustryTilesAreFree(tile, it=itt[num], p1, t));
if (--num < 0) return_cmd_error(STR_0239_SITE_UNSUITABLE);
} while (!CheckIfIndustryTilesAreFree(tile, it = itt[num], p1, t));
if (!CheckIfTooCloseToIndustry(tile, p1))
return CMD_ERROR;
if (!CheckIfTooCloseToIndustry(tile, p1)) return CMD_ERROR;
if ( (i = AllocateIndustry()) == NULL)
return CMD_ERROR;
if ( (i = AllocateIndustry()) == NULL) return CMD_ERROR;
if (flags & DC_EXEC)
DoCreateNewIndustry(i, tile, p1, it, t, 0x10);
DoCreateNewIndustry(i, tile, p1, it, t, OWNER_NONE);
return (_price.build_industry >> 5) * _industry_type_costs[p1];
}