Skip to content

Commit 1d64feb

Browse files
committed
- 60hz fixes for nuke cannon and nuke missile
- Latest tweaks from test branch
1 parent 2612d13 commit 1d64feb

17 files changed

Lines changed: 8912 additions & 8184 deletions

File tree

GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h

Lines changed: 998 additions & 985 deletions
Large diffs are not rendered by default.

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ class DeployStyleAIUpdate : public AIUpdateInterface
109109
UnsignedInt getUnpackTime() const { return getDeployStyleAIUpdateModuleData()->m_unpackTime/ GENERALS_ONLINE_HIGH_FPS_FRAME_MULTIPLIER; }
110110
UnsignedInt getPackTime() const { return getDeployStyleAIUpdateModuleData()->m_packTime/ GENERALS_ONLINE_HIGH_FPS_FRAME_MULTIPLIER; }
111111
#else
112-
UnsignedInt getUnpackTime() const { return getDeployStyleAIUpdateModuleData()->m_unpackTime / GENERALS_ONLINE_HIGH_FPS_FRAME_MULTIPLIER; }
113-
UnsignedInt getPackTime() const { return getDeployStyleAIUpdateModuleData()->m_packTime / GENERALS_ONLINE_HIGH_FPS_FRAME_MULTIPLIER; }
112+
UnsignedInt getUnpackTime() const { return getDeployStyleAIUpdateModuleData()->m_unpackTime; }
113+
UnsignedInt getPackTime() const { return getDeployStyleAIUpdateModuleData()->m_packTime; }
114114
#endif
115115
Bool doTurretsFunctionOnlyWhenDeployed() const { return getDeployStyleAIUpdateModuleData()->m_turretsFunctionOnlyWhenDeployed; }
116116
Bool doTurretsHaveToCenterBeforePacking() const { return getDeployStyleAIUpdateModuleData()->m_turretsMustCenterBeforePacking; }

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NetworkMesh.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ class NetworkMesh
109109
}
110110
}
111111

112+
void Flush();
113+
112114
void UpdateConnectivity(PlayerConnection* connection);
113115

114116
std::function<void(int64_t, std::string, PlayerConnection*)> m_cbOnConnected = nullptr;

GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static const Int MAX_PACKET_SIZE = 476;
6666
* to each player every frame
6767
*/
6868
#define MAX_MESSAGE_LEN 1024
69-
#define MAX_MESSAGES 128
69+
#define MAX_MESSAGES 1024
7070
static const Int numCommandsPerCommandPacket = (MAX_MESSAGE_LEN - sizeof(UnsignedInt) - sizeof(UnsignedShort))/sizeof(GameMessage);
7171
#pragma pack(push, 1)
7272
struct CommandPacket

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,13 +1529,21 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
15291529
if (connState == EConnectionState::CONNECTED_DIRECT || connState == EConnectionState::CONNECTION_DISCONNECTED)
15301530
{
15311531
strConnectionMessage.format(L"Connection state to %hs changed to: %hs (mechanism: %hs | protocol: %hs)", strDisplayName.c_str(), strState.c_str(), strConnectionType.c_str(), connection->IsIPV4() ? "IPv4" : "IPv6");
1532+
GadgetListBoxAddEntryText(listboxGameSetupChat, strConnectionMessage, GameMakeColor(255, 194, 15, 255), -1, -1);
15321533
}
15331534
else
15341535
{
1535-
strConnectionMessage.format(L"Connection state to %hs changed to: %hs", strDisplayName.c_str(), strState.c_str());
1536+
#if !defined(_DEBUG)
1537+
if (connState == EConnectionState::CONNECTION_FAILED)
1538+
{
1539+
#endif
1540+
strConnectionMessage.format(L"Connection state to %hs changed to: %hs", strDisplayName.c_str(), strState.c_str());
1541+
GadgetListBoxAddEntryText(listboxGameSetupChat, strConnectionMessage, GameMakeColor(255, 194, 15, 255), -1, -1);
1542+
1543+
#if !defined(_DEBUG)
1544+
}
1545+
#endif
15361546
}
1537-
1538-
GadgetListBoxAddEntryText(listboxGameSetupChat, strConnectionMessage, GameMakeColor(255, 194, 15, 255), -1, -1);
15391547
});
15401548

15411549
// player doesnt have map events

0 commit comments

Comments
 (0)