mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r26056) -Fix: a number of possibly uninitialised variables
This commit is contained in:
parent
bdd62a4b3e
commit
2e54c8fdfa
|
@ -29,9 +29,11 @@ assert_compile((int)CRR_END == (int)ADMIN_CRR_END);
|
|||
* Create the admin handler for the given socket.
|
||||
* @param s The socket to communicate over.
|
||||
*/
|
||||
NetworkAdminSocketHandler::NetworkAdminSocketHandler(SOCKET s)
|
||||
NetworkAdminSocketHandler::NetworkAdminSocketHandler(SOCKET s) : status(ADMIN_STATUS_INACTIVE)
|
||||
{
|
||||
this->sock = s;
|
||||
this->admin_name[0] = '\0';
|
||||
this->admin_version[0] = '\0';
|
||||
}
|
||||
|
||||
NetworkAdminSocketHandler::~NetworkAdminSocketHandler()
|
||||
|
|
|
@ -26,12 +26,10 @@
|
|||
* Create a new socket for the game connection.
|
||||
* @param s The socket to connect with.
|
||||
*/
|
||||
NetworkGameSocketHandler::NetworkGameSocketHandler(SOCKET s)
|
||||
NetworkGameSocketHandler::NetworkGameSocketHandler(SOCKET s) : info(NULL),
|
||||
last_frame(_frame_counter), last_frame_server(_frame_counter), last_packet(_realtime_tick)
|
||||
{
|
||||
this->sock = s;
|
||||
this->last_frame = _frame_counter;
|
||||
this->last_frame_server = _frame_counter;
|
||||
this->last_packet = _realtime_tick;
|
||||
this->sock = s;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -137,7 +137,7 @@ class CommandQueue {
|
|||
|
||||
public:
|
||||
/** Initialise the command queue. */
|
||||
CommandQueue() : first(NULL), last(NULL) {}
|
||||
CommandQueue() : first(NULL), last(NULL), count(0) {}
|
||||
/** Clear the command queue. */
|
||||
~CommandQueue() { this->Free(); }
|
||||
void Append(CommandPacket *p);
|
||||
|
|
|
@ -705,7 +705,8 @@ ClientNetworkContentSocketHandler::ClientNetworkContentSocketHandler() :
|
|||
http_response_index(-2),
|
||||
curFile(NULL),
|
||||
curInfo(NULL),
|
||||
isConnecting(false)
|
||||
isConnecting(false),
|
||||
lastActivity(_realtime_tick)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -154,6 +154,8 @@ bool IsNetworkCompatibleVersion(const char *version);
|
|||
* Everything we need to know about a command to be able to execute it.
|
||||
*/
|
||||
struct CommandPacket : CommandContainer {
|
||||
/** Make sure the pointer is NULL. */
|
||||
CommandPacket() : next(NULL) {}
|
||||
CommandPacket *next; ///< the next command packet (if in queue)
|
||||
CompanyByte company; ///< company that is executing the command
|
||||
uint32 frame; ///< the frame in which this packet is executed
|
||||
|
|
|
@ -560,11 +560,12 @@ static const control_point_list_t _curve_maps[] = {
|
|||
static void HeightMapCurves(uint level)
|
||||
{
|
||||
height_t ht[lengthof(_curve_maps)];
|
||||
MemSetT(ht, 0, lengthof(ht));
|
||||
|
||||
/* Set up a grid to choose curve maps based on location */
|
||||
uint sx = Clamp(1 << level, 2, 32);
|
||||
uint sy = Clamp(1 << level, 2, 32);
|
||||
byte *c = (byte *)alloca(sx * sy);
|
||||
byte *c = AllocaM(byte, sx * sy);
|
||||
|
||||
for (uint i = 0; i < sx * sy; i++) {
|
||||
c[i] = Random() % lengthof(_curve_maps);
|
||||
|
|
Loading…
Reference in New Issue