Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-30 00:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into renderer_refactor

Browse source 
# Conflicts:
#	TR5Main/Renderer/Renderer11DrawEffect.cpp
#	TR5Main/TombEngine.vcxproj.filters
This commit is contained in:
MontyTRC89 2021-11-23 09:28:40 +01:00
commit 21b3cc8151
127 changed files with 6589 additions and 15655 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TR5Main/Scripting/GameFlowScript.cpp
View file

@ -4,7 +4,7 @@
#include "savegame.h"
#include "GameScriptInventoryObject.h"
#include "InventorySlots.h"
#include "Game/newinv2.h"
#include "Game/gui.h"
/***
Scripts that will be run on game startup.
@ -250,7 +250,7 @@ bool GameFlow::DoGameflow()
GameScriptInventoryObject* obj = &level->InventoryObjects[i];
if (obj->slot >= 0 && obj->slot < INVENTORY_TABLE_SIZE)
{
INVOBJ* invObj = &inventry_objects_list[obj->slot];
InventoryObject* invObj = &inventry_objects_list[obj->slot];
invObj->objname = obj->name.c_str();
invObj->scale1 = obj->scale;