Skip to content

Commit 06d97b5

Browse files
bobtistabobtista
committed
Fix build: remove override keyword
1 parent ffab2a4 commit 06d97b5

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class NetGameCommandMsg : public NetCommandMsg
8484
void addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg);
8585
void setGameMessageType(GameMessage::Type type);
8686

87-
size_t getPackedByteCount() const override;
87+
size_t getPackedByteCount() const;
8888

8989
protected:
9090
Int m_numArgs;
@@ -112,7 +112,7 @@ class NetAckBothCommandMsg : public NetCommandMsg
112112
void setOriginalPlayerID(UnsignedByte originalPlayerID);
113113
virtual Int getSortNumber();
114114

115-
size_t getPackedByteCount() const override;
115+
size_t getPackedByteCount() const;
116116

117117
protected:
118118
UnsignedShort m_commandID;
@@ -138,7 +138,7 @@ class NetAckStage1CommandMsg : public NetCommandMsg
138138
void setOriginalPlayerID(UnsignedByte originalPlayerID);
139139
virtual Int getSortNumber();
140140

141-
size_t getPackedByteCount() const override;
141+
size_t getPackedByteCount() const;
142142

143143
protected:
144144
UnsignedShort m_commandID;
@@ -164,7 +164,7 @@ class NetAckStage2CommandMsg : public NetCommandMsg
164164
void setOriginalPlayerID(UnsignedByte originalPlayerID);
165165
virtual Int getSortNumber();
166166

167-
size_t getPackedByteCount() const override;
167+
size_t getPackedByteCount() const;
168168

169169
protected:
170170
UnsignedShort m_commandID;
@@ -182,7 +182,7 @@ class NetFrameCommandMsg : public NetCommandMsg
182182
void setCommandCount(UnsignedShort commandCount);
183183
UnsignedShort getCommandCount();
184184

185-
size_t getPackedByteCount() const override;
185+
size_t getPackedByteCount() const;
186186

187187
protected:
188188
UnsignedShort m_commandCount;
@@ -199,7 +199,7 @@ class NetPlayerLeaveCommandMsg : public NetCommandMsg
199199
UnsignedByte getLeavingPlayerID();
200200
void setLeavingPlayerID(UnsignedByte id);
201201

202-
size_t getPackedByteCount() const override;
202+
size_t getPackedByteCount() const;
203203

204204
protected:
205205
UnsignedByte m_leavingPlayerID;
@@ -218,7 +218,7 @@ class NetRunAheadMetricsCommandMsg : public NetCommandMsg
218218
Int getAverageFps();
219219
void setAverageFps(Int fps);
220220

221-
size_t getPackedByteCount() const override;
221+
size_t getPackedByteCount() const;
222222

223223
protected:
224224
Real m_averageLatency;
@@ -239,7 +239,7 @@ class NetRunAheadCommandMsg : public NetCommandMsg
239239
UnsignedByte getFrameRate();
240240
void setFrameRate(UnsignedByte frameRate);
241241

242-
size_t getPackedByteCount() const override;
242+
size_t getPackedByteCount() const;
243243

244244
protected:
245245
UnsignedShort m_runAhead;
@@ -257,7 +257,7 @@ class NetDestroyPlayerCommandMsg : public NetCommandMsg
257257
UnsignedInt getPlayerIndex();
258258
void setPlayerIndex(UnsignedInt playerIndex);
259259

260-
size_t getPackedByteCount() const override;
260+
size_t getPackedByteCount() const;
261261

262262
protected:
263263
UnsignedInt m_playerIndex;
@@ -271,7 +271,7 @@ class NetKeepAliveCommandMsg : public NetCommandMsg
271271
NetKeepAliveCommandMsg();
272272
//virtual ~NetKeepAliveCommandMsg();
273273

274-
size_t getPackedByteCount() const override;
274+
size_t getPackedByteCount() const;
275275
};
276276

277277
//-----------------------------------------------------------------------------
@@ -282,7 +282,7 @@ class NetDisconnectKeepAliveCommandMsg : public NetCommandMsg
282282
NetDisconnectKeepAliveCommandMsg();
283283
//virtual ~NetDisconnectKeepAliveCommandMsg();
284284

285-
size_t getPackedByteCount() const override;
285+
size_t getPackedByteCount() const;
286286
};
287287

288288
//-----------------------------------------------------------------------------
@@ -299,7 +299,7 @@ class NetDisconnectPlayerCommandMsg : public NetCommandMsg
299299
UnsignedInt getDisconnectFrame();
300300
void setDisconnectFrame(UnsignedInt frame);
301301

302-
size_t getPackedByteCount() const override;
302+
size_t getPackedByteCount() const;
303303

304304
protected:
305305
UnsignedByte m_disconnectSlot;
@@ -314,7 +314,7 @@ class NetPacketRouterQueryCommandMsg : public NetCommandMsg
314314
NetPacketRouterQueryCommandMsg();
315315
//virtual ~NetPacketRouterQueryCommandMsg();
316316

317-
size_t getPackedByteCount() const override;
317+
size_t getPackedByteCount() const;
318318
};
319319

320320
//-----------------------------------------------------------------------------
@@ -325,7 +325,7 @@ class NetPacketRouterAckCommandMsg : public NetCommandMsg
325325
NetPacketRouterAckCommandMsg();
326326
//virtual ~NetPacketRouterAckCommandMsg();
327327

328-
size_t getPackedByteCount() const override;
328+
size_t getPackedByteCount() const;
329329
};
330330

331331
//-----------------------------------------------------------------------------
@@ -339,7 +339,7 @@ class NetDisconnectChatCommandMsg : public NetCommandMsg
339339
UnicodeString getText();
340340
void setText(UnicodeString text);
341341

342-
size_t getPackedByteCount() const override;
342+
size_t getPackedByteCount() const;
343343

344344
protected:
345345
UnicodeString m_text;
@@ -359,7 +359,7 @@ class NetChatCommandMsg : public NetCommandMsg
359359
Int getPlayerMask( void );
360360
void setPlayerMask( Int playerMask );
361361

362-
size_t getPackedByteCount() const override;
362+
size_t getPackedByteCount() const;
363363

364364
protected:
365365
UnicodeString m_text;
@@ -380,7 +380,7 @@ class NetDisconnectVoteCommandMsg : public NetCommandMsg
380380
UnsignedInt getVoteFrame();
381381
void setVoteFrame(UnsignedInt voteFrame);
382382

383-
size_t getPackedByteCount() const override;
383+
size_t getPackedByteCount() const;
384384

385385
protected:
386386
UnsignedByte m_slot;
@@ -398,7 +398,7 @@ class NetProgressCommandMsg: public NetCommandMsg
398398
UnsignedByte getPercentage();
399399
void setPercentage( UnsignedByte percent );
400400

401-
size_t getPackedByteCount() const override;
401+
size_t getPackedByteCount() const;
402402
protected:
403403
UnsignedByte m_percent;
404404
};
@@ -414,7 +414,7 @@ class NetWrapperCommandMsg : public NetCommandMsg
414414
UnsignedByte * getData();
415415
void setData(UnsignedByte *data, UnsignedInt dataLength);
416416

417-
size_t getPackedByteCount() const override;
417+
size_t getPackedByteCount() const;
418418

419419
UnsignedInt getChunkNumber();
420420
void setChunkNumber(UnsignedInt chunkNumber);
@@ -463,7 +463,7 @@ class NetFileCommandMsg : public NetCommandMsg
463463
UnsignedByte * getFileData();
464464
void setFileData(UnsignedByte *data, UnsignedInt dataLength);
465465

466-
size_t getPackedByteCount() const override;
466+
size_t getPackedByteCount() const;
467467

468468
protected:
469469
AsciiString m_portableFilename;
@@ -492,7 +492,7 @@ class NetFileAnnounceCommandMsg : public NetCommandMsg
492492
UnsignedByte getPlayerMask(void);
493493
void setPlayerMask(UnsignedByte playerMask);
494494

495-
size_t getPackedByteCount() const override;
495+
size_t getPackedByteCount() const;
496496

497497
protected:
498498
AsciiString m_portableFilename;
@@ -514,7 +514,7 @@ class NetFileProgressCommandMsg : public NetCommandMsg
514514
Int getProgress();
515515
void setProgress(Int val);
516516

517-
size_t getPackedByteCount() const override;
517+
size_t getPackedByteCount() const;
518518

519519
protected:
520520
UnsignedShort m_fileID;
@@ -531,7 +531,7 @@ class NetDisconnectFrameCommandMsg : public NetCommandMsg
531531
UnsignedInt getDisconnectFrame();
532532
void setDisconnectFrame(UnsignedInt disconnectFrame);
533533

534-
size_t getPackedByteCount() const override;
534+
size_t getPackedByteCount() const;
535535

536536
protected:
537537
UnsignedInt m_disconnectFrame;
@@ -547,7 +547,7 @@ class NetDisconnectScreenOffCommandMsg : public NetCommandMsg
547547
UnsignedInt getNewFrame();
548548
void setNewFrame(UnsignedInt newFrame);
549549

550-
size_t getPackedByteCount() const override;
550+
size_t getPackedByteCount() const;
551551

552552
protected:
553553
UnsignedInt m_newFrame;
@@ -563,7 +563,7 @@ class NetFrameResendRequestCommandMsg : public NetCommandMsg
563563
UnsignedInt getFrameToResend();
564564
void setFrameToResend(UnsignedInt frame);
565565

566-
size_t getPackedByteCount() const override;
566+
size_t getPackedByteCount() const;
567567

568568
protected:
569569
UnsignedInt m_frameToResend;

0 commit comments

Comments
 (0)