q3k
/
extremetuxracer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Set window icon 

Ran AStyle, removed an unused variable

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@692 0420edf4-82e4-42fc-9478-35b55e6d67a3
master
pkeus 2017-01-19 13:25:12 +00:00
parent 6d7ea29fb1
commit bb23733009
11 changed files with 69 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/game_config.cpp
View File

@ -294,7 +294,6 @@ void InitConfig() {
#endif /* 0 */
struct passwd *pwent = getpwuid(getuid());
const char *home;
param.config_dir = pwent->pw_dir;
param.config_dir += SEP;

5
src/winsys.cpp
View File

@ -105,6 +105,11 @@ void CWinsys::SetupVideoMode(const TScreenRes& resolution_) {
window.create(sf::VideoMode(resolution.width, resolution.height, bpp), WINDOW_TITLE, style, ctx);
if (param.framerate)
window.setFramerateLimit(param.framerate);
#ifdef _WIN32
HICON icon = LoadIcon(GetModuleHandle(NULL), (LPCWSTR)IDI_APPLICATION);
SendMessageW(window.getSystemHandle(), WM_SETICON, ICON_BIG, (LPARAM)icon);
SendMessageW(window.getSystemHandle(), WM_SETICON, ICON_SMALL, (LPARAM)icon);
#endif
scale = CalcScreenScale();
if (param.use_quad_scale) scale = std::sqrt(scale);

4
version.rc
View File

@ -22,7 +22,7 @@ BEGIN
VALUE "FileVersion", ETR_VERSION_STRING
VALUE "InternalName", "ExtremeTuxRacer"
VALUE "LegalCopyright", "Copyright (C) 1999-2001 Jasmin F. Patry (Tuxracer)\n"
"Copyright (C) 2010-2016 Extreme Tuxracer Team"
"Copyright (C) 2010-2017 Extreme Tuxracer Team"
VALUE "OriginalFilename", "ExtremeTuxRacer.exe"
VALUE "ProductName", "ExtremeTuxRacer"
VALUE "ProductVersion", ETR_VERSION_STRING
@ -47,4 +47,4 @@ BEGIN
END
END
IDI_ICON1 ICON DISCARDABLE "resources\etracericon.ico"
IDI_APPLICATION ICON DISCARDABLE "resources\etracericon.ico"