diff --git a/source/build/src/defs.cpp b/source/build/src/defs.cpp index f8a6b195c..0ce87e508 100644 --- a/source/build/src/defs.cpp +++ b/source/build/src/defs.cpp @@ -361,6 +361,7 @@ static int32_t defsparser(scriptfile *script) { "rffdefineid", T_RFFDEFINEID }, // dummy }; + script->SetNoOctals(true); while (1) { #ifdef USE_DEF_PROGRESS diff --git a/source/core/textures/buildtiles.cpp b/source/core/textures/buildtiles.cpp index 882d0c2dc..95f5751b7 100644 --- a/source/core/textures/buildtiles.cpp +++ b/source/core/textures/buildtiles.cpp @@ -499,7 +499,7 @@ CCMD(tilecrc) int tileImportFromTexture(const char* fn, int tilenum, int alphacut, int istexture) { - FTextureID texid = TexMan.CheckForTexture(fn, ETextureType::Any); + FTextureID texid = TexMan.CheckForTexture(fn, ETextureType::Any, FTextureManager::TEXMAN_ForceLookup); if (!texid.isValid()) return -1; auto tex = TexMan.GetGameTexture(texid); @@ -508,7 +508,7 @@ int tileImportFromTexture(const char* fn, int tilenum, int alphacut, int istextu if (xsiz <= 0 || ysiz <= 0) return -2; - // create a new game texture here - we want to give it a new name! + // create a new game texture here - we want to give it a different name! tex = MakeGameTexture(tex->GetTexture(), FStringf("#%05d", tilenum), ETextureType::Override); TexMan.AddGameTexture(tex); TileFiles.tiledata[tilenum].backup = TileFiles.tiledata[tilenum].texture = tex;