diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/client/game_client.cpp | 4 | ||||
| -rw-r--r-- | src/game/client/mapres_tilemap.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/game_server.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp index e5d874d2..d29c6b7d 100644 --- a/src/game/client/game_client.cpp +++ b/src/game/client/game_client.cpp @@ -422,10 +422,12 @@ static const int killmsg_max = 5; killmsg killmsgs[killmsg_max]; static int killmsg_current = 0; +extern unsigned char internal_data[]; + void modc_init() { // load the data container - data = load_data_container("data/client.dat"); + data = load_data_from_memory(internal_data); // load sounds for(int s = 0; s < data->num_sounds; s++) diff --git a/src/game/client/mapres_tilemap.cpp b/src/game/client/mapres_tilemap.cpp index 197a1a8b..357e8870 100644 --- a/src/game/client/mapres_tilemap.cpp +++ b/src/game/client/mapres_tilemap.cpp @@ -49,7 +49,6 @@ void tilemap_render(float scale, int fg) float frac = (1.0f/1024.0f);//2.0f; //2.0f; float texsize = 1024.0f; float nudge = 0.5f/texsize; - float s = 1.0f; for(int y = 0; y < tmap->height; y++) for(int x = 0; x < tmap->width; x++) @@ -80,7 +79,6 @@ void tilemap_render(float scale, int fg) int py0 = ty*(1024/16); int px1 = (tx+1)*(1024/16)-1; int py1 = (ty+1)*(1024/16)-1; - float z = -5.0f; gfx_quads_setsubset( nudge + px0/texsize+frac, diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp index e063364c..9fb50d4b 100644 --- a/src/game/server/game_server.cpp +++ b/src/game/server/game_server.cpp @@ -1652,9 +1652,11 @@ void mods_message(int msg, int client_id) } } +extern unsigned char internal_data[]; + void mods_init() { - data = load_data_container("data/server.dat"); + data = load_data_from_memory(internal_data); col_init(32); int start, num; |