mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 01:24:18 +00:00
Merge branch 'master' of http://github.com/oy/teeworlds
This commit is contained in:
commit
d7aced0708
|
@ -706,7 +706,6 @@ bool CGraphics_OpenGL::Init()
|
|||
};
|
||||
|
||||
m_InvalidTexture = LoadTextureRaw(4,4,CImageInfo::FORMAT_RGBA,aNullTextureData,CImageInfo::FORMAT_RGBA,TEXLOAD_NORESAMPLE);
|
||||
dbg_msg("", "invalid texture id: %d %d", m_InvalidTexture, m_aTextures[m_InvalidTexture].m_Tex);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef ENGINE_SHARED_DEMOREC_H
|
||||
#define ENGINE_SHARED_DEMOREC_H
|
||||
#ifndef ENGINE_SHARED_DEMO_H
|
||||
#define ENGINE_SHARED_DEMO_H
|
||||
|
||||
#include <engine/demo.h>
|
||||
#include "snapshot.h"
|
||||
|
|
|
@ -124,30 +124,35 @@ public:
|
|||
if(m_NumPaths >= MAX_PATHS || !pPath[0])
|
||||
return;
|
||||
|
||||
int OldNum = m_NumPaths;
|
||||
|
||||
if(!str_comp(pPath, "$USERDIR"))
|
||||
{
|
||||
if(m_aUserdir[0])
|
||||
{
|
||||
str_copy(m_aaStoragePaths[m_NumPaths++], m_aUserdir, MAX_PATH_LENGTH);
|
||||
dbg_msg("storage", "added path '$USERDIR' ('%s')", m_aUserdir);
|
||||
}
|
||||
}
|
||||
else if(!str_comp(pPath, "$DATADIR"))
|
||||
{
|
||||
if(m_aDatadir[0])
|
||||
{
|
||||
str_copy(m_aaStoragePaths[m_NumPaths++], m_aDatadir, MAX_PATH_LENGTH);
|
||||
dbg_msg("storage", "added path '$DATADIR' ('%s')", m_aDatadir);
|
||||
}
|
||||
}
|
||||
else if(!str_comp(pPath, "$CURRENTDIR"))
|
||||
{
|
||||
m_aaStoragePaths[m_NumPaths++][0] = 0;
|
||||
dbg_msg("storage", "added path '$CURRENTDIR'");
|
||||
}
|
||||
else
|
||||
{
|
||||
if(fs_is_dir(pPath))
|
||||
{
|
||||
str_copy(m_aaStoragePaths[m_NumPaths++], pPath, MAX_PATH_LENGTH);
|
||||
dbg_msg("storage", "added path '%s'", pPath);
|
||||
}
|
||||
}
|
||||
|
||||
if(OldNum != m_NumPaths)
|
||||
dbg_msg("storage", "added path '%s'", pPath);
|
||||
}
|
||||
|
||||
void FindDatadir(const char *pArgv0)
|
||||
|
|
Loading…
Reference in a new issue