TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0_DevHead' into tsneo

Browse source 
# Conflicts:
#	Engine/source/console/consoleInternal.cpp
This commit is contained in:
Jeff Hutchinson 2021-06-18 21:13:49 -04:00
commit acde0c3f0b
17 changed files with 96 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/console/codeBlock.cpp
View file

@ -447,7 +447,7 @@ bool CodeBlock::read(StringTableEntry fileName, Stream &st)
{
U32 ip;
st.read(&ip);
#ifdef TORQUE_CPU_X64
#if defined(TORQUE_CPU_X64) || defined(TORQUE_CPU_ARM64)
*(U64*)(code + ip) = (U64)ste;
#else
code[ip] = *((U32 *)&ste);