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

# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/daja77/ppracer/disabling_broken_assertions.patch
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./src/string_util.cpp.vanilla 2005-02-27 18:22:19.729140224 +0100
+++ ./src/string_util.cpp 2005-02-27 18:23:49.767452320 +0100
@@ -21,6 +21,7 @@
#include "debug.h"
#include "error_util.h"
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -29,7 +30,7 @@
{
char *dest;
- check_assertion( src != NULL, "string NULL in string_copy" );
+ // check_assertion( src != NULL, "string NULL in string_copy" );
dest = (char *) malloc( sizeof(char) * ( strlen( src ) + 1 ) );
--- ./src/phys_sim.cpp.vanilla 2005-02-27 18:16:20.635730720 +0100
+++ ./src/phys_sim.cpp 2005-02-27 18:16:47.150699832 +0100
@@ -1381,9 +1381,10 @@
if ( fabs( fric_f_mag * sin( ANGLES_TO_RADIANS( steer_angle ) ) ) >
MAX_TURN_PERPENDICULAR_FORCE )
{
- check_assertion( fabs( plyr->control.turn_fact ) > 0,
+ /*check_assertion( fabs( plyr->control.turn_fact ) > 0,
"steer angle is non-zero when player is not "
"turning" );
+ */
steer_angle = RADIANS_TO_ANGLES(
asin( MAX_TURN_PERPENDICULAR_FORCE / fric_f_mag ) ) *
plyr.control.turn_fact / fabs( plyr.control.turn_fact );
--- ./src/hier_util.cpp.vanilla 2005-02-27 18:14:22.038760200 +0100
+++ ./src/hier_util.cpp 2005-02-27 18:14:42.123706824 +0100
@@ -250,7 +250,7 @@
pp::Vec3d normal, v1, v2;
double old_len;
- check_assertion( p.num_vertices > 2, "number of vertices must be > 2" );
+// check_assertion( p.num_vertices > 2, "number of vertices must be > 2" );
v1 = v[p.vertices[1]] - v[p.vertices[0]];
v2 = v[p.vertices[p.numVertices-1]] - v[p.vertices[0]];
--- ./src/ppgltk/audio/audio_data.cpp.vanilla 2005-02-27 18:02:43.376972936 +0100
+++ ./src/ppgltk/audio/audio_data.cpp 2005-02-27 18:07:37.106319288 +0100
@@ -123,9 +123,10 @@
/* Make sure it's there */
- check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
+/* check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
( record_ptr == temp_record_ptr ),
"failed addition to hash table" );
+*/
temp_record_ptr = NULL; /* to prevent warnings when assert turned off */
sound_dirty_ = true;
@@ -209,9 +210,10 @@
musicTable[name] = *mrec;
/* Make sure it's there */
- check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
+/* check_assertion( get_hash_entry( hash, name, (void*) &temp_record_ptr ) &&
( record_ptr == temp_record_ptr ),
"failed addition to hash table" );
+*/
temp_record_ptr = NULL; /* to prevent warnings when assert turned off */
@@ -333,7 +335,7 @@
{
std::map<std::string,sound_record_t>::iterator srec;
if((srec=soundTable.find(name))==soundTable.end()){
- check_assertion( found, "hashtable entry not found" );
+ // check_assertion( found, "hashtable entry not found" );
}
srec->second.ref_ctr++;
@@ -355,7 +357,7 @@
{
std::map<std::string,sound_record_t>::iterator srec;
if((srec=soundTable.find(name))==soundTable.end()){
- check_assertion( found, "hashtable entry not found" );
+// check_assertion( found, "hashtable entry not found" );
}
srec->second.ref_ctr--;
@@ -461,7 +463,7 @@
bool
is_sound_data_dirty()
{
- check_assertion( initialized_, "audio_data module not initialized" );
+ //check_assertion( initialized_, "audio_data module not initialized" );
return sound_dirty_;
}
@@ -481,7 +483,7 @@
bool
is_music_data_dirty()
{
- check_assertion( initialized_, "audio_data module not initialized" );
+ //check_assertion( initialized_, "audio_data module not initialized" );
return music_dirty_;
}
@@ -499,7 +501,7 @@
void
mark_sound_data_clean()
{
- check_assertion( initialized_, "audio_data module not initialized" );
+ //check_assertion( initialized_, "audio_data module not initialized" );
sound_dirty_ = false;
}
@@ -517,7 +519,7 @@
void
mark_music_data_clean()
{
- check_assertion( initialized_, "audio_data module not initialized" );
+ //check_assertion( initialized_, "audio_data module not initialized" );
music_dirty_ = false;
}
@@ -537,7 +539,7 @@
{
Tcl_Obj *result;
- check_assertion( initialized_, "audio_data module not initialized" );
+ //check_assertion( initialized_, "audio_data module not initialized" );
if ( argc != 3 ) {
Tcl_AppendResult(ip, argv[0], ": invalid number of arguments\n",
@@ -565,7 +567,7 @@
{
Tcl_Obj *result;
- check_assertion( initialized_, "audio_data module not initialized" );
+ //check_assertion( initialized_, "audio_data module not initialized" );
if ( argc != 3 ) {
Tcl_AppendResult(ip, argv[0], ": invalid number of arguments\n",