openttd-ottdgrfs: comparison src/misc

equal deleted inserted replaced

-:70d78ac95d6c
+:7bd07f43b0e3
 	DEBUG(misc, LANDINFOD_LEVEL, "m5           = %#x", _m[tile].m5);
 	DEBUG(misc, LANDINFOD_LEVEL, "m6           = %#x", _m[tile].m6);
 #undef LANDINFOD_LEVEL
 }
-void PlaceLandBlockInfo(void)
+void PlaceLandBlockInfo()
 {
 	if (_cursor.sprite == SPR_CURSOR_QUERY) {
 		ResetObjectToPlace();
 	} else {
 		_place_proc = Place_LandInfo;
 	"  Matthijs Kooijman (blathijs) - Pathfinder-guru",
 	"  Victor Fischer (Celestar) - Programming everywhere you need him to",
 	"  Tamás Faragó (Darkvater) - Lead coder",
 	"  Loïc Guilloux (glx) - In training, not yet specialized",
 	"  Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)",
+	"  Jonathan Coome (Maedhros) - High priest of the newGRF Temple",
 	"  Attila Bán (MiHaMiX) - WebTranslator, Nightlies, Wiki and bugtracker host",
 	"  Peter Nelson (peter1138) - Spiritual descendant from newgrf gods",
 	"  Remko Bijker (Rubidium) - THE desync hunter",
 	"  Christoph Mallon (Tron) - Programmer, code correctness police",
 	"  Patric Stout (TrueLight) - Coder, network guru, SVN- and website host",
 	_about_widgets,
 	AboutWindowProc
 };
-void ShowAboutWindow(void)
+void ShowAboutWindow()
 {
 	DeleteWindowById(WC_GAME_OPTIONS, 0);
 	AllocateWindowDesc(&_about_desc);
 }
 	_build_trees_scen_widgets,
 	BuildTreesWndProc
 };
-void ShowBuildTreesToolbar(void)
+void ShowBuildTreesToolbar()
 {
 	if (!IsValidPlayer(_current_player)) return;
 	AllocateWindowDescFront(&_build_trees_desc, 0);
 }
-void ShowBuildTreesScenToolbar(void)
+void ShowBuildTreesScenToolbar()
 {
 	AllocateWindowDescFront(&_build_trees_scen_desc, 0);
 }
 static uint32 _errmsg_decode_params[20];
 	QUERY_WIDGET_NO = 3,
 	QUERY_WIDGET_YES
 };
-typedef struct query_d {
+struct query_d {
 	void (*proc)(Window*, bool); ///< callback function executed on closing of popup. Window* points to parent, bool is true if 'yes' clicked, false otherwise
 	StringID message;            ///< message shown for query window
 	uint32 params[20];           ///< local copy of _decode_parameters
 	bool calledback;             ///< has callback been executed already (internal usage for WE_DESTROY event)
-} query_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(query_d));
 static void QueryWndProc(Window *w, WindowEvent *e)
 {
 };
 /* Colors for fios types */
 const byte _fios_colors[] = {13, 9, 9, 6, 5, 6, 5, 6, 6, 8};
-void BuildFileList(void)
+void BuildFileList()
 {
 	_fios_path_changed = true;
 	FiosFreeSavegameList();
 	switch (_saveload_mode) {
 	if (str != STR_4006_UNABLE_TO_READ_DRIVE) SetDParam(0, tot);
 	DrawString(2, 37, str, 0);
 	DoDrawStringTruncated(path, 2, 27, 16, maxw);
 }
-static void MakeSortedSaveGameList(void)
+static void MakeSortedSaveGameList()
 {
 	uint sort_start = 0;
 	uint sort_end = 0;
 	uint s_amount;
 	int i;
 	s_amount = _fios_num - sort_start - sort_end;
 	if (s_amount > 0)
 		qsort(_fios_list + sort_start, s_amount, sizeof(FiosItem), compare_FiosItems);
 }
-static void GenerateFileName(void)
+static void GenerateFileName()
 {
 	/* Check if we are not a specatator who wants to generate a name..
 	    Let's use the name of player #0 for now. */
 	const Player *p = GetPlayer(IsValidPlayer(_local_player) ? _local_player : PLAYER_FIRST);
 	SetDParam(1, p->name_2);
 	SetDParam(2, _date);
 	GetString(_edit_str_buf, STR_4004, lastof(_edit_str_buf));
 }
-extern void StartupEngines(void);
+extern void StartupEngines();
 static void SaveLoadDlgWndProc(Window *w, WindowEvent *e)
 {
 	static FiosItem o_dir;
 	BuildFileList();
 	ResetObjectToPlace();
 }
-void RedrawAutosave(void)
+void RedrawAutosave()
 {
 	SetWindowDirty(FindWindowById(WC_STATUS_BAR, 0));
 }
 void SetFiosType(const byte fiostype)
 	_opt.landscape = p1;
 	ReloadNewGRFData();
 	return _opt.landscape;
 }
-extern void EnginesMonthlyLoop(void);
+extern void EnginesMonthlyLoop();
 /**
 * @param p2 1 (increase) or -1 (decrease)
 */
 static int32 ClickChangeDateCheat(int32 p1, int32 p2)
 /** Define basic enum properties */
 template <> struct EnumPropsT<ce_flags_long> : MakeEnumPropsT<ce_flags_long, byte, CE_NONE, CE_END, CE_END> {};
 typedef TinyEnumT<ce_flags_long> ce_flags;
-typedef struct CheatEntry {
+struct CheatEntry {
 	VarType type;          ///< type of selector
 	ce_flags flags;        ///< selector flags
 	StringID str;          ///< string with descriptive text
 	void *variable;        ///< pointer to the variable
 	bool *been_used;       ///< has this cheat been used before?
 	CheckButtonClick *proc;///< procedure
 	int16 min, max;        ///< range for spinbox setting
-} CheatEntry;
+};
 static const CheatEntry _cheats_ui[] = {
 	{SLE_BOOL, {CE_CLICK}, STR_CHEAT_MONEY,          &_cheats.money.value,           &_cheats.money.been_used,           &ClickMoneyCheat,         0,  0},
 	{SLE_UINT8, {CE_NONE}, STR_CHEAT_CHANGE_PLAYER,  &_local_player,                 &_cheats.switch_player.been_used,   &ClickChangePlayerCheat,  0, 11},
 	{SLE_BOOL,  {CE_NONE}, STR_CHEAT_EXTRA_DYNAMITE, &_cheats.magic_bulldozer.value, &_cheats.magic_bulldozer.been_used, NULL,                     0,  0},
 	_cheat_widgets,
 	CheatsWndProc
 };
-void ShowCheatWindow(void)
+void ShowCheatWindow()
 {
 	DeleteWindowById(WC_CHEATS, 0);
 	AllocateWindowDesc(&_cheats_desc);
 }

branch	gamebalance
changeset 9895	7bd07f43b0e3
parent 6540	4db000b2cc41
child 9896	2473804114de