fallout2sfall/int2ssl
0
0
Fork 0
mirror of https://github.com/sfall-team/int2ssl.git synced 2026-07-27 16:52:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

CArchive and CFile are removed

Browse Source
This commit is contained in:
alexeevdv
2015-02-16 00:30:55 +03:00
parent 830fb4f983
commit 447f352779
24 changed files with 285 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Opcode.cpp
+20 -10
View File
@@ -9,6 +9,8 @@
// C++ standard includes
#include <iostream>
#include <fstream>
#include <algorithm>
// int2ssl includes
#include "Opcode.h"
@@ -17,6 +19,7 @@
// Third party includes
extern int g_nFalloutVersion;
extern std::ifstream g_ifstream;
COpcode::COpcode() :
m_wOperator(O_NOOP),
@@ -43,38 +46,45 @@ COpcode& COpcode::operator = (const COpcode& opcode)
return (*this);
}
void COpcode::Serialize(CArchive& ar)
void COpcode::Serialize()
{
if (ReadMSBWord(ar, m_wOperator) != OPERATOR_SIZE)
g_ifstream.read((char*)&m_wOperator, sizeof(m_wOperator));
std::reverse((char*)&m_wOperator, (char*)&m_wOperator + sizeof(m_wOperator));
if (!g_ifstream)
{
printf("Error: Unable read opcode\n");
throw std::exception();
}
if ((m_wOperator < O_OPERATOR) ||
((m_wOperator >= O_END_OP) &&
(m_wOperator != O_STRINGOP) &&
(m_wOperator != O_FLOATOP)&&
(m_wOperator != O_INTOP)))
{
ar.Flush();
printf("Error: Invalid opcode at 0x%08x\n", ar.GetFile()->GetPosition() - 2);
printf("Error: Invalid opcode at 0x%08x\n", (uint32_t)g_ifstream.tellg() - 2);
throw std::exception();
}
if ((m_wOperator == O_STRINGOP) || (m_wOperator == O_FLOATOP) || (m_wOperator == O_INTOP))
{
if (ReadMSBULong(ar, m_ulArgument) != ARGUMENT_SIZE)
g_ifstream.read((char*)&m_ulArgument, sizeof(m_ulArgument));
std::reverse((char*)&m_ulArgument, (char*)&m_ulArgument + sizeof(m_ulArgument));
if (!g_ifstream)
{
printf("Error: Unable read opcode argument\n");
std::cout << "Error: Unable read opcode argument" << std::endl;
throw std::exception();
}
}
}
void COpcode::Expect(CArchive& ar, uint16_t wOperator, bool bArgumentFound, uint32_t ulArgument)
void COpcode::Expect(uint16_t wOperator, bool bArgumentFound, uint32_t ulArgument)
{
Serialize(ar);
Serialize();
if (m_wOperator != wOperator)
{
@@ -92,9 +102,9 @@ void COpcode::Expect(CArchive& ar, uint16_t wOperator, bool bArgumentFound, uint
}
}
void COpcode::Expect(CArchive& ar, int nCount, uint16_t pwOperators[])
void COpcode::Expect(int nCount, uint16_t pwOperators[])
{
Serialize(ar);
Serialize();
bool bFound = false;
for(int i = 0; i < nCount; i++)