edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed various warnings on windows

Browse source
This commit is contained in:
Johan Althoff 2007-07-13 21:22:45 +00:00
parent 64d55a22ee
commit 519e644a62
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/client/gfx.cpp
View file

@ -49,7 +49,7 @@ static const int MAX_TEXTURES = 128;
static texture_holder textures[MAX_TEXTURES];
static int first_free_texture;
static const char null_texture_data[] = {
static const unsigned char null_texture_data[] = {
0xff,0x00,0x00,0xff, 0xff,0x00,0x00,0xff, 0x00,0xff,0x00,0xff, 0x00,0xff,0x00,0xff,
0xff,0x00,0x00,0xff, 0xff,0x00,0x00,0xff, 0x00,0xff,0x00,0xff, 0x00,0xff,0x00,0xff,
0x00,0x00,0xff,0xff, 0x00,0x00,0xff,0xff, 0xff,0xff,0x00,0xff, 0xff,0xff,0x00,0xff,

2
src/engine/datafile.cpp
View file

@ -68,7 +68,7 @@ datafile *datafile_load(const char *filename)
// TODO: change this header
int header[4];
file.read(header, sizeof(header));
if(((header[0]>>24)&0xff) != 'D' || ((header[0]>>16)&0xff) != 'A' || (header[0]>>8)&0xff != 'T' || (header[0]&0xff)!= 'A')
if(((header[0]>>24)&0xff) != 'D' || ((header[0]>>16)&0xff) != 'A' || ((header[0]>>8)&0xff) != 'T' || (header[0]&0xff) != 'A')
{
dbg_msg("datafile", "wrong signature. %x %x %x %x", header[0], header[1], header[2], header[3]);
return 0;

2
src/engine/network.cpp
View file

@ -305,7 +305,7 @@ static int conn_feed(NETCONNECTION *conn, NETPACKETDATA *p, NETADDR4 *addr)
else if(conn->state == NETWORK_CONNSTATE_CONNECT)
{
// connection made
if(p->flags == NETWORK_PACKETFLAG_CONNECT|NETWORK_PACKETFLAG_ACCEPT)
if(p->flags == (NETWORK_PACKETFLAG_CONNECT|NETWORK_PACKETFLAG_ACCEPT))
{
conn_send(conn, NETWORK_PACKETFLAG_ACCEPT, 0, 0);
conn->state = NETWORK_CONNSTATE_ONLINE;

8
src/game/client/menu.cpp
View file

@ -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]]);

2
src/game/game.h
View file

@ -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

2
src/game/server/game_server.cpp
View file

@ -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);