diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/client/chat.cc | 4 | ||||
| -rw-r--r-- | src/client/chat.h | 4 | ||||
| -rw-r--r-- | src/client/client.cc | 4 | ||||
| -rw-r--r-- | src/client/view.cc | 4 | ||||
| -rw-r--r-- | src/game/example/Makefile.am | 3 |
6 files changed, 10 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 37f8dc9..664b1fb 100644 --- a/configure.in +++ b/configure.in @@ -198,7 +198,7 @@ else AC_DEFINE(HAVE_LIBPNG, 1, [Define this if you have libpng]), AC_MSG_ERROR([libpng include file png.h not found]) ) - LIBPNG_LIBS="-lpng" + LIBPNG_LIBS="-lpng12" AC_SUBST(LIBPNG_LIBS) AC_CHECK_HEADER(jpeglib.h, diff --git a/src/client/chat.cc b/src/client/chat.cc index dc66a1b..f123bbc 100644 --- a/src/client/chat.cc +++ b/src/client/chat.cc @@ -43,9 +43,9 @@ Chat::~Chat() history.clear(); } -void Chat::set_small(bool small) +void Chat::set_small_view(bool small_chat_view) { - chat_small = small; + chat_small = small_chat_view; } void Chat::event_text(const std::string & text) diff --git a/src/client/chat.h b/src/client/chat.h index ec8271e..8c52b4e 100644 --- a/src/client/chat.h +++ b/src/client/chat.h @@ -27,9 +27,9 @@ public: void event_text(const std::string & text); - inline bool small() const { return chat_small; } + inline bool small_view() const { return chat_small; } - void set_small(bool small = true); + void set_small_view(bool small_view=true); protected: virtual void event_draw(); diff --git a/src/client/client.cc b/src/client/client.cc index 2400089..667a060 100644 --- a/src/client/client.cc +++ b/src/client/client.cc @@ -51,7 +51,7 @@ void func_r_restart(std::string const &args) void func_ui_chat(std::string const &args) { if (core::application()->connected()) { - client()->view()->chat()->set_small(false); + client()->view()->chat()->set_small_view(false); client()->view()->chat()->toggle(); } } @@ -59,7 +59,7 @@ void func_ui_chat(std::string const &args) void func_ui_chatsmall(std::string const &args) { if (core::application()->connected()) { - client()->view()->chat()->set_small(true); + client()->view()->chat()->set_small_view(true); client()->view()->chat()->toggle(); } } diff --git a/src/client/view.cc b/src/client/view.cc index a2bdfe1..3ee6460 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -230,7 +230,7 @@ void View::resize() void View::draw() { // reposition chat widget - if (!view_chat->small()) { + if (!view_chat->small_view()) { view_chat->set_location(font()->width(), view_devinfo->top() + view_devinfo->height() + font()->height()); view_chat->set_size(width() - font()->width() * 16, height() - view_chat->top() - font()->height() * 8); } else { @@ -246,7 +246,7 @@ void View::draw() if (core::application()->connected() && core::game()->interactive()) { if (ui::console()->visible()) { view_notify->set_visible(false); - } else if (view_chat->visible() && !view_chat->small()) { + } else if (view_chat->visible() && !view_chat->small_view()) { view_notify->set_visible(false); } else { view_notify->set_visible(true); diff --git a/src/game/example/Makefile.am b/src/game/example/Makefile.am index 81fb507..bb285eb 100644 --- a/src/game/example/Makefile.am +++ b/src/game/example/Makefile.am @@ -2,6 +2,5 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/game METASOURCES = AUTO libexample_la_LDFLAGS = -avoid-version noinst_LTLIBRARIES = libexample.la -noinst_HEADERS = example.h +noinst_HEADERS = example.h spectator.h libexample_la_SOURCES = example.cc spectator.cc -_SOURCES = spectator.h |