Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

That what leper said. Refs 9ff7ec3465, 31d1536e52.

Browse Source 
This was SVN commit r19688.
This commit is contained in:
elexis 2017-05-29 02:56:34 +00:00
parent 7b92b518f3
commit a7c09a500d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/lib/res/graphics/cursor.cpp
View File

@ -68,20 +68,20 @@ public:
WARN_RETURN(ERR::FAIL);
surface = SDL_CreateRGBSurfaceFrom(bgra_img, (int)t.m_Width, (int)t.m_Height, 32, (int)t.m_Width*4, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
if (!surface)
if(!surface)
return ERR::FAIL;
if(scale != 1.0)
{
SDL_Surface* scaled_surface = SDL_CreateRGBSurface(0, surface->w * scale, surface->h * scale, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
if (!scaled_surface)
if(!scaled_surface)
return ERR::FAIL;
if (SDL_BlitScaled(surface, NULL, scaled_surface, NULL))
if(SDL_BlitScaled(surface, NULL, scaled_surface, NULL))
return ERR::FAIL;
SDL_FreeSurface(surface);
surface = scaled_surface;
}
cursor = SDL_CreateColorCursor(surface, hotspotx_, hotspoty_);
if (!cursor)
if(!cursor)
return ERR::FAIL;
return INFO::OK;
@ -240,10 +240,10 @@ static Status Cursor_reload(Cursor* c, const PIVFS& vfs, const VfsPath& name, Ha
const VfsPath pathnameImage = pathname.ChangeExtension(L".png");
// try loading as SDL2 cursor
if (!c->forceGL && c->sdl_cursor.create(vfs, pathnameImage, hotspotx, hotspoty, c->scale) == INFO::OK)
if(!c->forceGL && c->sdl_cursor.create(vfs, pathnameImage, hotspotx, hotspoty, c->scale) == INFO::OK)
c->kind = CK_SDL;
// fall back to GLCursor (system cursor code is disabled or failed)
else if (c->gl_cursor.create(vfs, pathnameImage, hotspotx, hotspoty, c->scale) == INFO::OK)
else if(c->gl_cursor.create(vfs, pathnameImage, hotspotx, hotspoty, c->scale) == INFO::OK)
c->kind = CK_OpenGL;
// everything failed, leave cursor unchanged
else

4
source/network/NetServer.cpp
View File

@ -977,9 +977,7 @@ bool CNetServerWorker::OnAuthenticate(void* context, CFsmEvent* event)
}
else if (observerLateJoin == "buddies")
{
std::size_t pos = username.find(L" (");
CStrW usernameWithoutRating(pos == CStrW::npos ? username : username.substr(0, pos));
CStrW usernameWithoutRating(username.substr(0, username.find(L" (")));
CStr buddies;
CFG_GET_VAL("lobby.buddies", buddies);
std::wstringstream buddiesStream(wstring_from_utf8(buddies));