To continue the Doom experience, play the Shores of Hell and its amazing sequel, Inferno!
https://forum.zdoom.org/
binarycrusader wrote: If you'd rather I use Fstring, that's fine, I was just taking a more incremental approach that would make it easier to migrate to something better later.
I realise that, I was just trying to do things incrementally. I'm aware of the pain of having to find all the places where it is used and adjust them as well. I've spent many hours discovering those rules the hard way.Graf Zahl wrote:binarycrusader wrote: If you'd rather I use Fstring, that's fine, I was just taking a more incremental approach that would make it easier to migrate to something better later.
I'm still not convinced that it would have helped in the end. The only way to change some buffer's size is to find all places in the code where it is used and adjust them. Changing how these are accessed doesn't make it any easier or any safer.
Sure, not a problem. The close linking of the gzdoom / zdoom repositories just made things a little confusing at firstGraf Zahl wrote:Nevertheless, if you want to work on this I won't complain. Just do us all one favor: Please don't do this on a GZDoom clone. I'd have to merge it back manually in the end. Better work on a direct clone of the ZDoom repo. In that case I could merge it in directly.
Code: Select all
/home/edward-san/zdoom/trunk/src/sdl/i_main.cpp:177:24: error: no member named 'mapname' in 'FLevelLocals'
strncpy (name, level.mapname, 8);
~~~~~ ^
1 error generated.
make[2]: *** [src/CMakeFiles/zdoom.dir/sdl/i_main.o] Error 1
/home/edward-san/zdoom/trunk/src/g_mapinfo.cpp:305:60: error: cannot pass non-trivial object of type 'FString' to variadic function; expected type from format string was 'char *' [-Wnon-pod-varargs]
mysnprintf (checkstring, countof(checkstring), "%s: ", MapName);
~~ ^~~~~~~
1 error generated.
Code: Select all
/home/edward-san/zdoom/trunk/src/wi_stuff.cpp:329:7: warning: variable 'lumpname' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
if (li != NULL) lumpname = li->EnterPic;
^~~~~~~~~~
/home/edward-san/zdoom/trunk/src/wi_stuff.cpp:337:6: note: uninitialized use occurs here
if (lumpname == NULL || lumpname[0]==0)
^~~~~~~~
/home/edward-san/zdoom/trunk/src/wi_stuff.cpp:329:3: note: remove the 'if' if its condition is always true
if (li != NULL) lumpname = li->EnterPic;
^~~~~~~~~~~~~~~~
/home/edward-san/zdoom/trunk/src/wi_stuff.cpp:317:22: note: initialize the variable 'lumpname' to silence this warning
const char *lumpname;
^
= NULL
1 warning generated.
/home/edward-san/zdoom/trunk/src/textures/texturemanager.cpp:236:13: warning: comparison between NULL and non-pointer ('int' and NULL) [-Wnull-arithmetic]
if (lump != NULL)
~~~~ ^ ~~~~
1 warning generated.
Code: Select all
/home/edward-san/zdoom/trunk/src/sdl/i_main.cpp:175:65: error: cannot pass
non-trivial object of type 'FString' to variadic function; expected type
from format string was 'char *' [-Wnon-pod-varargs]
...p += snprintf (buffer+p, size-p, "\n\nCurrent map: %s", level.MapName);
~~ ^~~~~~~
1 error generated.
/home/edward-san/zdoom/trunk/src/g_mapinfo.cpp:305:60: error: cannot pass
non-trivial object of type 'FString' to variadic function; expected type
from format string was 'char *' [-Wnon-pod-varargs]
...mysnprintf (checkstring, countof(checkstring), "%s: ", MapName);
~~ ^~~~~~~
1 error generated.
make[2]: *** [src/CMakeFiles/zdoom.dir/g_mapinfo.o] Error 1
Let's see what the rest of the thread has already said.MG_Man wrote:Is this going to apply for sprites as well? I realize the last letter and number is extremely important, but perhaps the part before that could be extended?
Gez wrote:Sprites are really tied to their 4444-1-1-[1-1] convention, there's no way around it.
Graf Zahl wrote:Sorry, but the sprite stuff is too rigidly tied to the naming scheme. Changing it may cause unforeseen problems.
That's probably a no, then.Graf Zahl wrote:For sprites, sorry, no. The sprite naming system is so hardwired to the naming scheme that I wouldn't like to change that.
Code: Select all
sidedef
{
sector = 9;
texturemiddle = "MANOR_WALL_COLDSTONE_ARCH";
}
sidedef
{
sector = 1;
texturemiddle = "MANOR_WALL_BOOKSHELF";
}
Code: Select all
texture manor_wall_coldstone_arch, 512, 512
{
XScale 4
YScale 4
Patch "patches/p_manor_wall_coldstone_arch.png", 0, 0
}
texture manor_wall_bookshelf, 512, 512
{
XScale 4
YScale 4
Patch pmwbkshf, 0, 0
}
Can you clarify as to how this was intended to work? Or was this the part that I still needed to make changes for? The truncation is confusing as the udmf specification explicitly states that "Strings have no reasonable length limitations".Texture entries here are necessary to scale textures to non-1:1 sizes,
so that for example a 512x512 can be drawn on a 128x128 wall and appear at
the correct scale.
Textures defined in [wiki]TEXTURES[/wiki] are not lump. The TEXTURES lump still can only define textures with an 8-char name. Texture manager and lump manager are two different things.binarycrusader wrote:Perhaps I'm confused by how this is supposed to work, but while this did fix texture definitions, it doesn't quite seem to be enough yet.Code: Select all
texture manor_wall_coldstone_arch, 512, 512 { XScale 4 YScale 4 Patch "patches/p_manor_wall_coldstone_arch.png", 0, 0 } texture manor_wall_bookshelf, 512, 512 { XScale 4 YScale 4 Patch pmwbkshf, 0, 0 }
Graf Zahl wrote:You can't create long names with TEXTURES.
Ah, but you would accept patches to remove this limitation for UDMF maps, as long as it doesn't break older doom maps, mods, etc. correct?Graf Zahl wrote: Textures defined in [wiki]TEXTURES[/wiki] are not lump. The TEXTURES lump still can only define textures with an 8-char name. Texture manager and lump manager are two different things.
Graf Zahl wrote:You can't create long names with TEXTURES.