zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed some Linux issues with recent changes.

This commit is contained in:
Christoph Oelckers 2014-05-14 14:08:14 +02:00
parent 802a478766
commit 2944e4f6ae
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sdl/i_main.cpp
View File

@ -172,11 +172,7 @@ static int DoomSpecificInfo (char *buffer, char *end)
} }
else else
{ {
char name[9]; p += snprintf (buffer+p, size-p, "\n\nCurrent map: %s", level.MapName);
strncpy (name, level.mapname, 8);
name[8] = 0;
p += snprintf (buffer+p, size-p, "\n\nCurrent map: %s", name);
if (!viewactive) if (!viewactive)
{ {

2
src/textures/texturemanager.cpp
View File

@ -233,7 +233,7 @@ FTextureID FTextureManager::CheckForTexture (const char *name, int usetype, BITF
{ {
FTexture *const NO_TEXTURE = (FTexture*)-1; FTexture *const NO_TEXTURE = (FTexture*)-1;
int lump = Wads.CheckNumForFullName(name); int lump = Wads.CheckNumForFullName(name);
if (lump != NULL) if (lump >= 0)
{ {
FTexture *tex = Wads.GetLinkedTexture(lump); FTexture *tex = Wads.GetLinkedTexture(lump);
if (tex == NO_TEXTURE) return FTextureID(-1); if (tex == NO_TEXTURE) return FTextureID(-1);

2
src/wi_stuff.cpp
View File

@ -314,7 +314,7 @@ static bool IsExMy(const char * name)
void WI_LoadBackground(bool isenterpic) void WI_LoadBackground(bool isenterpic)
{ {
const char *lumpname; const char *lumpname = NULL;
char buffer[10]; char buffer[10];
in_anim_t an; in_anim_t an;
lnode_t pt; lnode_t pt;