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/engine | |
| parent | 64d55a22ee74f06738715858d2f88988b046ead0 (diff) | |
| download | zcatch-519e644a6258b06ac1836b5da0a575205dd0dbea.tar.gz zcatch-519e644a6258b06ac1836b5da0a575205dd0dbea.zip | |
fixed various warnings on windows
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/client/gfx.cpp | 2 | ||||
| -rw-r--r-- | src/engine/datafile.cpp | 2 | ||||
| -rw-r--r-- | src/engine/network.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/client/gfx.cpp b/src/engine/client/gfx.cpp index 657d92f0..ba908c68 100644 --- a/src/engine/client/gfx.cpp +++ b/src/engine/client/gfx.cpp @@ -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, diff --git a/src/engine/datafile.cpp b/src/engine/datafile.cpp index 789aa722..5c064819 100644 --- a/src/engine/datafile.cpp +++ b/src/engine/datafile.cpp @@ -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; diff --git a/src/engine/network.cpp b/src/engine/network.cpp index 5402aee7..e95022f9 100644 --- a/src/engine/network.cpp +++ b/src/engine/network.cpp @@ -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; |