Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Core/GameEngine/Source/Common/Audio/GameAudio.cpp
Comment thread
xezon marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ AudioManager::AudioManager() :
m_hardwareAccel(FALSE),
m_musicPlayingFromCD(FALSE)
{
// Added by Sadullah Nader
m_adjustedVolumes.clear();
m_audioRequests.clear();
m_listenerPosition.zero();
Expand All @@ -166,7 +165,6 @@ AudioManager::AudioManager() :
m_systemSoundVolume = 0.0f;
m_systemSpeechVolume = 0.0f;
m_volumeHasChanged = FALSE;
//

m_listenerOrientation.set(0.0, 1.0, 0.0);
theAudioHandlePool = AHSV_FirstHandle;
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/Common/System/RAMFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,7 @@
RAMFile::RAMFile()
: m_size(0),
m_data(NULL),
//Added By Sadullah Nader
//Initializtion(s) inserted
m_pos(0)
//
{

}
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/Common/System/XferCRC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ XferCRC::XferCRC( void )
{

m_xferMode = XFER_CRC;
//Added By Sadullah Nader
//Initialization(s) inserted
m_crc = 0;
//
}

//-------------------------------------------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/GameNetwork/Connection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,12 @@ Connection::Connection() {
m_frameGrouping = 1;
m_isQuitting = false;
m_quitTime = 0;
// Added By Sadullah Nader
// clearing out the latency tracker
m_averageLatency = 0.0f;
Int i;
for(i = 0; i < CONNECTION_LATENCY_HISTORY_LENGTH; i++)
{
m_latencies[i] = 0.0f;
}
// End Add
}

/**
Expand Down
2 changes: 0 additions & 2 deletions Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@

DisconnectManager::DisconnectManager()
{
// Added By Sadullah Nader
// Initializations missing and needed
Int i;
m_currentPacketRouterIndex = 0;
m_lastFrame = 0;
Expand Down
7 changes: 0 additions & 7 deletions Core/GameEngine/Source/GameNetwork/DownloadManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,7 @@ DownloadManager::DownloadManager()
{
m_download = NEW CDownload(this);
m_wasError = m_sawEnd = false;

//Added By Sadullah Nader
//Initializations missing and needed

m_queuedDownloads.clear();

//

m_statusString = TheGameText->fetch("FTP:StatusIdle");

// ----- Initialize Winsock -----
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp
Comment thread
xezon marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,12 @@ FirewallHelperClass * createFirewallHelper()

FirewallHelperClass::FirewallHelperClass(void)
{
//Added Sadullah Nader
//Initializations missing and needed
m_currentTry = 0;
m_numManglers = 0;
m_numResponses = 0;
m_packetID = 0;
m_timeoutLength = 0;
m_timeoutStart = 0;
//

m_behavior = FIREWALL_TYPE_UNKNOWN;
m_lastBehavior = FIREWALL_TYPE_UNKNOWN;
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/GameNetwork/FrameData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@ FrameData::FrameData()
m_commandList = NULL;
m_commandCount = 0;
m_frameCommandCount = -1;
//Added By Sadullah Nader
//Initializations missing and needed
m_lastFailedCC = 0;
m_lastFailedFrameCC = 0;
//
}

/**
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/GameNetwork/FrameMetrics.cpp
Comment thread
xezon marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@

FrameMetrics::FrameMetrics()
{
//Added By Sadullah Nader
//Initializations missing and needed
m_averageFps = 0.0f;
m_averageLatency = 0.0f;
m_cushionIndex = 0;
Expand All @@ -44,7 +42,6 @@ FrameMetrics::FrameMetrics()
m_pendingLatencies = NEW time_t[MAX_FRAMES_AHEAD];
for(Int i = 0; i < MAX_FRAMES_AHEAD; i++)
m_pendingLatencies[i] = 0;
//
m_fpsList = NEW Real[TheGlobalData->m_networkFPSHistoryLength];
m_latencyList = NEW Real[TheGlobalData->m_networkLatencyHistoryLength];
}
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/GameNetwork/GameInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -307,16 +307,13 @@ void GameInfo::reset( void )
m_useStats = TRUE;
m_surrendered = FALSE;
m_oldFactionsOnly = FALSE;
// Added By Sadullah Nader
// Initializations missing and needed
// m_localIP = 0; // BGC - actually we don't want this to be reset since the m_localIP is
// set properly in the constructor of LANGameInfo which uses this as a base class.
m_mapCRC = 0;
m_mapSize = 0;
m_superweaponRestriction = 0;
m_startingCash = TheGlobalData->m_defaultStartingCash;

//

for (Int i=0; i<MAX_SLOTS; ++i)
{
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ void GameSpyInfo::reset( void )
m_localProfileID = 0;
m_maxMessagesPerUpdate = 100;

// Added By Sadullah Nader
// Initialization missing and needed
m_disallowAsainText = FALSE;
m_disallowNonAsianText = FALSE;
m_disconReason = 0;
Expand All @@ -100,7 +98,6 @@ void GameSpyInfo::reset( void )
m_pingString.clear();
m_rawConfig.clear();
m_rawMotd.clear();
//

m_internalIP = m_externalIP = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ GameSpyGameSlot::GameSpyGameSlot()
m_rankPoints = 0;
m_favoriteSide = 0;
m_pingInt = 0;
// Added By Sadullah Nader
// Initializations missing and needed
m_profileID = 0;
m_pingStr.clear();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,6 @@ class PeerThreadClass : public ThreadClass
public:
PeerThreadClass() : ThreadClass()
{
//Added By Sadullah Nader
//Initializations inserted
m_roomJoined = m_allowObservers = m_hasPassword = FALSE;
m_useStats = TRUE;
m_exeCRC = m_iniCRC = 0;
Expand All @@ -193,24 +191,18 @@ class PeerThreadClass : public ThreadClass
m_qmGroupRoom = 0;
m_sawEndOfEnumPlayers = m_sawMatchbot = FALSE;
m_sawCompleteGameList = FALSE;
//
m_isConnecting = m_isConnected = false;
m_groupRoomID = m_profileID = 0;
m_nextStagingServer = 1; m_stagingServers.clear();
m_pingStr = ""; m_mapName = ""; m_ladderIP = ""; m_isHosting = false;
for (Int i=0; i<MAX_SLOTS; ++i)
{
m_playerNames[i] = "";

//Added by Sadullah Nader
//Initializations
m_playerColors[i] = 0;
m_playerFactions[i] = 0;
m_playerLosses[i] = 0;
m_playerProfileID[i] = 0;
m_playerWins[i] = 0;

//
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1108,10 +1108,8 @@ void PSPlayerStats::reset( void )
maxDesyncsInARow = 0;
lastLadderPort = 0;

//Added By Sadullah Nader
maxQMwinsInARow = 0;
QMwinsInARow = 0;
//
}

//-------------------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/GameNetwork/LANGameInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,8 @@ Bool LANGameSlot::isLocalPlayer( void ) const

LANGameInfo::LANGameInfo()
{
//Added By Sadullah Nader
//Initializtions missing and needed
m_lastHeard = 0;
m_next = NULL;
//
for (Int i = 0; i< MAX_SLOTS; ++i)
setSlotPointer(i, &m_LANSlot[i]);

Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/GameNetwork/NAT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ NAT *TheNAT = NULL;

NAT::NAT()
{
//Added By Sadullah Nader
//Initializations inserted
m_beenProbed = FALSE;
m_connectionPairIndex = 0;
m_connectionRound = 0;
Expand All @@ -161,7 +159,6 @@ NAT::NAT()
m_spareSocketPort = 0;
m_startingPortNumber = 0;
m_targetNodeNumber = 0;
//
m_transport = NULL;
m_slotList = NULL;
m_roundTimeout = 0;
Expand Down
9 changes: 0 additions & 9 deletions Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,10 @@
*/
NetCommandMsg::NetCommandMsg()
{
//Added By Sadullah Nader
//Initializations inserted
m_executionFrame = 0;
m_id = 0;
m_playerID = 0;

//
m_timestamp = 0;
m_referenceCount = 1; // start this off as 1. This means that an "attach" is implied by creating a NetCommandMsg object.
m_commandType = NETCOMMANDTYPE_UNKNOWN;
Expand Down Expand Up @@ -90,11 +87,8 @@ Int NetCommandMsg::getSortNumber() {
* Constructor with no argument, sets everything to default values.
*/
NetGameCommandMsg::NetGameCommandMsg() : NetCommandMsg() {
//Added By Sadullah Nader
//Initializations inserted
m_argSize = 0;
m_numArgs = 0;
//

m_type = (GameMessage::Type)0;
m_commandType = NETCOMMANDTYPE_GAMECOMMAND;
Expand Down Expand Up @@ -714,10 +708,7 @@ UnicodeString NetDisconnectChatCommandMsg::getText() {
NetChatCommandMsg::NetChatCommandMsg() : NetCommandMsg()
{
m_commandType = NETCOMMANDTYPE_CHAT;
//added by Sadullah Nader
//Initializations inserted
m_playerMask = 0;
//
}

/**
Expand Down
5 changes: 0 additions & 5 deletions Core/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@

NetCommandWrapperListNode::NetCommandWrapperListNode(NetWrapperCommandMsg *msg)
{
//Added By Sadullah Nader
//Initializations inserted
m_next = NULL;

//

m_numChunks = msg->getNumChunks();
m_chunksPresent = NEW Bool[m_numChunks]; // pool[]ify
m_numChunksPresent = 0;
Expand Down
3 changes: 0 additions & 3 deletions Core/GameEngine/Source/GameNetwork/Network.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,11 @@ NetworkInterface *NetworkInterface::createNetwork()
*/
Network::Network()
{
//Added By Sadullah Nader
//Initializations inserted
m_checkCRCsThisFrame = FALSE;
m_didSelfSlug = FALSE;
m_frameDataReady = FALSE;
m_isStalling = FALSE;
m_sawCRCMismatch = FALSE;
//

m_conMgr = NULL;
m_messageWindow = NULL;
Expand Down
3 changes: 0 additions & 3 deletions Generals/Code/GameEngine/Include/Common/Geometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,8 @@ class GeometryInfo : public Snapshot

GeometryInfo(GeometryType type, Bool isSmall, Real height, Real majorRadius, Real minorRadius)
{
// Added by Sadullah Nader
// Initializations missing and needed
m_boundingCircleRadius = 0.0f;
m_boundingSphereRadius = 0.0f;
//

set(type, isSmall, height, majorRadius, minorRadius);
}
Expand Down
3 changes: 0 additions & 3 deletions Generals/Code/GameEngine/Include/Common/INI.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,8 @@ class MultiIniFieldParse
public:
MultiIniFieldParse() : m_count(0)
{
//Added By Sadullah Nader
//Initializations missing and needed
for(Int i = 0; i < MAX_MULTI_FIELDS; i++)
m_extraOffset[i] = 0;
//

}

Expand Down
3 changes: 0 additions & 3 deletions Generals/Code/GameEngine/Include/GameClient/ControlBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,6 @@ class SideSelectWindowData
public:
SideSelectWindowData(void)
{
//Added By Sadullah Nader
//Initializations
generalSpeak = NULL;
m_currColor = 0;
m_gereralsNameWin = NULL;
Expand All @@ -459,7 +457,6 @@ class SideSelectWindowData
m_upgradeLabel3Win = NULL;
m_upgradeLabel4Win = NULL;
sideWindow = NULL;
//
}
~SideSelectWindowData(void);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ class SelectionTranslator : public GameMessageTranslator
~SelectionTranslator();
virtual GameMessageDisposition translateGameMessage(const GameMessage *msg);

//Added By Sadullah Nader
//added for fix to the drag selection when entering control bar
//changes the mode of drag selecting to it's opposite
void setDragSelecting(Bool dragSelect);
Expand Down
3 changes: 0 additions & 3 deletions Generals/Code/GameEngine/Include/GameClient/View.h
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,8 @@ class ViewLocation
ViewLocation()
{
m_valid = FALSE;
//Added By Sadullah Nader
//Initialization(s) inserted
m_pos.zero();
m_angle = m_pitch = m_zoom = 0.0;
//
}

const Coord3D& getPosition() const { return m_pos; }
Expand Down
2 changes: 0 additions & 2 deletions Generals/Code/GameEngine/Include/GameLogic/AIGuard.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ class ExitConditions : public AttackExitConditionsInterface

ExitConditions() : m_attackGiveUpFrame(0), m_conditionsToConsider(0), m_radiusSqr(0.0f)
{
//Added By Sadullah Nader
// Initializations missing and needed
m_center.zero();
}

Expand Down
3 changes: 0 additions & 3 deletions Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,8 @@ class TeamInQueue : public MemoryPoolObject,
m_reinforcement(false),
m_stopQueueing(false),
m_reinforcementID(INVALID_ID),
//Added By Sadullah Nader
//Initialization(s) inserted
m_frameStarted(0),
m_priorityBuild(FALSE)
//
{
}

Expand Down
2 changes: 0 additions & 2 deletions Generals/Code/GameEngine/Include/GameLogic/GameLogic.h
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,6 @@ class GameLogic : public SubsystemInterface, public Snapshot
Bool m_shouldValidateCRCs; ///< Should we validate CRCs this frame?
//-----------------------------------------------------------------------------------------------

//Added By Sadullah Nader
//Used to for load scene
Bool m_loadingScene;

Bool m_isInUpdate;
Expand Down
Loading
Loading