Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Extra fixes

Browse Source 
This was SVN commit r4731.
This commit is contained in:
Ykkrosh 2007-01-01 22:56:24 +00:00
parent ebfd7910cf
commit 15e7bae0ba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/graphics/TextureManager.cpp
View File

@ -57,7 +57,7 @@ CTextureEntry* CTextureManager::FindTexture(CStr tag)
return m_TextureEntries[i];
}
LOG(WARNING, LOG_CATEGORY, "TextureManager: Couldn't find terrain %s\n", tag.c_str());
LOG(WARNING, LOG_CATEGORY, "TextureManager: Couldn't find terrain %s", tag.c_str());
return 0;
}
@ -126,7 +126,7 @@ void CTextureManager::LoadTextures(CTerrainPropertiesPtr props, const char* dir)
{
myprops = GetPropertiesFromFile(props, xml_name);
if (myprops)
LOG(NORMAL, LOG_CATEGORY, "CTextureManager: Successfully loaded override xml %s for texture %s\n", xml_name, texture_name);
LOG(NORMAL, LOG_CATEGORY, "CTextureManager: Successfully loaded override xml %s for texture %s", xml_name, texture_name);
}
// Error or non-existant xml file -> use parent props

2
source/lib/tests/test_allocators.h
View File

@ -23,7 +23,7 @@ public:
u8 buf[4];
TS_ASSERT_OK(da_read(&da, buf, 4));
TS_ASSERT_EQUALS(read_le32(buf), 0x78563412); // read correct value
debug_skip_next_err(ERR::IO_EOF);
debug_skip_next_err(ERR::FAIL);
TS_ASSERT(da_read(&da, buf, 1) < 0); // no more data left
TS_ASSERT_OK(da_free(&da));
}