openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix some compile warnings

Browse Source
This commit is contained in:
Celtic Minstrel
2024-08-23 22:22:41 -04:00
parent 29404cdd23
commit 13a62445a3
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/boe.main.cpp
View File

@@ -489,7 +489,7 @@ location terrain_click[8] = {
{120,155}, // northwest {120,155}, // northwest
}; };
void fire_delayed_key(Key code) { static void fire_delayed_key(Key code) {
bool isUpPressed = delayed_keys[Key::Up] > 0; bool isUpPressed = delayed_keys[Key::Up] > 0;
bool isDownPressed = delayed_keys[Key::Down] > 0; bool isDownPressed = delayed_keys[Key::Down] > 0;
bool isLeftPressed = delayed_keys[Key::Left] > 0; bool isLeftPressed = delayed_keys[Key::Left] > 0;
@@ -536,7 +536,7 @@ void fire_delayed_key(Key code) {
} }
} }
void handle_delayed_key(Key code) { static void handle_delayed_key(Key code) {
// a keypress of this code is already delayed, so push it through: // a keypress of this code is already delayed, so push it through:
if(delayed_keys[code] > 0) if(delayed_keys[code] > 0)
fire_delayed_key(code); fire_delayed_key(code);
@@ -544,7 +544,7 @@ void handle_delayed_key(Key code) {
delayed_keys[code] = ARROW_SIMUL_FRAMES; delayed_keys[code] = ARROW_SIMUL_FRAMES;
} }
void update_delayed_keys() { static void update_delayed_keys() {
for(auto elem : delayed_keys){ for(auto elem : delayed_keys){
Key code = elem.first; Key code = elem.first;
int countdown = elem.second; int countdown = elem.second;
@@ -816,7 +816,6 @@ void menu_give_help(short help1){
void handle_menu_choice(eMenu item_hit) { void handle_menu_choice(eMenu item_hit) {
std::string dialogToShow; std::string dialogToShow;
sf::Event dummyEvent = {sf::Event::KeyPressed}; sf::Event dummyEvent = {sf::Event::KeyPressed};
short choice;
switch(item_hit) { switch(item_hit) {
case eMenu::NONE: break; case eMenu::NONE: break;

2
src/game/boe.startup.cpp
View File

@@ -129,7 +129,7 @@ bool handle_startup_press(location the_point) {
return false; return false;
} }
void handle_splash_events(cFramerateLimiter& fps_limiter) { static void handle_splash_events(cFramerateLimiter& fps_limiter) {
sf::Event event; sf::Event event;
while(mainPtr.pollEvent(event)) { while(mainPtr.pollEvent(event)) {
if(event.type == sf::Event::GainedFocus || event.type == sf::Event::MouseMoved) if(event.type == sf::Event::GainedFocus || event.type == sf::Event::MouseMoved)

1
src/gfx/render_text.cpp
View File

@@ -93,7 +93,6 @@ break_info_t calculate_line_wrapping(rectangle dest_rect, std::string str, TextS
break_info_t break_info; break_info_t break_info;
if(str.empty()) return break_info; // Nothing to do! if(str.empty()) return break_info; // Nothing to do!
short line_height = style.lineHeight;
sf::Text str_to_draw; sf::Text str_to_draw;
style.applyTo(str_to_draw); style.applyTo(str_to_draw);
short str_len = str.length(); short str_len = str.length();