a lot of changes. client side prediction added

2 files changed, 41 insertions, 6 deletions

diff --git a/src/tools/crapnet.cpp b/src/tools/crapnet.cpp
index 5b7adf52..1c5e3dc3 100644
--- a/src/tools/crapnet.cpp
+++ b/src/tools/crapnet.cpp
@@ -38,8 +38,8 @@ int run(int port, NETADDR4 dest)
 			if(bytes <= 0)
 				break;
 				
-			if((rand()%10) == 0) // drop the packet
-				continue;
+			//if((rand()%10) == 0) // drop the packet
+			//	continue;
 
 			// create new packet				
 			packet *p = (packet *)mem_alloc(sizeof(packet)+bytes, 1);
@@ -100,13 +100,13 @@ int run(int port, NETADDR4 dest)
 				net_udp4_send(socket, &p->send_to, p->data, p->data_size);
 				
 				// update lag
-				double flux = rand()/(double)RAND_MAX;
+				double flux = 0; //rand()/(double)RAND_MAX;
 				int ms_spike = 0;
-				int ms_flux = 20;
-				int ms_ping = 20;
+				int ms_flux = 00;
+				int ms_ping = 100;
 				current_latency = ((time_freq()*ms_ping)/1000) + (int64)(((time_freq()*ms_flux)/1000)*flux); // 50ms
 				
-				if((p->id%100) == 0)
+				if(ms_spike && (p->id%100) == 0)
 					current_latency += (time_freq()*ms_spike)/1000;
 
 				mem_free(p);
diff --git a/src/tools/map_resave.c b/src/tools/map_resave.c
new file mode 100644
index 00000000..91ed09a1
--- /dev/null
+++ b/src/tools/map_resave.c
@@ -0,0 +1,35 @@
+#include <engine/datafile.h>
+
+int main(int argc, char **argv)
+{
+	int i, id, type, size;
+	void *ptr;
+	DATAFILE *df;
+	DATAFILE_OUT *df_out;
+
+	if(argc != 3)
+		return -1;
+
+	df = datafile_load(argv[1]);
+	df_out = datafile_create(argv[2]);
+
+	/* add all items */
+	for(i = 0; i < datafile_num_items(df); i++)
+	{
+		ptr = datafile_get_item(df, i, &type, &id);
+		size = datafile_get_itemsize(df, i);
+		datafile_add_item(df_out, type, id, size, ptr);
+	}
+
+	/* add all data */
+	for(i = 0; i < datafile_num_data(df); i++)
+	{
+		ptr = datafile_get_data(df, i);
+		size = datafile_get_datasize(df, i);
+		datafile_add_data(df_out, size, ptr);
+	}
+
+	datafile_unload(df);
+	datafile_finish(df_out);
+	return 0;
+}