mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

142 lines
4.6 KiB

  1. --- ./src/string_util.cpp.vanilla 2005-02-27 18:22:19.729140224 +0100
  2. +++ ./src/string_util.cpp 2005-02-27 18:23:49.767452320 +0100
  3. @@ -21,6 +21,7 @@
  4. #include "debug.h"
  5. #include "error_util.h"
  6. +#include <stdio.h>
  7. #include <stdlib.h>
  8. #include <string.h>
  9. @@ -29,7 +30,7 @@
  10. {
  11. char *dest;
  12. - check_assertion( src != NULL, "string NULL in string_copy" );
  13. + // check_assertion( src != NULL, "string NULL in string_copy" );
  14. dest = (char *) malloc( sizeof(char) * ( strlen( src ) + 1 ) );
  15. --- ./src/phys_sim.cpp.vanilla 2005-02-27 18:16:20.635730720 +0100
  16. +++ ./src/phys_sim.cpp 2005-02-27 18:16:47.150699832 +0100
  17. @@ -1381,9 +1381,10 @@
  18. if ( fabs( fric_f_mag * sin( ANGLES_TO_RADIANS( steer_angle ) ) ) >
  19. MAX_TURN_PERPENDICULAR_FORCE )
  20. {
  21. - check_assertion( fabs( plyr->control.turn_fact ) > 0,
  22. + /*check_assertion( fabs( plyr->control.turn_fact ) > 0,
  23. "steer angle is non-zero when player is not "
  24. "turning" );
  25. + */
  26. steer_angle = RADIANS_TO_ANGLES(
  27. asin( MAX_TURN_PERPENDICULAR_FORCE / fric_f_mag ) ) *
  28. plyr.control.turn_fact / fabs( plyr.control.turn_fact );
  29. --- ./src/hier_util.cpp.vanilla 2005-02-27 18:14:22.038760200 +0100
  30. +++ ./src/hier_util.cpp 2005-02-27 18:14:42.123706824 +0100
  31. @@ -250,7 +250,7 @@
  32. pp::Vec3d normal, v1, v2;
  33. double old_len;
  34. - check_assertion( p.num_vertices > 2, "number of vertices must be > 2" );
  35. +// check_assertion( p.num_vertices > 2, "number of vertices must be > 2" );
  36. v1 = v[p.vertices[1]] - v[p.vertices[0]];
  37. v2 = v[p.vertices[p.numVertices-1]] - v[p.vertices[0]];
  38. --- ./src/ppgltk/audio/audio_data.cpp.vanilla 2005-02-27 18:02:43.376972936 +0100
  39. +++ ./src/ppgltk/audio/audio_data.cpp 2005-02-27 18:07:37.106319288 +0100
  40. @@ -123,9 +123,10 @@
  41. /* Make sure it's there */
  42. - check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
  43. +/* check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
  44. ( record_ptr == temp_record_ptr ),
  45. "failed addition to hash table" );
  46. +*/
  47. temp_record_ptr = NULL; /* to prevent warnings when assert turned off */
  48. sound_dirty_ = true;
  49. @@ -209,9 +210,10 @@
  50. musicTable[name] = *mrec;
  51. /* Make sure it's there */
  52. - check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
  53. +/* check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
  54. ( record_ptr == temp_record_ptr ),
  55. "failed addition to hash table" );
  56. +*/
  57. temp_record_ptr = NULL; /* to prevent warnings when assert turned off */
  58. @@ -333,7 +335,7 @@
  59. {
  60. std::map<std::string,sound_record_t>::iterator srec;
  61. if((srec=soundTable.find(name))==soundTable.end()){
  62. - check_assertion( found, "hashtable entry not found" );
  63. + // check_assertion( found, "hashtable entry not found" );
  64. }
  65. srec->second.ref_ctr++;
  66. @@ -355,7 +357,7 @@
  67. {
  68. std::map<std::string,sound_record_t>::iterator srec;
  69. if((srec=soundTable.find(name))==soundTable.end()){
  70. - check_assertion( found, "hashtable entry not found" );
  71. +// check_assertion( found, "hashtable entry not found" );
  72. }
  73. srec->second.ref_ctr--;
  74. @@ -461,7 +463,7 @@
  75. bool
  76. is_sound_data_dirty()
  77. {
  78. - check_assertion( initialized_, "audio_data module not initialized" );
  79. + //check_assertion( initialized_, "audio_data module not initialized" );
  80. return sound_dirty_;
  81. }
  82. @@ -481,7 +483,7 @@
  83. bool
  84. is_music_data_dirty()
  85. {
  86. - check_assertion( initialized_, "audio_data module not initialized" );
  87. + //check_assertion( initialized_, "audio_data module not initialized" );
  88. return music_dirty_;
  89. }
  90. @@ -499,7 +501,7 @@
  91. void
  92. mark_sound_data_clean()
  93. {
  94. - check_assertion( initialized_, "audio_data module not initialized" );
  95. + //check_assertion( initialized_, "audio_data module not initialized" );
  96. sound_dirty_ = false;
  97. }
  98. @@ -517,7 +519,7 @@
  99. void
  100. mark_music_data_clean()
  101. {
  102. - check_assertion( initialized_, "audio_data module not initialized" );
  103. + //check_assertion( initialized_, "audio_data module not initialized" );
  104. music_dirty_ = false;
  105. }
  106. @@ -537,7 +539,7 @@
  107. {
  108. Tcl_Obj *result;
  109. - check_assertion( initialized_, "audio_data module not initialized" );
  110. + //check_assertion( initialized_, "audio_data module not initialized" );
  111. if ( argc != 3 ) {
  112. Tcl_AppendResult(ip, argv[0], ": invalid number of arguments\n",
  113. @@ -565,7 +567,7 @@
  114. {
  115. Tcl_Obj *result;
  116. - check_assertion( initialized_, "audio_data module not initialized" );
  117. + //check_assertion( initialized_, "audio_data module not initialized" );
  118. if ( argc != 3 ) {
  119. Tcl_AppendResult(ip, argv[0], ": invalid number of arguments\n",