diff options
| author | Johan Althoff <teetow@gmail.com> | 2007-07-13 21:22:45 +0000 |
|---|---|---|
| committer | Johan Althoff <teetow@gmail.com> | 2007-07-13 21:22:45 +0000 |
| commit | 519e644a6258b06ac1836b5da0a575205dd0dbea (patch) | |
| tree | bc6bb21fa308adc82e707917e0824ca565c8d9d8 /src/game | |
| parent | 64d55a22ee74f06738715858d2f88988b046ead0 (diff) | |
| download | zcatch-519e644a6258b06ac1836b5da0a575205dd0dbea.tar.gz zcatch-519e644a6258b06ac1836b5da0a575205dd0dbea.zip | |
fixed various warnings on windows
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/client/menu.cpp | 8 | ||||
| -rw-r--r-- | src/game/game.h | 2 | ||||
| -rw-r--r-- | src/game/server/game_server.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp index c8c41e4b..acb4ebfb 100644 --- a/src/game/client/menu.cpp +++ b/src/game/client/menu.cpp @@ -1024,13 +1024,13 @@ static int editor_screen_render() // less if (ui_do_button((void *)(200 + i * 2), "", 0, 650, 35 * i + 10 + 15, 16, 16, draw_single_part_button, (void *)slider_big_arrow_left)) { - current_font->m_CharStartTable[(int)s[0]] -= 0.01; + current_font->m_CharStartTable[(int)s[0]] -= 0.01f; } // more if (ui_do_button((void *)(200 + i * 2 + 1), "", 0, 666, 35 * i + 10 + 15, 16, 16, draw_single_part_button, (void *)slider_big_arrow_right)) { - current_font->m_CharStartTable[(int)s[0]] += 0.01; + current_font->m_CharStartTable[(int)s[0]] += 0.01f; } char num[16]; @@ -1043,13 +1043,13 @@ static int editor_screen_render() // less if (ui_do_button((void *)(300 + i * 2), "", 0, 750, 35 * i + 10 + 15, 16, 16, draw_single_part_button, (void *)slider_big_arrow_left)) { - current_font->m_CharEndTable[(int)s[0]] -= 0.01; + current_font->m_CharEndTable[(int)s[0]] -= 0.01f; } // more if (ui_do_button((void *)(300 + i * 2 + 1), "", 0, 766, 35 * i + 10 + 15, 16, 16, draw_single_part_button, (void *)slider_big_arrow_right)) { - current_font->m_CharEndTable[(int)s[0]] += 0.01; + current_font->m_CharEndTable[(int)s[0]] += 0.01f; } sprintf(num, "(%f)", current_font->m_CharEndTable[(int)s[0]]); diff --git a/src/game/game.h b/src/game/game.h index a1471887..9b21a4ed 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -18,7 +18,7 @@ inline float get_angle(baselib::vec2 dir) return a; } -inline bool col_check_point(float x, float y) { return col_check_point((int)x, (int)y); } +inline bool col_check_point(float x, float y) { return col_check_point((int)x, (int)y) != 0; } inline bool col_check_point(baselib::vec2 p) { return col_check_point(p.x, p.y); } // Network stuff diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp index 88cbb471..f86b56af 100644 --- a/src/game/server/game_server.cpp +++ b/src/game/server/game_server.cpp @@ -516,7 +516,7 @@ public: if(num) { mapres_spawnpoint *sp = (mapres_spawnpoint*)map_get_item(start + (rand()%num), NULL, NULL); - pos = vec2(sp->x, sp->y); + pos = vec2((float)sp->x, (float)sp->y); } else pos = vec2(100.0f, -60.0f); |