openttd-mini: comparison misc

equal deleted inserted replaced

-:0811adaec525
+:eeaefdabfdfd
 			bool found = false;
 			for (i = 0; i < NUM_CARGO; ++i) {
 				if (lid->ac[i] > 0) {
 					// Add a comma between each item.
-					if (found) { *p++ = ','; *p++ = ' '; }
+					if (found) {
+						*p++ = ',';
+						*p++ = ' ';
+					}
 					found = true;
 					// If the accepted value is less than 8, show it in 1/8:ths
 					if (lid->ac[i] < 8) {
 						int32 argv[2];
 						p = GetString(p, _cargoc.names_s[i]);
 					}
 				}
 			}
-			if (found)
+			if (found) DrawStringMultiCenter(140, 76, BindCString(buf), 276);
-				DrawStringMultiCenter(140, 76, BindCString(buf), 276);
 		}
 		if (lid->td.build_date != 0) {
 			SetDParam(0,lid->td.build_date);
 			DrawStringCentered(140,71, STR_BUILD_DATE, 0);
 	"  Chris Sawyer - For an amazing game!"
 };
 static void AboutWindowProc(Window *w, WindowEvent *e)
 {
-	switch(e->event) {
+	switch (e->event) {
 	case WE_CREATE: /* Set up window counter and start position of scroller */
 		WP(w, scroller_d).counter = 0;
 		WP(w, scroller_d).height = w->height - 40;
 		break;
 	case WE_PAINT: {
 	0x79E,0x7A5 | PALETTE_TO_GREEN,0x7AC | PALETTE_TO_RED,0x7B3,0x7BA,0x7C1 | PALETTE_TO_RED,0x7C8 | PALETTE_TO_PALE_GREEN,0x7CF | PALETTE_TO_YELLOW,0x7D6 | PALETTE_TO_RED
 };
 static void BuildTreesWndProc(Window *w, WindowEvent *e)
 {
-	switch(e->event) {
+	switch (e->event) {
 	case WE_PAINT: {
 		int x,y;
 		int i, count;
 		DrawWindowWidgets(w);
 		y = 54;
 		do {
 			DrawSprite(_tree_sprites[i], x, y);
 			x += 35;
 			if (!(++i & 3)) {
-				x -= 35*4;
+				x -= 35 * 4;
 				y += 47;
 			}
 		} while (--count);
 	} break;
 	case WE_CLICK: {
-		int wid;
+		int wid = e->click.widget;
-		switch(wid=e->click.widget) {
+		switch (wid) {
 		case 0:
 			ResetObjectToPlace();
-			return;
+			break;
 		case 3: case 4: case 5: case 6:
 		case 7: case 8: case 9: case 10:
 		case 11:case 12: case 13: case 14:
-			if ( (uint)(wid-3) >= (uint)WP(w,tree_d).count)
+			if (wid - 3 >= WP(w,tree_d).count) break;
-				return;
 			if (HandlePlacePushButton(w, wid, SPR_CURSOR_TREE, 1, NULL))
 				_tree_to_plant = WP(w,tree_d).base + wid - 3;
 			break;
 {   WIDGETS_END},
 };
 static void ErrmsgWndProc(Window *w, WindowEvent *e)
 {
-	switch(e->event) {
+	switch (e->event) {
 	case WE_PAINT:
 		COPY_IN_DPARAM(0, _errmsg_decode_params, lengthof(_errmsg_decode_params));
 		DrawWindowWidgets(w);
 		COPY_IN_DPARAM(0, _errmsg_decode_params, lengthof(_errmsg_decode_params));
 		if (!IsWindowOfPrototype(w, _errmsg_face_widgets)) {
 					238);
 		}
 		break;
 	case WE_MOUSELOOP:
-		if (_right_button_down)
+		if (_right_button_down) DeleteWindow(w);
-			DeleteWindow(w);
+		break;
-		break;
 	case WE_4:
-		if (!--_errmsg_duration)
+		if (--_errmsg_duration == 0) DeleteWindow(w);
-			DeleteWindow(w);
+		break;
-		break;
-	case WE_DESTROY: {
+	case WE_DESTROY:
 		SetRedErrorSquare(0);
 		_switch_mode_errorstr = INVALID_STRING_ID;
 		break;
-		}
 	case WE_KEYPRESS:
 		if (e->keypress.keycode == WKC_SPACE) {
 			// Don't continue.
 			e->keypress.cont = false;
 };
 static void TooltipsWndProc(Window *w, WindowEvent *e)
 {
+	switch (e->event) {
-	switch(e->event) {
+		case WE_PAINT:
-	case WE_PAINT: {
+			GfxFillRect(0, 0, w->width - 1, w->height - 1, 0);
-		GfxFillRect(0, 0, w->width - 1, w->height - 1, 0);
+			GfxFillRect(1, 1, w->width - 2, w->height - 2, 0x44);
-		GfxFillRect(1, 1, w->width - 2, w->height - 2, 0x44);
+			DrawStringMultiCenter((w->width >> 1), (w->height >> 1) - 5, WP(w,tooltips_d).string_id, 197);
-		DrawStringMultiCenter((w->width>>1), (w->height>>1)-5, WP(w,tooltips_d).string_id, 197);
+			break;
-		break;
-	}
+		case WE_MOUSELOOP:
-	case WE_MOUSELOOP:
+			if (!_right_button_down) DeleteWindow(w);
-		if (!_right_button_down)
+			break;
-			DeleteWindow(w);
-		break;
 	}
 }
 void GuiShowTooltips(StringID string_id)
 {
 	char buffer[512];
 	Window *w;
 	int right,bottom;
 	int x,y;
-	if (string_id == 0)
+	if (string_id == 0) return;
-		return;
 	w = FindWindowById(WC_TOOLTIPS, 0);
 	if (w != NULL) {
 		if (WP(w,tooltips_d).string_id == string_id)
 			return;
 	return false;
 }
 void HandleEditBox(Window *w, int wid)
 {
-	if (HandleCaret(&WP(w, querystr_d).text))
+	if (HandleCaret(&WP(w, querystr_d).text)) InvalidateWidget(w, wid);
-		InvalidateWidget(w, wid);
 }
 void DrawEditBox(Window *w, int wid)
 {
 	const Widget *wi = w->widget + wid;
 		}
 		HandleEditBox(w, 5);
 	} break;
 	case WE_KEYPRESS: {
-		switch(HandleEditBoxKey(w, 5, e)) {
+		switch (HandleEditBoxKey(w, 5, e)) {
 		case 1: // Return
 			goto press_ok;
 		case 2: // Escape
 			DeleteWindow(w);
 			break;
 	switch (e->event) {
 	case WE_CREATE: { /* Set up OPENTTD button */
 		o_dir.type = FIOS_TYPE_DIRECT;
 		switch (_saveload_mode) {
-			case SLD_SAVE_GAME: case SLD_LOAD_GAME:
+			case SLD_SAVE_GAME:
+			case SLD_LOAD_GAME:
 				ttd_strlcpy(&o_dir.name[0], _path.save_dir, sizeof(o_dir.name));
 				break;
-			case SLD_SAVE_SCENARIO: case SLD_LOAD_SCENARIO:
+			case SLD_SAVE_SCENARIO:
+			case SLD_LOAD_SCENARIO:
 				ttd_strlcpy(&o_dir.name[0], _path.scenario_dir, sizeof(o_dir.name));
 				break;
 			default:
 				ttd_strlcpy(&o_dir.name[0], _path.personal_dir, sizeof(o_dir.name));
 		}
 		break;
 		}
 		case 6: { /* Click the listbox */
 			int y = (e->click.pt.y - w->widget[6].top - 1) / 10;
 			char *name;
 			const FiosItem *file;
-			if (y < 0 || (y += w->vscroll.pos) >= w->vscroll.count)
+			if (y < 0 || (y += w->vscroll.pos) >= w->vscroll.count) return;
-				return;
 			file = _fios_list + y;
-			if ((name = FiosBrowseTo(file)) != NULL) {
+			name = FiosBrowseTo(file);
+			if (name != NULL) {
 				if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) {
 					_switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_SCENARIO : SM_LOAD;
 					SetFiosType(file->type);
 					ttd_strlcpy(_file_to_saveload.name, name, sizeof(_file_to_saveload.name));
 	WP(w,querystr_d).text.buf = _edit_str_buf;
 	UpdateTextBufferSize(&WP(w, querystr_d).text);
 	// pause is only used in single-player, non-editor mode, non-menu mode. It
 	// will be unpaused in the WE_DESTROY event handler.
-	if(_game_mode != GM_MENU && !_networking && _game_mode != GM_EDITOR)
+	if (_game_mode != GM_MENU && !_networking && _game_mode != GM_EDITOR) {
 		DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
+	}
 	BuildFileList();
 	ResetObjectToPlace();
 }
 {  WWT_SCROLLBAR,    RESIZE_LRB,     7,   245,   256,    26,   307, 0x0,								STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {  WWT_RESIZEBOX,   RESIZE_LRTB,     7,   245,   256,   308,   319, 0x0,								STR_RESIZE_BUTTON},
 {   WIDGETS_END},
 };
-static void SelectScenarioWndProc(Window *w, WindowEvent *e) {
+static void SelectScenarioWndProc(Window* w, WindowEvent* e)
+{
 	const int list_start = 45;
-	switch(e->event) {
+	switch (e->event) {
 	case WE_PAINT:
 	{
 		int y,pos;
 		const FiosItem *item;
 }
 // p1 player to set to, p2 is -1 or +1 (down/up)
 static int32 ClickChangePlayerCheat(int32 p1, int32 p2)
 {
-	while(p1 >= 0 && p1 < MAX_PLAYERS) {
+	while (p1 >= 0 && p1 < MAX_PLAYERS) {
-		if (_players[p1].is_active)	{
+		if (_players[p1].is_active) {
 			_local_player = p1;
 			MarkWholeScreenDirty();
 			return _local_player;
 		}
 		p1 += p2;
 }
 // p1 -1 or +1 (down/up)
 static int32 ClickChangeClimateCheat(int32 p1, int32 p2)
 {
-	if(p1==-1) p1 = 3;
+	if (p1 == -1) p1 = 3;
-	if(p1==4) p1 = 0;
+	if (p1 ==  4) p1 = 0;
 	_opt.landscape = p1;
 	GfxLoadSprites();
 	MarkWholeScreenDirty();
 	return _opt.landscape;
 }
 static int32 ClickChangeDateCheat(int32 p1, int32 p2)
 {
 	YearMonthDay ymd;
 	ConvertDayToYMD(&ymd, _date);
-	if((ymd.year==0 && p2==-1) || (ymd.year==170 && p2==1)) return _cur_year;
+	if ((ymd.year == 0 && p2 == -1) || (ymd.year == 170 && p2 == 1)) return _cur_year;
 	SetDate(ConvertYMDToDay(_cur_year + p2, ymd.month, ymd.day));
 	EnginesMonthlyLoop();
 	SetWindowDirty(FindWindowById(WC_STATUS_BAR, 0));
 	return _cur_year;
 extern void DrawPlayerIcon(int p, int x, int y);
 static void CheatsWndProc(Window *w, WindowEvent *e)
 {
-	switch(e->event) {
+	switch (e->event) {
 	case WE_PAINT: {
 		int clk = WP(w,def_d).data_1;
-		const CheatEntry *ce = &_cheats_ui[0];
-		int32 val;
 		int x, y;
 		int i;
 		DrawWindowWidgets(w);
 		DrawStringMultiCenter(200, 25, STR_CHEATS_WARNING, 350);
-		x=0;
+		x = 0;
-		y=45;
+		y = 45;
-		for(i=0; i!=lengthof(_cheats_ui); i++,ce++) {
+		for (i = 0; i != lengthof(_cheats_ui); i++) {
+			const CheatEntry* ce = &_cheats_ui[i];
 			DrawSprite((*ce->been_used) ? SPR_BOX_CHECKED : SPR_BOX_EMPTY, x + 5, y + 2);
 			if (ce->type == CE_BOOL) {
-				DrawFrameRect(x+20, y+1, x+30+9, y+9, (*(bool*)ce->variable) ? 6 : 4, (*(bool*)ce->variable) ? FR_LOWERED : 0);
+				DrawFrameRect(x + 20, y + 1, x + 30 + 9, y + 9, (*(bool*)ce->variable) ? 6 : 4, (*(bool*)ce->variable) ? FR_LOWERED : 0);
 				SetDParam(0, *(bool*)ce->variable ? STR_CONFIG_PATCHES_ON : STR_CONFIG_PATCHES_OFF);
 			}	else if (ce->type == CE_CLICK) {
-				DrawFrameRect(x+20, y+1, x+30+9, y+9, 0, (WP(w,def_d).data_1 == i*2+1) ? FR_LOWERED : 0);
+				DrawFrameRect(x + 20, y + 1, x + 30 + 9, y + 9, 0, (WP(w,def_d).data_1 == i * 2 + 1) ? FR_LOWERED : 0);
-				if (i == 0)
+				if (i == 0) {
-					SetDParam64(0, (int64) 10000000);
+					SetDParam64(0, 10000000);
-				else
+				} else {
 					SetDParam(0, false);
+				}
 			} else {
-				DrawFrameRect(x+20, y+1, x+20+9, y+9, 3, clk == i*2+1 ? FR_LOWERED : 0);
+				int32 val;
-				DrawFrameRect(x+30, y+1, x+30+9, y+9, 3, clk == i*2+2 ? FR_LOWERED : 0);
-				DrawStringCentered(x+25, y+1, STR_6819, 0);
+				DrawFrameRect(x + 20, y + 1, x + 20 + 9, y + 9, 3, clk == i * 2 + 1 ? FR_LOWERED : 0);
-				DrawStringCentered(x+35, y+1, STR_681A, 0);
+				DrawFrameRect(x + 30, y + 1, x + 30 + 9, y + 9, 3, clk == i * 2 + 2 ? FR_LOWERED : 0);
+				DrawStringCentered(x + 25, y + 1, STR_6819, 0);
+				DrawStringCentered(x + 35, y + 1, STR_681A, 0);
 				val = ReadCE(ce);
 				// set correct string for switch climate cheat
-				if(ce->str==STR_CHEAT_SWITCH_CLIMATE)
+				if (ce->str == STR_CHEAT_SWITCH_CLIMATE) val += STR_TEMPERATE_LANDSCAPE;
-					val += STR_TEMPERATE_LANDSCAPE;
 				SetDParam(0, val);
 				// display date for change date cheat
-				if(ce->str==STR_CHEAT_CHANGE_DATE)
+				if (ce->str == STR_CHEAT_CHANGE_DATE) SetDParam(0, _date);
-					SetDParam(0, _date);
 				// draw colored flag for change player cheat
-				if(ce->str==STR_CHEAT_CHANGE_PLAYER)
+				if (ce->str == STR_CHEAT_CHANGE_PLAYER) {
-					DrawPlayerIcon(_current_player, 156, y+2);
+					DrawPlayerIcon(_current_player, 156, y + 2);
+				}
 			}
-		DrawString(50, y+1, ce->str, 0);
+			DrawString(50, y + 1, ce->str, 0);
-		y+=12;
+			y += 12;
 		}
 		break;
 	}
 	case WE_CLICK: {
 			const CheatEntry *ce;
 			uint btn = (e->click.pt.y - 46) / 12;
 			int32 val, oval;
 			uint x = e->click.pt.x;
 			// not clicking a button?
-			if(!IS_INT_INSIDE(x, 20, 40) || btn>=lengthof(_cheats_ui))
+			if (!IS_INT_INSIDE(x, 20, 40) || btn >= lengthof(_cheats_ui)) break;
-				break;
 			ce = &_cheats_ui[btn];
 			oval = val = ReadCE(ce);
 			*ce->been_used = true;
-			switch(ce->type) {
+			switch (ce->type) {
 				case CE_BOOL:	{
 					val ^= 1;
-					if (ce->click_proc != NULL)
+					if (ce->click_proc != NULL) ce->click_proc(val, 0);
-						ce->click_proc(val, 0);
 					break;
 				}
 				case CE_CLICK:	{
 					ce->click_proc(val, 0);
 						val -= ce->step;
 						if (val < ce->min) val = ce->min;
 					}
 					// take whatever the function returns
-					val = ce->click_proc(val, (x>=30) ? 1 : -1);
+					val = ce->click_proc(val, (x >= 30) ? 1 : -1);
-					if (val != oval)
+					if (val != oval) {
-						WP(w,def_d).data_1 = btn * 2 + 1 + ((x>=30) ? 1 : 0);
+						WP(w,def_d).data_1 = btn * 2 + 1 + ((x >= 30) ? 1 : 0);
+					}
 					break;
 				}
 			}
 			if (val != oval) {
 		WP(w,def_d).data_1 = 0;
 		SetWindowDirty(w);
 		break;
 	}
 }
 static const WindowDesc _cheats_desc = {
 	240, 22, 400, 160,
 	WC_CHEATS,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_cheat_widgets,

changeset 2639	eeaefdabfdfd
parent 2631	2ed0eb408229
child 2703	a969970a5245