ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'thamlett-master'

Browse Source
This commit is contained in:
hiker 2014-12-03 08:19:35 +11:00
commit dd45bc7f1b
7 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
View File

@ -1581,6 +1581,20 @@ void CIrrDeviceWin32::getWindowsVersion(core::stringc& out)
else
out.append("Microsoft Windows Server 2008 R2 ");
}
else if (osvi.dwMinorVersion == 2)
{
if (osvi.wProductType == VER_NT_WORKSTATION)
out.append("Microsoft Windows 8 ");
else
out.append("Microsoft Windows Server 2012 ");
}
else if (osvi.dwMinorVersion == 3)
{
if (osvi.wProductType == VER_NT_WORKSTATION)
out.append("Microsoft Windows 8.1 ");
else
out.append("Microsoft Windows Server 2012 R2 ");
}
}
if (bOsVersionInfoEx)

2
lib/irrlicht/source/Irrlicht/zlib/gzlib.c
View File

@ -236,7 +236,7 @@ local gzFile gz_open(path, fd, mode)
#ifdef _WIN32
fd == -2 ? _wopen(path, oflag, 0666) :
#endif
open(path, oflag, 0666));
_open(path, oflag, 0666));
if (state->fd == -1) {
free(state->path);
free(state);

4
lib/irrlicht/source/Irrlicht/zlib/gzread.c
View File

@ -27,7 +27,7 @@ local int gz_load(state, buf, len, have)
*have = 0;
do {
ret = read(state->fd, buf + *have, len - *have);
ret = _read(state->fd, buf + *have, len - *have);
if (ret <= 0)
break;
*have += ret;
@ -583,7 +583,7 @@ int ZEXPORT gzclose_r(file)
err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
gz_error(state, Z_OK, NULL);
free(state->path);
ret = close(state->fd);
ret = _close(state->fd);
free(state);
return ret ? Z_ERRNO : err;
}

6
lib/irrlicht/source/Irrlicht/zlib/gzwrite.c
View File

@ -81,7 +81,7 @@ local int gz_comp(state, flush)
/* write directly if requested */
if (state->direct) {
got = write(state->fd, strm->next_in, strm->avail_in);
got = _write(state->fd, strm->next_in, strm->avail_in);
if (got < 0 || (unsigned)got != strm->avail_in) {
gz_error(state, Z_ERRNO, zstrerror());
return -1;
@ -98,7 +98,7 @@ local int gz_comp(state, flush)
if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
(flush != Z_FINISH || ret == Z_STREAM_END))) {
have = (unsigned)(strm->next_out - state->x.next);
if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
if (have && ((got = _write(state->fd, state->x.next, have)) < 0 ||
(unsigned)got != have)) {
gz_error(state, Z_ERRNO, zstrerror());
return -1;
@ -558,7 +558,7 @@ int ZEXPORT gzclose_w(file)
}
gz_error(state, Z_OK, NULL);
free(state->path);
if (close(state->fd) == -1)
if (_close(state->fd) == -1)
ret = Z_ERRNO;
free(state);
return ret;

1
src/config/hardware_stats.cpp
View File

@ -235,6 +235,7 @@ void determineOSVersion()
case 0x0600: m_os_version="Windows Vista"; break;
case 0x0601: m_os_version="Windows 7"; break;
case 0x0602: m_os_version="Windows 8"; break;
case 0x0603: m_os_version="Windows 8_1"; break;
default: {
m_os_version = StringUtils::insertValues("Windows %d",
windows_version);

2
src/guiengine/widgets/player_kart_widget.cpp
View File

@ -212,7 +212,7 @@ PlayerKartWidget::PlayerKartWidget(KartSelectionScreen* parent,
m_model_view->setRotateContinuously( 35.0f );
// ---- Kart name label
m_kart_name = new LabelWidget(true, true);
m_kart_name = new LabelWidget(false, true);
m_kart_name->setText(props->getName(), false);
m_kart_name->m_properties[PROP_TEXT_ALIGN] = "center";
m_kart_name->m_properties[PROP_ID] =

6
src/states_screens/kart_selection.cpp
View File

@ -854,8 +854,7 @@ void KartSelectionScreen::updateKartWidgetModel(uint8_t widget_id,
else
{
m_kart_widgets[widget_id].m_kart_name
->setText(_("Locked : solve active challenges to gain "
"access to more!"), false );
->setText(_("Locked : solve active challenges to gain access to more!"), false );
}
}
else
@ -1446,8 +1445,7 @@ void KartSelectionScreen::setKartsFromCurrentGroup()
const KartProperties* prop = karts.get(i);
if (PlayerManager::getCurrentPlayer()->isLocked(prop->getIdent()))
{
w->addItem(_("Locked : solve active challenges to gain access "
"to more!"),
w->addItem(_("Locked : solve active challenges to gain access to more!"),
ID_LOCKED + prop->getIdent(),
prop->getAbsoluteIconFile(), LOCKED_BADGE,
IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);