edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/oy/teeworlds

Browse source
This commit is contained in:
GreYFoXGTi 2010-11-14 03:25:39 +02:00
parent 209078c85e 0cfcb1c0c2
commit d7aced0708
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/client/graphics.cpp
View file

@ -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;
}

4
src/engine/shared/demo.h
View file

@ -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"

15
src/engine/shared/storage.cpp
View file

@ -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)