Merge branch 'div0-stable' into nitroxis/irc

Conflicts:
	dpdefs/menudefs.qc
	prvm_cmds.c
	prvm_cmds.h

diff --cc .DS_Store
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..980d0f5c43ffe6ea440a75debe6d29873d3eb8e9
new file mode 100644 (file)
Binary files differ

diff --cc console.c
Simple merge

diff --cc dpdefs/menudefs.qc
index 46e7fe97b169d79540df1fe060e8724d70a28faf,cb7ef55abb6ef01f1ccf952446fb8089e44d8490..a9e55d5251b824e4372b0fb738beb902c36c16ce
--- 1/dpdefs/menudefs.qc
--- 2/dpdefs/menudefs.qc
+++ b/dpdefs/menudefs.qc
@@@ -530,11 -530,12 +530,17 @@@ float FIELD_FUNCTION = 6
  //getentityfieldstring returns data as would be written to a savegame, eg... "0.05" (float), "0 0 1" (vector), or "Hello World!" (string). Function names can also be returned.
  //putentityfieldstring puts the data returned by getentityfieldstring back into the entity.
  
 +//IRC
 +void irc_connect() = #550;
 +void irc_disconnect() = #551;
 +void irc_write(string line) = #552;
 +
+ //DP_COVERAGE
+ //idea: divVerent
+ //darkplaces implementation: divVerent
+ //function definitions:
+ void coverage() = #642;  // Reports a coverage event. The engine counts for each of the calls to this builtin whether it has been called.
+ 
  // assorted undocumented extensions
  string(string, float) netaddress_resolve = #625;
  string(string search, string replace, string subject) strreplace = #484;

diff --cc makefile.inc
Simple merge

diff --cc prvm_cmds.c
index f8366039f7a8a9c0f0463ee8e2bb0a4054cc6122,187930b23835891bd0f4d881c252251d46b4966f..da7e4fcfa22f3f04d54ddd963b20a988bbaab178
--- 1/prvm_cmds.c
--- 2/prvm_cmds.c
+++ b/prvm_cmds.c
@@@ -7342,21 -7342,10 +7343,28 @@@ void VM_physics_addtorque(prvm_prog_t *
        VM_physics_ApplyCmd(ed, &f);
  }
  
- 
 +void VM_irc_connect(prvm_prog_t *prog)
 +{
 +      IRC_Connect();
 +}
 +
 +void VM_irc_disconnect(prvm_prog_t *prog)
 +{
 +      IRC_Disconnect();
 +}
 +
 +void VM_irc_write(prvm_prog_t *prog)
 +{
 +      char string[VM_STRINGTEMP_LENGTH];
 +
 +      VM_VarString(prog, 0, string, sizeof(string));
 +      IRC_AddMessage(string);
- }
++}
++
+ extern cvar_t prvm_coverage;
+ void VM_coverage(prvm_prog_t *prog)
+ {
+       VM_SAFEPARMCOUNT(0, VM_coverage);
+       if (prog->explicit_profile[prog->xstatement]++ == 0 && (prvm_coverage.integer & 2))
+               PRVM_ExplicitCoverageEvent(prog, prog->xfunction, prog->xstatement);
+ }

diff --cc prvm_cmds.h
index 143319a7ce8371945fdfe7905f643d805a22bbfc,708a3621151c07e70a88b39e3e2224b12e161658..60b930ce2b21c542bd3ea82fd78aba775b8bb681
--- 1/prvm_cmds.h
--- 2/prvm_cmds.h
+++ b/prvm_cmds.h
@@@ -484,8 -488,6 +488,11 @@@ void VM_physics_enable(prvm_prog_t *pro
  void VM_physics_addforce(prvm_prog_t *prog);
  void VM_physics_addtorque(prvm_prog_t *prog);
  
 +// irc
 +void VM_irc_connect(prvm_prog_t *prog);
 +void VM_irc_disconnect(prvm_prog_t *prog);
 +void VM_irc_write(prvm_prog_t *prog);
++
+ void VM_coverage(prvm_prog_t *prog);
+ 
  #endif

diff --cc prvm_offsets.h
Simple merge

diff --cc svvm_cmds.c
Simple merge