CSSZombieEscape/demboyz
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed demdata struct array to use std array

Browse Source
This commit is contained in:
Jordan Cristiano 2015-10-15 01:06:51 -04:00
parent e3ccd21314
commit 3b11809be7
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demboyz/demmessages/demhandlers.cpp
View File

@ -2,7 +2,16 @@
#include "demhandlers.h" #include "demhandlers.h"
#include "demmessages.h" #include "demmessages.h"
void DemHandlers::CreateDemMsgStructs(void* demDataStructs[9]) #include "dem_unknown.h"
#include "dem_packet.h"
#include "dem_synctick.h"
#include "dem_consolecmd.h"
#include "dem_usercmd.h"
#include "dem_datatables.h"
#include "dem_stop.h"
#include "dem_stringtables.h"
void DemHandlers::CreateDemMsgStructs(DemDataStructArray& demDataStructs)
{ {
demDataStructs[0] = new DemMsg::Dem_Unknown(); demDataStructs[0] = new DemMsg::Dem_Unknown();
demDataStructs[1] = new DemMsg::Dem_Packet(); demDataStructs[1] = new DemMsg::Dem_Packet();
@ -15,7 +24,7 @@ void DemHandlers::CreateDemMsgStructs(void* demDataStructs[9])
demDataStructs[8] = new DemMsg::Dem_StringTables(); demDataStructs[8] = new DemMsg::Dem_StringTables();
} }
void DemHandlers::DestroyDemMsgStructs(void* demDataStructs[9]) void DemHandlers::DestroyDemMsgStructs(DemDataStructArray& demDataStructs)
{ {
delete reinterpret_cast<DemMsg::Dem_Unknown*>(demDataStructs[0]); delete reinterpret_cast<DemMsg::Dem_Unknown*>(demDataStructs[0]);
delete reinterpret_cast<DemMsg::Dem_Packet*>(demDataStructs[1]); delete reinterpret_cast<DemMsg::Dem_Packet*>(demDataStructs[1]);

7
demboyz/demmessages/demhandlers.h
View File

@ -2,6 +2,8 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <array>
#include "demmessages.h"
namespace base namespace base
{ {
@ -49,8 +51,9 @@ namespace DemHandlers
namespace DemHandlers namespace DemHandlers
{ {
void CreateDemMsgStructs(void* demDataStructs[9]); using DemDataStructArray = std::array<void*, dem_lastcmd + 1>;
void DestroyDemMsgStructs(void* demDataStructs[9]); void CreateDemMsgStructs(DemDataStructArray& demDataStructs);
void DestroyDemMsgStructs(DemDataStructArray& demDataStructs);
bool DemMsg_FileRead(uint32_t type, FileRead& demofile, void* data); bool DemMsg_FileRead(uint32_t type, FileRead& demofile, void* data);
bool DemMsg_FileWrite(uint32_t type, FileWrite& demofile, void* data); bool DemMsg_FileWrite(uint32_t type, FileWrite& demofile, void* data);

10
demboyz/demmessages/demmessages.h
View File

@ -1,14 +1,4 @@
#pragma once #pragma once
#include <cstdint>
#include "demofile/demotypes.h" #include "demofile/demotypes.h"
#include "dem_unknown.h"
#include "dem_packet.h"
#include "dem_synctick.h"
#include "dem_consolecmd.h"
#include "dem_usercmd.h"
#include "dem_datatables.h"
#include "dem_stop.h"
#include "dem_stringtables.h"

2
demboyz/io/demreader.cpp
View File

@ -43,7 +43,7 @@ PacketTrailingBits ParsePacket(uint8_t* packet, size_t length,
void DemoReader::ProcessDem(std::FILE* inputFp, IDemoWriter* writer) void DemoReader::ProcessDem(std::FILE* inputFp, IDemoWriter* writer)
{ {
NetHandlers::NetDataStructArray netDataStructs; NetHandlers::NetDataStructArray netDataStructs;
void* demDataStructs[9]; DemHandlers::DemDataStructArray demDataStructs;
NetHandlers::CreateNetMsgStructs(netDataStructs); NetHandlers::CreateNetMsgStructs(netDataStructs);
DemHandlers::CreateDemMsgStructs(demDataStructs); DemHandlers::CreateDemMsgStructs(demDataStructs);

2
demboyz/io/jsonreader.cpp
View File

@ -41,7 +41,7 @@ PacketTrailingBits ParsePacket(base::JsonReaderFile& jsonReader,
void DemoReader::ProcessJson(std::FILE* inputFp, IDemoWriter* writer) void DemoReader::ProcessJson(std::FILE* inputFp, IDemoWriter* writer)
{ {
NetHandlers::NetDataStructArray netDataStructs; NetHandlers::NetDataStructArray netDataStructs;
void* demDataStructs[9]; DemHandlers::DemDataStructArray demDataStructs;
NetHandlers::CreateNetMsgStructs(netDataStructs); NetHandlers::CreateNetMsgStructs(netDataStructs);
DemHandlers::CreateDemMsgStructs(demDataStructs); DemHandlers::CreateDemMsgStructs(demDataStructs);