openttd-ottdgrfs: comparison src/openttd.cpp

equal deleted inserted replaced

-:96b4b92b86ae
+:9c3129cb019b
 /* $Id$ */
 #include "stdafx.h"
+#define VARDEF
 #include "string.h"
 #include "table/strings.h"
 #include "debug.h"
 #include "driver.h"
 #include "saveload.h"
 #include "strings.h"
 #include "map.h"
 #include "tile.h"
 #include "void_map.h"
+#include "helpers.hpp"
-#define VARDEF
 #include "openttd.h"
 #include "bridge_map.h"
 #include "functions.h"
 #include "mixer.h"
 #include "spritecache.h"
 void ResetMusic(void);
 void InitializeStations(void);
 void DeleteAllPlayerStations(void);
 extern void SetDifficultyLevel(int mode, GameOptions *gm_opt);
-extern void DoStartupNewPlayer(bool is_ai);
+extern Player* DoStartupNewPlayer(bool is_ai);
 extern void ShowOSErrorBox(const char *buf);
 /* TODO: usrerror() for errors which are not of an internal nature but
 * caused by the user, i.e. missing files or fatal configuration errors.
 * Post-0.4.0 since Celestar doesn't want this in SVN before. --pasky */
 	if (in == NULL) return NULL;
 	fseek(in, 0, SEEK_END);
 	len = ftell(in);
 	fseek(in, 0, SEEK_SET);
-	if (len > maxsize || (mem = malloc(len + 1)) == NULL) {
+	if (len > maxsize || !MallocT(&mem, len + 1)) {
 		fclose(in);
 		return NULL;
 	}
 	mem[len] = 0;
 	if (fread(mem, len, 1, in) != 1) {
 	*lenp = len;
 	return mem;
 }
+extern const char _openttd_revision[];
 static void showhelp(void)
 {
-	extern const char _openttd_revision[];
 	char buf[4096], *p;
 	p = buf;
 	p += snprintf(p, lengthof(buf), "OpenTTD %s\n", _openttd_revision);
 	ShowInfo(buf);
 }
-typedef struct {
+struct MyGetOptData {
 	char *opt;
 	int numleft;
 	char **argv;
 	const char *options;
-	char *cont;
+	const char *cont;
-} MyGetOptData;
+	MyGetOptData(int argc, char **argv, const char *options)
-static void MyGetOptInit(MyGetOptData *md, int argc, char **argv, const char *options)
+	{
-{
+		opt = NULL;
-	md->cont = NULL;
+		numleft = argc;
-	md->numleft = argc;
+		this->argv = argv;
-	md->argv = argv;
+		this->options = options;
-	md->options = options;
+		cont = NULL;
-}
+	}
+};
 static int MyGetOpt(MyGetOptData *md)
 {
-	char *s,*r,*t;
+	const char *s,*r,*t;
 	s = md->cont;
 	if (s != NULL)
 		goto md_continue_here;
 							t = NULL;
 						} else {
 							md->argv++;
 						}
 					}
-					md->opt = t;
+					md->opt = (char*)t;
 					md->cont = NULL;
 					return *s;
 				}
 				md->opt = NULL;
 				md->cont = s;
 }
 static void ParseResolution(int res[2], const char *s)
 {
-	char *t = strchr(s, 'x');
+	const char *t = strchr(s, 'x');
 	if (t == NULL) {
 		ShowInfoF("Invalid resolution '%s'", s);
 		return;
 	}
 		GenerateWorld(GW_EMPTY, 64, 64); // if failed loading, make empty world.
 		WaitTillGeneratedWorld();
 	}
 	_pause = 0;
-	SetLocalPlayer(0);
+	SetLocalPlayer(PLAYER_FIRST);
 	/* Make sure you can't scroll in the menu */
 	_scrolling_viewport = 0;
 	_cursor.fix_at = false;
 	MarkWholeScreenDirty();
 extern void DedicatedFork(void);
 #endif
 int ttd_main(int argc, char *argv[])
 {
-	MyGetOptData mgo;
 	int i;
 	const char *optformat;
 	char musicdriver[16], sounddriver[16], videodriver[16];
 	int resolution[2] = {0,0};
 	Year startyear = INVALID_YEAR;
 #if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32)
 		"f"
 #endif
 	;
-	MyGetOptInit(&mgo, argc-1, argv+1, optformat);
+	MyGetOptData mgo(argc-1, argv+1, optformat);
 	while ((i = MyGetOpt(&mgo)) != -1) {
 		switch (i) {
 		case 'm': ttd_strlcpy(musicdriver, mgo.opt, sizeof(musicdriver)); break;
 		case 's': ttd_strlcpy(sounddriver, mgo.opt, sizeof(sounddriver)); break;
 		case 'v': ttd_strlcpy(videodriver, mgo.opt, sizeof(videodriver)); break;
 			_network_playas = PLAYER_NEW_COMPANY;
 			ParseConnectionString(&player, &port, network_conn);
 			if (player != NULL) {
-				_network_playas = atoi(player);
+				_network_playas = (PlayerID)atoi(player);
 				if (_network_playas != PLAYER_SPECTATOR) {
 					_network_playas--;
 					if (!IsValidPlayer(_network_playas)) return false;
 				}
 	}
 	/* Create a single player */
 	DoStartupNewPlayer(false);
-	SetLocalPlayer(0);
+	SetLocalPlayer(PLAYER_FIRST);
 	_current_player = _local_player;
 	DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_SET_AUTOREPLACE);
 	SettingsDisableElrail(_patches.disable_elrails);
 	StartupEconomy();
 	StartupPlayers();
 	StartupEngines();
 	StartupDisasters();
-	SetLocalPlayer(0);
+	SetLocalPlayer(PLAYER_FIRST);
 	_current_player = _local_player;
 	DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_SET_AUTOREPLACE);
 	MarkWholeScreenDirty();
 }
 			LoadIntroGame();
 			ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
 		} else {
 			/* Update the local player for a loaded game. It is either always
 			 * player #1 (eg 0) or in the case of a dedicated server a spectator */
-			SetLocalPlayer(_network_dedicated ? PLAYER_SPECTATOR : 0);
+			SetLocalPlayer(_network_dedicated ? PLAYER_SPECTATOR : PLAYER_FIRST);
 			DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // decrease pause counter (was increased from opening load dialog)
 #ifdef ENABLE_NETWORK
 			if (_network_server) {
 				snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Loaded game)", _file_to_saveload.title);
 			}
 static void UpdateExclusiveRights(void)
 {
 	Town *t;
 	FOR_ALL_TOWNS(t) {
-		t->exclusivity = (byte)-1;
+		t->exclusivity = INVALID_PLAYER;
 	}
 	/* FIXME old exclusive rights status is not being imported (stored in s->blocked_months_obsolete)
 	 *   could be implemented this way:
 	 * 1.) Go through all stations
 		 * However, in a dedicated server we are a spectator, so nothing needs to
 		 * happen. In case we are not a dedicated server, the local player always
 		 * becomes player 0, unless we are in the scenario editor where all the
 		 * players are 'invalid'.
 		 */
-		if (!_network_dedicated && IsValidPlayer(0)) {
+		if (!_network_dedicated && IsValidPlayer(PLAYER_FIRST)) {
-			p = GetPlayer(0);
+			p = GetPlayer(PLAYER_FIRST);
 			p->engine_renew        = _patches.autorenew;
 			p->engine_renew_months = _patches.autorenew_months;
 			p->engine_renew_money  = _patches.autorenew_money;
 		}
 	}
 				v->tile = GetNorthernBridgeEnd(v->tile);
 			} else {
 				continue;
 			}
 			if (v->type == VEH_Train) {
-				v->u.rail.track = 0x40;
+				v->u.rail.track = TRACK_BIT_WORMHOLE;
 			} else {
 				v->u.road.state = 0xFF;
 			}
 		}
 	}
 	if (!CheckSavegameVersion(27)) AfterLoadStations();
 	{
 		/* Set up the engine count for all players */
 		Player *players[MAX_PLAYERS];
-		int i;
 		const Vehicle *v;
-		for (i = 0; i < MAX_PLAYERS; i++) players[i] = GetPlayer(i);
+		for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) players[i] = GetPlayer(i);
 		FOR_ALL_VEHICLES(v) {
 			if (!IsEngineCountable(v)) continue;
 			players[v->owner]->num_engines[v->engine_type]++;
 		}
 	AfterLoadWaypoints();
 	AfterLoadStations();
 	/* redraw the whole screen */
 	MarkWholeScreenDirty();
 }
+HalMusicDriver *_music_driver;
+HalSoundDriver *_sound_driver;
+HalVideoDriver *_video_driver;
+byte _dirkeys;        // 1 = left, 2 = up, 4 = right, 8 = down
+bool _fullscreen;
+CursorVars _cursor;
+bool _ctrl_pressed;   // Is Ctrl pressed?
+bool _shift_pressed;  // Is Shift pressed?
+byte _fast_forward;
+bool _left_button_down;
+bool _left_button_clicked;
+bool _right_button_down;
+bool _right_button_clicked;
+DrawPixelInfo _screen;
+bool _exit_game;
+bool _networking;         ///< are we in networking mode?
+byte _game_mode;
+byte _pause;
+int _pal_first_dirty;
+int _pal_last_dirty;

changeset 5838	9c3129cb019b
parent 5835	e0ff603ae0b7
child 5860	7fdc9b423ba1