summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--industry_gui.c126
-rw-r--r--lang/english.txt1
-rw-r--r--ttd.h2
-rw-r--r--window.h31
4 files changed, 147 insertions, 13 deletions
diff --git a/industry_gui.c b/industry_gui.c
index accf17b47..9f6808788 100644
--- a/industry_gui.c
+++ b/industry_gui.c
@@ -19,6 +19,10 @@ static const byte _build_industry_types[4][12] = {
extern const byte _industry_type_costs[37];
+static void UpdateIndustryProduction(Industry *i);
+extern void DrawArrowButtons(int x, int y, int state);
+extern void ShowQueryString(StringID str, StringID caption, int maxlen, int maxwidth, byte window_class, uint16 window_number);
+
static void BuildIndustryWndProc(Window *w, WindowEvent *e)
{
switch(e->event) {
@@ -265,13 +269,17 @@ void ShowBuildIndustryWindow()
AllocateWindowDescFront(_industry_window_desc[_patches.build_rawmaterial_ind][_opt.landscape],0);
}
+#define NEED_ALTERB (_game_mode == GM_EDITOR && i->accepts_cargo[0] == CT_INVALID)
static void IndustryViewWndProc(Window *w, WindowEvent *e)
{
- Industry *i;
- StringID str;
+ // WP(w,vp2_d).data_1 is for the editbox line
+ // WP(w,vp2_d).data_2 is for the clickline
+ // WP(w,vp2_d).data_3 is for the click pos (left or right)
switch(e->event) {
- case WE_PAINT:
+ case WE_PAINT: {
+ const Industry *i;
+ StringID str;
// in editor, use bulldoze to destroy industry
// Destroy Industry button costing money removed per request of dominik
//w->disabled_state = (_patches.extra_dynamite && !_networking && _game_mode != GM_EDITOR) ? 0 : (1 << 6);
@@ -280,13 +288,13 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
SetDParam(1, i->type + STR_4802_COAL_MINE);
DrawWindowWidgets(w);
- if (i->accepts_cargo[0] != 0xFF) {
+ if (i->accepts_cargo[0] != CT_INVALID) {
SetDParam(0, _cargoc.names_s[i->accepts_cargo[0]]);
str = STR_4827_REQUIRES;
- if (i->accepts_cargo[1] != 0xFF) {
+ if (i->accepts_cargo[1] != CT_INVALID) {
SetDParam(1, _cargoc.names_s[i->accepts_cargo[1]]);
str++;
- if (i->accepts_cargo[2] != 0xFF) {
+ if (i->accepts_cargo[2] != CT_INVALID) {
SetDParam(2, _cargoc.names_s[i->accepts_cargo[2]]);
str++;
}
@@ -294,27 +302,85 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
DrawString(2, 107, str, 0);
}
- if (i->produced_cargo[0] != 0xFF) {
+ if (i->produced_cargo[0] != CT_INVALID) {
DrawString(2, 117, STR_482A_PRODUCTION_LAST_MONTH, 0);
SetDParam(1, i->total_production[0]);
SetDParam(0, _cargoc.names_long_s[i->produced_cargo[0]] + ((i->total_production[0]!=1)<<5));
SetDParam(2, i->pct_transported[0] * 100 >> 8);
- DrawString(4, 127, STR_482B_TRANSPORTED, 0);
+ DrawString(4 + (NEED_ALTERB ? 30 : 0), 127, STR_482B_TRANSPORTED, 0);
+ // Let's put out those buttons..
+ if (NEED_ALTERB)
+ DrawArrowButtons(5, 127, (WP(w,vp2_d).data_2 == 1 ? WP(w,vp2_d).data_3 : 0));
- if (i->produced_cargo[1] != 0xFF) {
+ if (i->produced_cargo[1] != CT_INVALID) {
SetDParam(1, i->total_production[1]);
SetDParam(0, _cargoc.names_long_s[i->produced_cargo[1]] + ((i->total_production[1]!=1)<<5));
SetDParam(2, i->pct_transported[1] * 100 >> 8);
- DrawString(4, 137, STR_482B_TRANSPORTED, 0);
+ DrawString(4 + (NEED_ALTERB ? 30 : 0), 137, STR_482B_TRANSPORTED, 0);
+ // Let's put out those buttons..
+ if (NEED_ALTERB)
+ DrawArrowButtons(5, 137, (WP(w,vp2_d).data_2 == 2 ? WP(w,vp2_d).data_3 : 0));
}
}
DrawWindowViewport(w);
+ }
break;
- case WE_CLICK:
+ case WE_CLICK: {
+ Industry *i;
+
switch(e->click.widget) {
+ case 5: {
+ int line;
+ int x;
+ byte b;
+
+ i = GetIndustry(w->window_number);
+
+ // We should only work in editor
+ if (_game_mode != GM_EDITOR)
+ return;
+
+ // And if the industry is raw-material producer
+ if (i->accepts_cargo[0] != CT_INVALID)
+ return;
+
+ x = e->click.pt.x;
+ line = (e->click.pt.y - 127) / 10;
+ if (e->click.pt.y >= 127 && IS_INT_INSIDE(line, 0, 2) && i->produced_cargo[line]) {
+ if (IS_INT_INSIDE(x, 5, 25) ) {
+ // clicked buttons
+ if (x < 15) {
+ // decrease
+ i->production_rate[line] /= 2;
+ if (i->production_rate[line] < 4)
+ i->production_rate[line] = 4;
+ } else {
+ // increase
+ b = i->production_rate[line] * 2;
+ if (i->production_rate[line] >= 128)
+ b=255;
+ i->production_rate[line] = b;
+ }
+ UpdateIndustryProduction(i);
+ SetWindowDirty(w);
+ w->flags4 |= 5 << WF_TIMEOUT_SHL;
+ WP(w,vp2_d).data_2 = line+1;
+ WP(w,vp2_d).data_3 = (x < 15 ? 1 : 2);
+ } else if (IS_INT_INSIDE(x, 34, 160)) {
+ // clicked the text
+ WP(w,vp2_d).data_1 = line;
+ SetDParam(0, i->production_rate[line] * 8);
+ ShowQueryString(STR_CONFIG_PATCHES_INT32,
+ STR_CONFIG_GAME_PRODUCTION,
+ 10, 100, w->window_class,
+ w->window_number);
+ }
+ }
+ }
+ break;
case 6:
i = GetIndustry(w->window_number);
ScrollMainWindowToTile(i->xy + TILE_XY(1,1));
@@ -331,16 +397,49 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
//DoCommandP(i->xy, w->window_number, 0, CcPlaySound10, CMD_DESTROY_INDUSTRY | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA));
break;
}
+ }
break;
+ case WE_TIMEOUT:
+ WP(w,vp2_d).data_2 = 0;
+ WP(w,vp2_d).data_3 = 0;
+ SetWindowDirty(w);
+ break;
+
+ case WE_ON_EDIT_TEXT:
+ if (*e->edittext.str) {
+ Industry *i;
+ int val;
+ int line;
+
+ i = GetIndustry(w->window_number);
+ line = WP(w,vp2_d).data_1;
+ val = atoi(e->edittext.str);
+ if (!IS_INT_INSIDE(val, 32, 2040)) {
+ if (val < 32) val = 32;
+ else val = 2040;
+ }
+ i->production_rate[line] = (byte)(val / 8);
+ UpdateIndustryProduction(i);
+ SetWindowDirty(w);
+ }
}
}
+static void UpdateIndustryProduction(Industry *i)
+{
+ if (i->produced_cargo[0] != CT_INVALID)
+ i->total_production[0] = 8 * i->production_rate[0];
+
+ if (i->produced_cargo[1] != CT_INVALID)
+ i->total_production[1] = 8 * i->production_rate[1];
+}
+
static const Widget _industry_view_widgets[] = {
{ WWT_TEXTBTN, RESIZE_NONE, 9, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 9, 11, 247, 0, 13, STR_4801, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_STICKYBOX, RESIZE_NONE, 9, 248, 259, 0, 13, 0x0, STR_STICKY_BUTTON},
{ WWT_IMGBTN, RESIZE_NONE, 9, 0, 259, 14, 105, 0x0, STR_NULL},
-{ WWT_6, RESIZE_NONE, 9, 2, 257, 16, 103, 0x0, STR_NULL},
+{ WWT_6, RESIZE_NONE, 9, 2, 257, 16, 103, 0x0, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 9, 0, 259, 106, 147, 0x0, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 9, 0, 129, 148, 159, STR_00E4_LOCATION, STR_482C_CENTER_THE_MAIN_VIEW_ON},
{ WWT_IMGBTN, RESIZE_NONE, 9, 130, 259, 148, 159, 0x0, STR_NULL},
@@ -365,6 +464,9 @@ void ShowIndustryViewWindow(int industry)
w = AllocateWindowDescFront(&_industry_view_desc, industry);
if (w) {
w->flags4 |= WF_DISABLE_VP_SCROLL;
+ WP(w,vp2_d).data_1 = 0;
+ WP(w,vp2_d).data_2 = 0;
+ WP(w,vp2_d).data_3 = 0;
i = GetIndustry(w->window_number);
AssignWindowViewport(w, 3, 17, 0xFE, 0x56, i->xy + TILE_XY(1,1), 1);
}
diff --git a/lang/english.txt b/lang/english.txt
index be9f24d84..e547df307 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -1191,6 +1191,7 @@ STR_RAIL_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Select type of cargo for train to c
STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED :{BLACK}Refit train to carry highlighted cargo type
STR_RAIL_CAN_T_REFIT_VEHICLE :{WHITE}Can't refit train...
STR_CONFIG_PATCHES_SERVINT_ISPERCENT :{LTBLUE}Service intervals are in percents: {ORANGE}{STRING}
+STR_CONFIG_GAME_PRODUCTION :{WHITE}Change production
TEMP_AI_IN_PROGRESS :{WHITE}Welcome to this new AI, a work in progress. You should expect problems. When you happen take a screenshot and post it in the forum. Enjoy!
TEMP_AI_ACTIVATED :{WHITE}Warning: this new AI is still alpha! Currently, only trucks and busses work!
diff --git a/ttd.h b/ttd.h
index e6f9c4bd1..3dcf52bc4 100644
--- a/ttd.h
+++ b/ttd.h
@@ -268,6 +268,8 @@ enum {
CT_FIZZY_DRINKS = 11,
NUM_CARGO = 12,
+
+ CT_INVALID = 0xFF
};
typedef uint AcceptedCargo[NUM_CARGO];
diff --git a/window.h b/window.h
index 4f59dab9e..89ae45c97 100644
--- a/window.h
+++ b/window.h
@@ -283,6 +283,7 @@ typedef struct {
StringID string_id; /* unk30 */
uint16 checked_items; /* unk32 */
} menu_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(menu_d));
typedef struct {
int16 data_1, data_2, data_3;
@@ -290,23 +291,28 @@ typedef struct {
bool close; /* scrollpos_y */
byte byte_1;
} def_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(def_d));
typedef struct {
void *data;
} void_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(void_d));
typedef struct {
uint16 base; /* follow_vehicle */
uint16 count;/* scrollpos_x */
} tree_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(tree_d));
typedef struct {
byte refresh_counter; /* follow_vehicle */
} plstations_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(plstations_d));
typedef struct {
StringID string_id;
} tooltips_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(tooltips_d));
typedef struct {
byte railtype;
@@ -314,6 +320,7 @@ typedef struct {
int16 sel_engine;
int16 rename_engine;
} buildtrain_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(buildtrain_d));
typedef struct {
byte railtype;
@@ -322,40 +329,59 @@ typedef struct {
int16 sel_engine[2];
uint16 count[2];
} replaceveh_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(replaceveh_d));
typedef struct {
VehicleID sel;
} traindepot_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(traindepot_d));
typedef struct {
int sel;
} order_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(order_d));
typedef struct {
byte tab;
} traindetails_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(traindetails_d));
typedef struct {
int32 scroll_x;
int32 scroll_y;
int32 subscroll;
} smallmap_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(traindetails_d));
typedef struct {
uint32 face;
byte gender;
} facesel_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(facesel_d));
typedef struct {
int sel;
byte cargo;
} refit_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(refit_d));
typedef struct {
uint16 follow_vehicle;
int32 scrollpos_x;
int32 scrollpos_y;
} vp_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vp_d) + 3 * sizeof(byte)); // + 3 * byte is a hack from Miham
+
+// vp2_d is the same as vp_d, except for the data_# values..
+typedef struct {
+ uint16 follow_vehicle;
+ int32 scrollpos_x;
+ int32 scrollpos_y;
+ byte data_1;
+ byte data_2;
+ byte data_3;
+} vp2_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vp2_d));
typedef struct {
uint16 follow_vehicle;
@@ -363,16 +389,19 @@ typedef struct {
int32 scrollpos_y;
NewsItem *ni;
} news_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(news_d));
typedef struct {
uint32 background_img;
int8 rank;
} highscore_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(highscore_d));
typedef struct {
int height;
uint16 counter;
} scroller_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(scroller_d));
typedef enum VehicleListFlags {
VL_DESC = 0x01,
@@ -387,7 +416,7 @@ typedef struct vehiclelist_d {
VehicleListFlags flags;
uint16 resort_timer;
} vehiclelist_d;
-assert_compile(sizeof(vehiclelist_d) <= WINDOW_CUSTOM_SIZE);
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vehiclelist_d));
enum WindowEvents {
WE_CLICK = 0,
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-08-02 17:01:59 +0000