Merge tag '1.11.0-beta1' into jgrpp
# Conflicts: # src/console_cmds.cpp # src/gfx_func.h # src/industry.h # src/lang/czech.txt # src/lang/estonian.txt # src/lang/german.txt # src/lang/indonesian.txt # src/lang/japanese.txt # src/lang/norwegian_bokmal.txt # src/lang/russian.txt # src/lang/slovak.txt # src/saveload/saveload.h # src/station_gui.cpp # src/town_gui.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/waypoint_gui.cpp
This commit is contained in:
@@ -19,6 +19,8 @@
|
||||
#include "company_func.h"
|
||||
#include "company_gui.h"
|
||||
#include "company_base.h"
|
||||
#include "tile_map.h"
|
||||
#include "texteff.hpp"
|
||||
#include "core/backup_type.hpp"
|
||||
#include "cheat_type.h"
|
||||
|
||||
@@ -293,7 +295,7 @@ CommandCost CmdCheatSetting(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
|
||||
|
||||
/**
|
||||
* Change the bank bank balance of a company by inserting or removing money without affecting the loan.
|
||||
* @param tile unused
|
||||
* @param tile tile to show text effect on (if not 0)
|
||||
* @param flags operation to perform
|
||||
* @param p1 the amount of money to receive (if positive), or spend (if negative)
|
||||
* @param p2 (bit 0-7) - the company ID.
|
||||
@@ -316,6 +318,10 @@ CommandCost CmdChangeBankBalance(TileIndex tile, DoCommandFlag flags, uint32 p1,
|
||||
Backup<CompanyID> cur_company(_current_company, company, FILE_LINE);
|
||||
SubtractMoneyFromCompany(CommandCost(expenses_type, -delta));
|
||||
cur_company.Restore();
|
||||
|
||||
if (tile != 0) {
|
||||
ShowCostOrIncomeAnimation(TileX(tile) * TILE_SIZE, TileY(tile) * TILE_SIZE, GetTilePixelZ(tile), -delta);
|
||||
}
|
||||
}
|
||||
|
||||
/* This command doesn't cost anything for deity. */
|
||||
|
Reference in New Issue
Block a user