diff --git a/doc/tutorial/15_gui.cpp b/doc/tutorial/15_gui.cpp index 91e2b8f4..9d11bd05 100644 --- a/doc/tutorial/15_gui.cpp +++ b/doc/tutorial/15_gui.cpp @@ -42,7 +42,7 @@ public: WorldEntity::tick_game(seconds); static float f; - static vec3 clear_color; + //static vec3 clear_color; static char buf[512]; ImGuiIO& io = ImGui::GetIO(); ImGui::SetNextWindowFocus(); diff --git a/doc/tutorial/17_net.cpp b/doc/tutorial/17_net.cpp index 1eeebbed..a0c4a16e 100644 --- a/doc/tutorial/17_net.cpp +++ b/doc/tutorial/17_net.cpp @@ -56,7 +56,7 @@ int main(int argc, char **argv) lol::sys::init(argc, argv); lol::Application app("Tutorial 17: HTTP", lol::ivec2(800, 600), 60.0f); - auto p = new demo(); + new demo(); app.Run(); return 0; diff --git a/src/application/egl-app.cpp b/src/application/egl-app.cpp index d987faa5..7ac9059f 100644 --- a/src/application/egl-app.cpp +++ b/src/application/egl-app.cpp @@ -254,8 +254,8 @@ EglApp::EglApp(char const *title, ivec2 res, float fps) : #else (void)title; (void)res; - (void)fps; #endif + (void)fps; } void EglApp::ShowPointer(bool show) diff --git a/src/audio/sample.cpp b/src/audio/sample.cpp index a3f99aa1..3f719cea 100644 --- a/src/audio/sample.cpp +++ b/src/audio/sample.cpp @@ -96,7 +96,8 @@ sample::sample(void const *samples, size_t len) data->m_name = std::string(""); #if defined LOL_USE_SDL_MIXER - data->m_chunk = Mix_QuickLoad_RAW((Uint8 *)samples, (Uint32)len); + // FIXME: this requires that the data is kept around; should we copy it? + data->m_chunk = Mix_QuickLoad_RAW((Uint8 *)const_cast(samples), (Uint32)len); data->m_channel = -1; #endif } diff --git a/src/lolua/baselua.h b/src/lolua/baselua.h index cfc8b7b9..656198d7 100644 --- a/src/lolua/baselua.h +++ b/src/lolua/baselua.h @@ -19,6 +19,7 @@ extern "C" { #include "3rdparty/lua/lauxlib.h" } +#include // lol::msg #include // assert #include // std::vector #include // std::string diff --git a/tools/vimlol/vimlol.vim b/tools/vimlol/vimlol.vim index 9c0f237a..8b131cc5 100644 --- a/tools/vimlol/vimlol.vim +++ b/tools/vimlol/vimlol.vim @@ -51,10 +51,6 @@ au Syntax cpp \ syn match cOperator \ "\" -" Global keywords -au Syntax cpp - \ syn keyword cConstant - """ """ LolFx language handler