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.

161 lines
5.5 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/daja77/ppracer/disabling_broken_assertions.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./src/string_util.cpp.vanilla 2005-02-27 18:22:19.729140224 +0100
  20. +++ ./src/string_util.cpp 2005-02-27 18:23:49.767452320 +0100
  21. @@ -21,6 +21,7 @@
  22. #include "debug.h"
  23. #include "error_util.h"
  24. +#include <stdio.h>
  25. #include <stdlib.h>
  26. #include <string.h>
  27. @@ -29,7 +30,7 @@
  28. {
  29. char *dest;
  30. - check_assertion( src != NULL, "string NULL in string_copy" );
  31. + // check_assertion( src != NULL, "string NULL in string_copy" );
  32. dest = (char *) malloc( sizeof(char) * ( strlen( src ) + 1 ) );
  33. --- ./src/phys_sim.cpp.vanilla 2005-02-27 18:16:20.635730720 +0100
  34. +++ ./src/phys_sim.cpp 2005-02-27 18:16:47.150699832 +0100
  35. @@ -1381,9 +1381,10 @@
  36. if ( fabs( fric_f_mag * sin( ANGLES_TO_RADIANS( steer_angle ) ) ) >
  37. MAX_TURN_PERPENDICULAR_FORCE )
  38. {
  39. - check_assertion( fabs( plyr->control.turn_fact ) > 0,
  40. + /*check_assertion( fabs( plyr->control.turn_fact ) > 0,
  41. "steer angle is non-zero when player is not "
  42. "turning" );
  43. + */
  44. steer_angle = RADIANS_TO_ANGLES(
  45. asin( MAX_TURN_PERPENDICULAR_FORCE / fric_f_mag ) ) *
  46. plyr.control.turn_fact / fabs( plyr.control.turn_fact );
  47. --- ./src/hier_util.cpp.vanilla 2005-02-27 18:14:22.038760200 +0100
  48. +++ ./src/hier_util.cpp 2005-02-27 18:14:42.123706824 +0100
  49. @@ -250,7 +250,7 @@
  50. pp::Vec3d normal, v1, v2;
  51. double old_len;
  52. - check_assertion( p.num_vertices > 2, "number of vertices must be > 2" );
  53. +// check_assertion( p.num_vertices > 2, "number of vertices must be > 2" );
  54. v1 = v[p.vertices[1]] - v[p.vertices[0]];
  55. v2 = v[p.vertices[p.numVertices-1]] - v[p.vertices[0]];
  56. --- ./src/ppgltk/audio/audio_data.cpp.vanilla 2005-02-27 18:02:43.376972936 +0100
  57. +++ ./src/ppgltk/audio/audio_data.cpp 2005-02-27 18:07:37.106319288 +0100
  58. @@ -123,9 +123,10 @@
  59. /* Make sure it's there */
  60. - check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
  61. +/* check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
  62. ( record_ptr == temp_record_ptr ),
  63. "failed addition to hash table" );
  64. +*/
  65. temp_record_ptr = NULL; /* to prevent warnings when assert turned off */
  66. sound_dirty_ = true;
  67. @@ -209,9 +210,10 @@
  68. musicTable[name] = *mrec;
  69. /* Make sure it's there */
  70. - check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
  71. +/* check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
  72. ( record_ptr == temp_record_ptr ),
  73. "failed addition to hash table" );
  74. +*/
  75. temp_record_ptr = NULL; /* to prevent warnings when assert turned off */
  76. @@ -333,7 +335,7 @@
  77. {
  78. std::map<std::string,sound_record_t>::iterator srec;
  79. if((srec=soundTable.find(name))==soundTable.end()){
  80. - check_assertion( found, "hashtable entry not found" );
  81. + // check_assertion( found, "hashtable entry not found" );
  82. }
  83. srec->second.ref_ctr++;
  84. @@ -355,7 +357,7 @@
  85. {
  86. std::map<std::string,sound_record_t>::iterator srec;
  87. if((srec=soundTable.find(name))==soundTable.end()){
  88. - check_assertion( found, "hashtable entry not found" );
  89. +// check_assertion( found, "hashtable entry not found" );
  90. }
  91. srec->second.ref_ctr--;
  92. @@ -461,7 +463,7 @@
  93. bool
  94. is_sound_data_dirty()
  95. {
  96. - check_assertion( initialized_, "audio_data module not initialized" );
  97. + //check_assertion( initialized_, "audio_data module not initialized" );
  98. return sound_dirty_;
  99. }
  100. @@ -481,7 +483,7 @@
  101. bool
  102. is_music_data_dirty()
  103. {
  104. - check_assertion( initialized_, "audio_data module not initialized" );
  105. + //check_assertion( initialized_, "audio_data module not initialized" );
  106. return music_dirty_;
  107. }
  108. @@ -499,7 +501,7 @@
  109. void
  110. mark_sound_data_clean()
  111. {
  112. - check_assertion( initialized_, "audio_data module not initialized" );
  113. + //check_assertion( initialized_, "audio_data module not initialized" );
  114. sound_dirty_ = false;
  115. }
  116. @@ -517,7 +519,7 @@
  117. void
  118. mark_music_data_clean()
  119. {
  120. - check_assertion( initialized_, "audio_data module not initialized" );
  121. + //check_assertion( initialized_, "audio_data module not initialized" );
  122. music_dirty_ = false;
  123. }
  124. @@ -537,7 +539,7 @@
  125. {
  126. Tcl_Obj *result;
  127. - check_assertion( initialized_, "audio_data module not initialized" );
  128. + //check_assertion( initialized_, "audio_data module not initialized" );
  129. if ( argc != 3 ) {
  130. Tcl_AppendResult(ip, argv[0], ": invalid number of arguments\n",
  131. @@ -565,7 +567,7 @@
  132. {
  133. Tcl_Obj *result;
  134. - check_assertion( initialized_, "audio_data module not initialized" );
  135. + //check_assertion( initialized_, "audio_data module not initialized" );
  136. if ( argc != 3 ) {
  137. Tcl_AppendResult(ip, argv[0], ": invalid number of arguments\n",