Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/Makefile.am4
-rw-r--r--src/client/infowidget.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 68c4a78..d4d4d4e 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -7,14 +7,14 @@ else
noinst_LTLIBRARIES = libclient.la
endif
-libclient_la_SOURCES = action.cc buymenu.cc chat.cc client.cc clientext.cc \
+libclient_la_SOURCES = action.cc buymenu.cc chat.cc chatbox.cc chathistory.cc chatwindow.cc client.cc clientext.cc \
entitymenu.cc hud.cc infowidget.cc input.cc joystick.cc key.cc keyboard.cc map.cc \
notifications.cc playerview.cc soundext.cc targeticonbutton.cc targets.cc trademenu.cc \
video.cc worldview.cc
libclient_la_CFLAGS = $(LIBSDL_CFLAGS) $(GL_CFLAGS)
libclient_la_LDFLAGS = -avoid-version -no-undefined $(GL_LIBS) $(LIBSDL_LIBS)
-noinst_HEADERS = action.h chat.h client.h clientext.h hud.h entitymenu.h \
+noinst_HEADERS = action.h chat.h chatbox.h chathistory.h chatwindow.h client.h clientext.h hud.h entitymenu.h \
input.h joystick.h key.h keyboard.h map.h notifications.h soundext.h \
targets.h video.h infowidget.h playerview.h worldview.h trademenu.h buymenu.h \
targeticonbutton.h
diff --git a/src/client/infowidget.cc b/src/client/infowidget.cc
index da4103f..cf7c684 100644
--- a/src/client/infowidget.cc
+++ b/src/client/infowidget.cc
@@ -106,7 +106,7 @@ void StatsInfoWidget::draw()
float fps = 0.0f;
float t = (core::application()->time() - min_time);
if (t > 0) {
- fps = roundf(((float) fps_counter_size - 1.0f) / t);
+ fps = roundf(((float) fps_counter_size ) / t);
}
std::stringstream textstream;