zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 09:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compilation.

Browse source 
Much of this commit will have to be undone later, once the texture manager becomes available.
This commit is contained in:
Christoph Oelckers 2020-05-23 15:18:10 +02:00
parent c0217c9152
commit daf77e55f7
9 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/common/scripting/backend/codegen.cpp
View file

@ -2917,6 +2917,7 @@ ExpEmit FxAddSub::Emit(VMFunctionBuilder *build)
texcheck:
// Do a bounds check for the texture index. Note that count can change at run time so this needs to read the value from the texture manager.
#if 0
auto * ptr = (FArray*)&TexMan.Textures;
auto * countptr = &ptr->Count;
ExpEmit bndp(build, REGT_POINTER);
@ -2926,6 +2927,7 @@ texcheck:
build->Emit(OP_BOUND_R, to.RegNum, bndc.RegNum);
bndp.Free(build);
bndc.Free(build);
#endif
return to;
}

2
source/common/scripting/backend/codegen.h
View file

@ -198,7 +198,7 @@ struct ExpVal
const FString GetString() const
{
return Type == TypeString ? *(FString *)&pointer : Type == TypeName ? FString(FName(ENamedName(Int)).GetChars()) : "";
return Type == TypeString ? *(FString *)&pointer : Type == TypeName ? FString(FName(ENamedName(Int)).GetChars()) : FString();
}
bool GetBool() const