Changeset - r18882:b2227172c2cf
[Not reviewed]
master
0 5 0
rubidium - 13 years ago 2012-01-03 21:47:01
rubidium@openttd.org
(svn r23741) -Revert (r23740): the few parts that the Windows / non-network compiles stumble on
5 files changed with 12 insertions and 0 deletions:
0 comments (0 inline, 0 general)
src/company_cmd.cpp
Show inline comments
 
@@ -8,40 +8,43 @@
 
 */
 

	
 
/** @file company_cmd.cpp Handling of companies. */
 

	
 
#include "stdafx.h"
 
#include "company_base.h"
 
#include "company_func.h"
 
#include "company_gui.h"
 
#include "town.h"
 
#include "news_func.h"
 
#include "cmd_helper.h"
 
#include "command_func.h"
 
#include "network/network.h"
 
#include "network/network_func.h"
 
#include "network/network_base.h"
 
#include "network/network_admin.h"
 
#include "ai/ai.hpp"
 
#include "company_manager_face.h"
 
#include "window_func.h"
 
#include "strings_func.h"
 
#include "date_func.h"
 
#include "sound_func.h"
 
#include "rail.h"
 
#include "core/pool_func.hpp"
 
#include "settings_func.h"
 
#include "vehicle_base.h"
 
#include "vehicle_func.h"
 
#include "smallmap_gui.h"
 
#include "game/game.hpp"
 

	
 
#include "table/strings.h"
 

	
 
CompanyByte _local_company;   ///< Company controlled by the human player at this client. Can also be #COMPANY_SPECTATOR.
 
CompanyByte _current_company; ///< Company currently doing an action.
 
Colours _company_colours[MAX_COMPANIES];  ///< NOSAVE: can be determined from company structs.
 
CompanyManagerFace _company_manager_face; ///< for company manager face storage in openttd.cfg
 
uint _next_competitor_start;              ///< the number of ticks before the next AI is started
 
uint _cur_company_tick_index;             ///< used to generate a name for one company that doesn't have a name yet per tick
 

	
 
CompanyPool _company_pool("Company"); ///< Pool of companies.
 
INSTANTIATE_POOL_METHODS(Company)
 

	
 
/**
src/console.cpp
Show inline comments
 
@@ -2,25 +2,28 @@
 

	
 
/*
 
 * This file is part of OpenTTD.
 
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 
 * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
 */
 

	
 
/** @file console.cpp Handling of the in-game console. */
 

	
 
#include "stdafx.h"
 
#include "console_internal.h"
 
#include "network/network.h"
 
#include "network/network_func.h"
 
#include "network/network_admin.h"
 
#include "debug.h"
 
#include "console_func.h"
 
#include "settings_type.h"
 

	
 
#include <stdarg.h>
 

	
 
static const uint ICON_TOKEN_COUNT = 20;     ///< Maximum number of tokens in one command
 
static const uint ICON_MAX_ALIAS_LINES = 40; ///< Maximum number of commands executed by one alias
 

	
 
/* console parser */
 
IConsoleCmd   *_iconsole_cmds;    ///< list of registered commands
 
IConsoleAlias *_iconsole_aliases; ///< list of registered aliases
 

	
src/console_cmds.cpp
Show inline comments
 
@@ -2,27 +2,30 @@
 

	
 
/*
 
 * This file is part of OpenTTD.
 
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 
 * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
 */
 

	
 
/** @file console_cmds.cpp Implementation of the console hooks. */
 

	
 
#include "stdafx.h"
 
#include "console_internal.h"
 
#include "debug.h"
 
#include "engine_func.h"
 
#include "landscape.h"
 
#include "saveload/saveload.h"
 
#include "network/network.h"
 
#include "network/network_func.h"
 
#include "network/network_base.h"
 
#include "network/network_admin.h"
 
#include "network/network_client.h"
 
#include "command_func.h"
 
#include "settings_func.h"
 
#include "fios.h"
 
#include "fileio_func.h"
 
#include "screenshot.h"
 
#include "genworld.h"
 
#include "strings_func.h"
 
#include "viewport_func.h"
 
#include "window_func.h"
src/debug.cpp
Show inline comments
 
@@ -3,24 +3,26 @@
 
/*
 
 * This file is part of OpenTTD.
 
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 
 * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
 */
 

	
 
/** @file debug.cpp Handling of printing debug messages. */
 

	
 
#include "stdafx.h"
 
#include <stdarg.h>
 
#include "console_func.h"
 
#include "debug.h"
 
#include "string_func.h"
 
#include "fileio_func.h"
 
#include "settings_type.h"
 

	
 
#include <time.h>
 

	
 
#if defined(ENABLE_NETWORK)
 
#include "network/network_admin.h"
 
SOCKET _debug_socket = INVALID_SOCKET;
 
#endif /* ENABLE_NETWORK */
 

	
 
int _debug_driver_level;
 
int _debug_grf_level;
src/ini_load.cpp
Show inline comments
 
@@ -4,24 +4,25 @@
 
 * This file is part of OpenTTD.
 
 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 
 * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
 */
 

	
 
/** @file ini_load.cpp Definition of the #IniLoadFile class, related to reading and storing '*.ini' files. */
 

	
 
#include "stdafx.h"
 
#include "core/alloc_func.hpp"
 
#include "core/mem_func.hpp"
 
#include "ini_type.h"
 
#include "string_func.h"
 

	
 
/**
 
 * Construct a new in-memory item of an Ini file.
 
 * @param parent the group we belong to
 
 * @param name   the name of the item
 
 * @param len    the length of the name of the item
 
 */
 
IniItem::IniItem(IniGroup *parent, const char *name, size_t len) : next(NULL), value(NULL), comment(NULL)
 
{
 
	if (len == 0) len = strlen(name);
 

	
 
	this->name = strndup(name, len);
0 comments (0 inline, 0 general)