diff -Naur SearchAndRescue-0.8.2/sar/disk.cpp SearchAndRescue-0.8.2.gcc4/sar/disk.cpp
--- SearchAndRescue-0.8.2/sar/disk.cpp 2004-08-06 00:34:14.000000000 +0200
+++ SearchAndRescue-0.8.2.gcc4/sar/disk.cpp 2006-08-01 11:19:57.000000000 +0200
@@ -130,12 +130,7 @@
if(path == NULL)
return(0);
- // Dan S: typecast is due to const.
-#if defined(__cplusplus) || defined(c_plusplus)
- while(ISBLANK(reinterpret_cast<char>(*path)))
-#else
while(ISBLANK(*path))
-#endif
path++;
return(*path == DIR_DELIMINATOR);
diff -Naur SearchAndRescue-0.8.2/sar/gctl.c SearchAndRescue-0.8.2.gcc4/sar/gctl.c
--- SearchAndRescue-0.8.2/sar/gctl.c 2004-08-06 00:34:14.000000000 +0200
+++ SearchAndRescue-0.8.2.gcc4/sar/gctl.c 2006-08-01 11:58:56.000000000 +0200
@@ -1,4 +1,5 @@
#include <stdlib.h>
+#include <stdio.h>
#include <sys/types.h>
#ifdef JS_SUPPORT
# include <jsw.h>
diff -Naur SearchAndRescue-0.8.2/sar/menu.c SearchAndRescue-0.8.2.gcc4/sar/menu.c
--- SearchAndRescue-0.8.2/sar/menu.c 2004-08-06 00:34:15.000000000 +0200
+++ SearchAndRescue-0.8.2.gcc4/sar/menu.c 2006-08-01 11:25:30.000000000 +0200
@@ -701,7 +701,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)label_ptr = SAR_MENU_LABEL(calloc(
+ m->object[n] = label_ptr = SAR_MENU_LABEL(calloc(
1, sizeof(sar_menu_label_struct)
));
if(label_ptr == NULL)
@@ -780,7 +780,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)button = SAR_MENU_BUTTON(calloc(
+ m->object[n] = button = SAR_MENU_BUTTON(calloc(
1, sizeof(sar_menu_button_struct)
));
if(button == NULL)
@@ -861,7 +861,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)pb = SAR_MENU_PROGRESS(calloc(
+ m->object[n] = pb = SAR_MENU_PROGRESS(calloc(
1, sizeof(sar_menu_progress_struct)
));
if(pb == NULL)
@@ -964,7 +964,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)mesgbox = SAR_MENU_MESSAGE_BOX(calloc(
+ m->object[n] = mesgbox = SAR_MENU_MESSAGE_BOX(calloc(
1, sizeof(sar_menu_message_box_struct)
));
if(mesgbox == NULL)
@@ -1078,7 +1078,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)list = SAR_MENU_LIST(calloc(
+ m->object[n] = list = SAR_MENU_LIST(calloc(
1, sizeof(sar_menu_list_struct)
));
if(list == NULL)
@@ -1326,7 +1326,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)mdpy = SAR_MENU_MDISPLAY(calloc(
+ m->object[n] = mdpy = SAR_MENU_MDISPLAY(calloc(
1, sizeof(sar_menu_mdisplay_struct)
));
if(mdpy == NULL)
@@ -1416,7 +1416,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)sw = SAR_MENU_SWITCH(calloc(
+ m->object[n] = sw = SAR_MENU_SWITCH(calloc(
1, sizeof(sar_menu_switch_struct)
));
if(sw == NULL)
@@ -1556,7 +1556,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)spin = SAR_MENU_SPIN(calloc(
+ m->object[n] = spin = SAR_MENU_SPIN(calloc(
1, sizeof(sar_menu_spin_struct)
));
if(spin == NULL)
@@ -2010,7 +2010,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)slider = SAR_MENU_SLIDER(calloc(
+ m->object[n] = slider = SAR_MENU_SLIDER(calloc(
1, sizeof(sar_menu_slider_struct)
));
if(slider == NULL)
diff -Naur SearchAndRescue-0.8.2/sar/menumap.c SearchAndRescue-0.8.2.gcc4/sar/menumap.c
--- SearchAndRescue-0.8.2/sar/menumap.c 2004-08-06 00:34:15.000000000 +0200
+++ SearchAndRescue-0.8.2.gcc4/sar/menumap.c 2006-08-01 11:25:43.000000000 +0200
@@ -279,7 +279,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)map = SAR_MENU_MAP(calloc(
+ m->object[n] = map = SAR_MENU_MAP(calloc(
1, sizeof(sar_menu_map_struct)
));
if(map == NULL)
diff -Naur SearchAndRescue-0.8.2/sar/menuobjview.c SearchAndRescue-0.8.2.gcc4/sar/menuobjview.c
--- SearchAndRescue-0.8.2/sar/menuobjview.c 2004-08-06 00:34:15.000000000 +0200
+++ SearchAndRescue-0.8.2.gcc4/sar/menuobjview.c 2006-08-01 11:26:07.000000000 +0200
@@ -151,7 +151,7 @@
}
/* Allocate structure */
- m->object[n] = (void *)objview = SAR_MENU_OBJVIEW(calloc(
+ m->object[n] = objview = SAR_MENU_OBJVIEW(calloc(
1, sizeof(sar_menu_objview_struct)
));
if(objview == NULL)
diff -Naur SearchAndRescue-0.8.2/sar/sarfioopen.c SearchAndRescue-0.8.2.gcc4/sar/sarfioopen.c
--- SearchAndRescue-0.8.2/sar/sarfioopen.c 2004-08-06 00:34:16.000000000 +0200
+++ SearchAndRescue-0.8.2.gcc4/sar/sarfioopen.c 2006-08-01 11:50:35.000000000 +0200
@@ -269,10 +269,9 @@
FILTER_CHECK(SAR_PARM_VERSION)
)
{
+ p = SARParmNew(SAR_PARM_VERSION);
sar_parm_version_struct *pv =
- (sar_parm_version_struct *)p = SARParmNew(
- SAR_PARM_VERSION
- );
+ (sar_parm_version_struct *)p;
cstrptr = val_str;
pv->major = ATOI(cstrptr);
@@ -294,10 +293,9 @@
FILTER_CHECK(SAR_PARM_NAME)
)
{
+ p = SARParmNew(SAR_PARM_NAME);
sar_parm_name_struct *pv =
- (sar_parm_name_struct *)p = SARParmNew(
- SAR_PARM_NAME
- );
+ (sar_parm_name_struct *)p;
free(pv->name);
pv->name = STRDUP(val_str);
@@ -310,10 +308,9 @@
) && FILTER_CHECK(SAR_PARM_DESCRIPTION)
)
{
+ p = SARParmNew(SAR_PARM_DESCRIPTION);
sar_parm_description_struct *pv =
- (sar_parm_description_struct *)p = SARParmNew(
- SAR_PARM_DESCRIPTION
- );
+ (sar_parm_description_struct *)p;
free(pv->description);
pv->description = STRDUP(val_str);
@@ -325,10 +322,9 @@
FILTER_CHECK(SAR_PARM_PLAYER_MODEL_FILE)
)
{
+ p = SARParmNew(SAR_PARM_PLAYER_MODEL_FILE);
sar_parm_player_model_file_struct *pv =
- (sar_parm_player_model_file_struct *)p = SARParmNew(
- SAR_PARM_PLAYER_MODEL_FILE
- );
+ (sar_parm_player_model_file_struct *)p;
cstrptr = val_str;
free(pv->file);
@@ -342,10 +338,9 @@
FILTER_CHECK(SAR_PARM_WEATHER)
)
{
+ p = SARParmNew(SAR_PARM_WEATHER);
sar_parm_weather_struct *pv =
- (sar_parm_weather_struct *)p = SARParmNew(
- SAR_PARM_WEATHER
- );
+ (sar_parm_weather_struct *)p;
free(pv->weather_preset_name);
pv->weather_preset_name = STRDUP(val_str);
@@ -360,10 +355,9 @@
)
{
int h, m, s;
+ p = SARParmNew(SAR_PARM_TIME_OF_DAY);
sar_parm_time_of_day_struct *pv =
- (sar_parm_time_of_day_struct *)p = SARParmNew(
- SAR_PARM_TIME_OF_DAY
- );
+ (sar_parm_time_of_day_struct *)p;
cstrptr = val_str;
SARParseTimeOfDay(cstrptr, &h, &m, &s);
@@ -381,10 +375,9 @@
) && FILTER_CHECK(SAR_PARM_REGISTER_LOCATION)
)
{
+ p = SARParmNew(SAR_PARM_REGISTER_LOCATION);
sar_parm_register_location_struct *pv =
- (sar_parm_register_location_struct *)p = SARParmNew(
- SAR_PARM_REGISTER_LOCATION
- );
+ (sar_parm_register_location_struct *)p;
/* Position (xyz) */
cstrptr = val_str;
@@ -417,10 +410,9 @@
) && FILTER_CHECK(SAR_PARM_SCENE_GPS)
)
{
+ p = SARParmNew(SAR_PARM_SCENE_GPS);
sar_parm_scene_gps_struct *pv =
- (sar_parm_scene_gps_struct *)p = SARParmNew(
- SAR_PARM_SCENE_GPS
- );
+ (sar_parm_scene_gps_struct *)p;
/* Center offset in degrees */
cstrptr = val_str;
@@ -439,10 +431,9 @@
FILTER_CHECK(SAR_PARM_SCENE_MAP)
)
{
+ p = SARParmNew(SAR_PARM_SCENE_MAP);
sar_parm_scene_map_struct *pv =
- (sar_parm_scene_map_struct *)p = SARParmNew(
- SAR_PARM_SCENE_MAP
- );
+ (sar_parm_scene_map_struct *)p;
/* Size in meters */
cstrptr = val_str;
@@ -463,10 +454,9 @@
FILTER_CHECK(SAR_PARM_SCENE_ELEVATION)
)
{
+ p = SARParmNew(SAR_PARM_SCENE_ELEVATION);
sar_parm_scene_elevation_struct *pv =
- (sar_parm_scene_elevation_struct *)p = SARParmNew(
- SAR_PARM_SCENE_ELEVATION
- );
+ (sar_parm_scene_elevation_struct *)p;
/* Elevation in meters */
cstrptr = val_str;
@@ -479,10 +469,9 @@
FILTER_CHECK(SAR_PARM_SCENE_CANT)
)
{
+ p = SARParmNew(SAR_PARM_SCENE_CANT);
sar_parm_scene_cant_struct *pv =
- (sar_parm_scene_cant_struct *)p = SARParmNew(
- SAR_PARM_SCENE_CANT
- );
+ (sar_parm_scene_cant_struct *)p;
/* Angle in radians */
cstrptr = val_str;
@@ -495,10 +484,9 @@
FILTER_CHECK(SAR_PARM_SCENE_GROUND_FLAGS)
)
{
+ p = SARParmNew(SAR_PARM_SCENE_GROUND_FLAGS);
sar_parm_scene_ground_flags_struct *pv =
- (sar_parm_scene_ground_flags_struct *)p = SARParmNew(
- SAR_PARM_SCENE_GROUND_FLAGS
- );
+ (sar_parm_scene_ground_flags_struct *)p;
pv->flags = 0;
@@ -521,10 +509,9 @@
FILTER_CHECK(SAR_PARM_SCENE_GROUND_TILE)
)
{
+ p = SARParmNew(SAR_PARM_SCENE_GROUND_TILE);
sar_parm_scene_ground_tile_struct *pv =
- (sar_parm_scene_ground_tile_struct *)p = SARParmNew(
- SAR_PARM_SCENE_GROUND_TILE
- );
+ (sar_parm_scene_ground_tile_struct *)p;
/* Tile size in meters */
cstrptr = val_str;
@@ -559,10 +546,9 @@
FILTER_CHECK(SAR_PARM_TEXTURE_BASE_DIRECTORY)
)
{
+ p = SARParmNew(SAR_PARM_TEXTURE_BASE_DIRECTORY);
sar_parm_texture_base_directory_struct *pv =
- (sar_parm_texture_base_directory_struct *)p = SARParmNew(
- SAR_PARM_TEXTURE_BASE_DIRECTORY
- );
+ (sar_parm_texture_base_directory_struct *)p;
free(pv->directory);
pv->directory = STRDUP(val_str);
@@ -575,10 +561,9 @@
FILTER_CHECK(SAR_PARM_TEXTURE_LOAD)
)
{
+ p = SARParmNew(SAR_PARM_TEXTURE_LOAD);
sar_parm_texture_load_struct *pv =
- (sar_parm_texture_load_struct *)p = SARParmNew(
- SAR_PARM_TEXTURE_LOAD
- );
+ (sar_parm_texture_load_struct *)p;
/* Name */
cstrptr = val_str;
@@ -604,10 +589,9 @@
FILTER_CHECK(SAR_PARM_MISSION_SCENE_FILE)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_SCENE_FILE);
sar_parm_mission_scene_file_struct *pv =
- (sar_parm_mission_scene_file_struct *)p = SARParmNew(
- SAR_PARM_MISSION_SCENE_FILE
- );
+ (sar_parm_mission_scene_file_struct *)p;
free(pv->file);
pv->file = STRDUP(val_str);
@@ -619,10 +603,9 @@
FILTER_CHECK(SAR_PARM_MISSION_NEW_OBJECTIVE)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_NEW_OBJECTIVE);
sar_parm_mission_new_objective_struct *pv =
- (sar_parm_mission_new_objective_struct *)p = SARParmNew(
- SAR_PARM_MISSION_NEW_OBJECTIVE
- );
+ (sar_parm_mission_new_objective_struct *)p;
/* Objective type */
cstrptr = val_str;
@@ -659,10 +642,9 @@
FILTER_CHECK(SAR_PARM_MISSION_TIME_LEFT)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_TIME_LEFT);
sar_parm_mission_time_left_struct *pv =
- (sar_parm_mission_time_left_struct *)p = SARParmNew(
- SAR_PARM_MISSION_TIME_LEFT
- );
+ (sar_parm_mission_time_left_struct *)p;
/* Time left in seconds (note that the type is float) */
cstrptr = val_str;
@@ -675,10 +657,9 @@
FILTER_CHECK(SAR_PARM_MISSION_BEGIN_AT)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_BEGIN_AT);
sar_parm_mission_begin_at_struct *pv =
- (sar_parm_mission_begin_at_struct *)p = SARParmNew(
- SAR_PARM_MISSION_BEGIN_AT
- );
+ (sar_parm_mission_begin_at_struct *)p;
/* Begin at object name */
cstrptr = val_str;
@@ -694,10 +675,9 @@
FILTER_CHECK(SAR_PARM_MISSION_BEGIN_AT_POS)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_BEGIN_AT_POS);
sar_parm_mission_begin_at_pos_struct *pv =
- (sar_parm_mission_begin_at_pos_struct *)p = SARParmNew(
- SAR_PARM_MISSION_BEGIN_AT_POS
- );
+ (sar_parm_mission_begin_at_pos_struct *)p;
/* Position */
cstrptr = val_str;
@@ -722,10 +702,9 @@
FILTER_CHECK(SAR_PARM_MISSION_ARRIVE_AT)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_ARRIVE_AT);
sar_parm_mission_arrive_at_struct *pv =
- (sar_parm_mission_arrive_at_struct *)p = SARParmNew(
- SAR_PARM_MISSION_ARRIVE_AT
- );
+ (sar_parm_mission_arrive_at_struct *)p;
/* Arrive at object name */
cstrptr = val_str;
@@ -741,10 +720,9 @@
FILTER_CHECK(SAR_PARM_MISSION_MESSAGE_SUCCESS)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_MESSAGE_SUCCESS);
sar_parm_mission_message_success_struct *pv =
- (sar_parm_mission_message_success_struct *)p = SARParmNew(
- SAR_PARM_MISSION_MESSAGE_SUCCESS
- );
+ (sar_parm_mission_message_success_struct *)p;
/* Mission success message */
cstrptr = val_str;
@@ -760,10 +738,9 @@
FILTER_CHECK(SAR_PARM_MISSION_MESSAGE_FAIL)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_MESSAGE_FAIL);
sar_parm_mission_message_fail_struct *pv =
- (sar_parm_mission_message_fail_struct *)p = SARParmNew(
- SAR_PARM_MISSION_MESSAGE_FAIL
- );
+ (sar_parm_mission_message_fail_struct *)p;
/* Mission fail message */
cstrptr = val_str;
@@ -779,10 +756,9 @@
FILTER_CHECK(SAR_PARM_MISSION_HUMANS_TALLY)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_HUMANS_TALLY);
sar_parm_mission_humans_tally_struct *pv =
- (sar_parm_mission_humans_tally_struct *)p = SARParmNew(
- SAR_PARM_MISSION_HUMANS_TALLY
- );
+ (sar_parm_mission_humans_tally_struct *)p;
/* Initial humans that need to be rescued (can be less or
* equal to total_humans.
@@ -809,10 +785,9 @@
FILTER_CHECK(SAR_PARM_MISSION_ADD_INTERCEPT)
)
{
+ p = SARParmNew(SAR_PARM_MISSION_ADD_INTERCEPT);
sar_parm_mission_add_intercept_struct *pv =
- (sar_parm_mission_add_intercept_struct *)p = SARParmNew(
- SAR_PARM_MISSION_ADD_INTERCEPT
- );
+ (sar_parm_mission_add_intercept_struct *)p;
/* Reference code */
cstrptr = val_str;
@@ -882,10 +857,9 @@
) && FILTER_CHECK(SAR_PARM_NEW_OBJECT)
)
{
+ p = SARParmNew(SAR_PARM_NEW_OBJECT);
sar_parm_new_object_struct *pv =
- (sar_parm_new_object_struct *)p = SARParmNew(
- SAR_PARM_NEW_OBJECT
- );
+ (sar_parm_new_object_struct *)p;
/* First int is object type */
cstrptr = val_str;
@@ -900,10 +874,9 @@
) && FILTER_CHECK(SAR_PARM_NEW_HELIPAD)
)
{
+ p = SARParmNew(SAR_PARM_NEW_HELIPAD);
sar_parm_new_helipad_struct *pv =
- (sar_parm_new_helipad_struct *)p = SARParmNew(
- SAR_PARM_NEW_HELIPAD
- );
+ (sar_parm_new_helipad_struct *)p;
/* Begin parsing line, format:
*
@@ -1004,10 +977,9 @@
) && FILTER_CHECK(SAR_PARM_NEW_RUNWAY)
)
{
+ p = SARParmNew(SAR_PARM_NEW_RUNWAY);
sar_parm_new_runway_struct *pv =
- (sar_parm_new_runway_struct *)p = SARParmNew(
- SAR_PARM_NEW_RUNWAY
- );
+ (sar_parm_new_runway_struct *)p;
/* Format:
*
@@ -1107,10 +1079,9 @@
) && FILTER_CHECK(SAR_PARM_NEW_HUMAN)
)
{
+ p = SARParmNew(SAR_PARM_NEW_HUMAN);
sar_parm_new_human_struct *pv =
- (sar_parm_new_human_struct *)p = SARParmNew(
- SAR_PARM_NEW_HUMAN
- );
+ (sar_parm_new_human_struct *)p;
/* Begin parsing line, format:
*
@@ -1185,10 +1156,9 @@
) && FILTER_CHECK(SAR_PARM_NEW_FIRE)
)
{
+ p = SARParmNew(SAR_PARM_NEW_FIRE);
sar_parm_new_fire_struct *pv =
- (sar_parm_new_fire_struct *)p = SARParmNew(
- SAR_PARM_NEW_FIRE
- );
+ (sar_parm_new_fire_struct *)p;
/* Begin parsing line, format:
*
@@ -1210,10 +1180,9 @@
) && FILTER_CHECK(SAR_PARM_NEW_SMOKE)
)
{
+ p = SARParmNew(SAR_PARM_NEW_SMOKE);
sar_parm_new_smoke_struct *pv =
- (sar_parm_new_smoke_struct *)p = SARParmNew(
- SAR_PARM_NEW_SMOKE
- );
+ (sar_parm_new_smoke_struct *)p;
/* Begin parsing line, format:
*
@@ -1253,10 +1222,9 @@
) && FILTER_CHECK(SAR_PARM_NEW_PREMODELED)
)
{
+ p = SARParmNew(SAR_PARM_NEW_PREMODELED);
sar_parm_new_premodeled_struct *pv =
- (sar_parm_new_premodeled_struct *)p = SARParmNew(
- SAR_PARM_NEW_PREMODELED
- );
+ (sar_parm_new_premodeled_struct *)p;
/* First argument is model type */
cstrptr = val_str;
@@ -1277,10 +1245,9 @@
FILTER_CHECK(SAR_PARM_SELECT_OBJECT_BY_NAME)
)
{
+ p = SARParmNew(SAR_PARM_SELECT_OBJECT_BY_NAME);
sar_parm_select_object_by_name_struct *pv =
- (sar_parm_select_object_by_name_struct *)p = SARParmNew(
- SAR_PARM_SELECT_OBJECT_BY_NAME
- );
+ (sar_parm_select_object_by_name_struct *)p;
/* Name */
cstrptr = val_str;
@@ -1297,10 +1264,9 @@
FILTER_CHECK(SAR_PARM_MODEL_FILE)
)
{
+ p = SARParmNew(SAR_PARM_MODEL_FILE);
sar_parm_model_file_struct *pv =
- (sar_parm_model_file_struct *)p = SARParmNew(
- SAR_PARM_MODEL_FILE
- );
+ (sar_parm_model_file_struct *)p;
/* File name */
cstrptr = val_str;
@@ -1315,10 +1281,9 @@
FILTER_CHECK(SAR_PARM_RANGE)
)
{
+ p = SARParmNew(SAR_PARM_RANGE);
sar_parm_range_struct *pv =
- (sar_parm_range_struct *)p = SARParmNew(
- SAR_PARM_RANGE
- );
+ (sar_parm_range_struct *)p;
/* Range in meters */
cstrptr = val_str;
@@ -1337,10 +1302,9 @@
FILTER_CHECK(SAR_PARM_RANGE_FAR)
)
{
+ p = SARParmNew(SAR_PARM_RANGE_FAR);
sar_parm_range_far_struct *pv =
- (sar_parm_range_far_struct *)p = SARParmNew(
- SAR_PARM_RANGE_FAR
- );
+ (sar_parm_range_far_struct *)p;
/* Far range in meters */
cstrptr = val_str;
@@ -1360,10 +1324,9 @@
) && FILTER_CHECK(SAR_PARM_TRANSLATE)
)
{
+ p = SARParmNew(SAR_PARM_TRANSLATE);
sar_parm_translate_struct *pv =
- (sar_parm_translate_struct *)p = SARParmNew(
- SAR_PARM_TRANSLATE
- );
+ (sar_parm_translate_struct *)p;
/* Translate in meters */
cstrptr = val_str;
@@ -1381,10 +1344,9 @@
) && FILTER_CHECK(SAR_PARM_TRANSLATE_RANDOM)
)
{
+ p = SARParmNew(SAR_PARM_TRANSLATE_RANDOM);
sar_parm_translate_random_struct *pv =
- (sar_parm_translate_random_struct *)p = SARParmNew(
- SAR_PARM_TRANSLATE_RANDOM
- );
+ (sar_parm_translate_random_struct *)p;
/* Bounds in meters */
cstrptr = val_str;
@@ -1400,10 +1362,9 @@
FILTER_CHECK(SAR_PARM_ROTATE)
)
{
+ p = SARParmNew(SAR_PARM_ROTATE);
sar_parm_rotate_struct *pv =
- (sar_parm_rotate_struct *)p = SARParmNew(
- SAR_PARM_ROTATE
- );
+ (sar_parm_rotate_struct *)p;
/* Rotate in radians */
cstrptr = val_str;
@@ -1420,10 +1381,9 @@
FILTER_CHECK(SAR_PARM_NO_DEPTH_TEST)
)
{
+ p = SARParmNew(SAR_PARM_NO_DEPTH_TEST);
sar_parm_no_depth_test_struct *pv =
- (sar_parm_no_depth_test_struct *)p = SARParmNew(
- SAR_PARM_NO_DEPTH_TEST
- );
+ (sar_parm_no_depth_test_struct *)p;
/* No arguments */
if(pv != NULL)
@@ -1434,10 +1394,9 @@
FILTER_CHECK(SAR_PARM_POLYGON_OFFSET)
)
{
+ p = SARParmNew(SAR_PARM_POLYGON_OFFSET);
sar_parm_polygon_offset_struct *pv =
- (sar_parm_polygon_offset_struct *)p = SARParmNew(
- SAR_PARM_POLYGON_OFFSET
- );
+ (sar_parm_polygon_offset_struct *)p;
/* Reset flags */
pv->flags = SAR_OBJ_FLAG_POLYGON_OFFSET;
@@ -1480,10 +1439,9 @@
FILTER_CHECK(SAR_PARM_CONTACT_BOUNDS_SPHERICAL)
)
{
+ p = SARParmNew(SAR_PARM_CONTACT_BOUNDS_SPHERICAL);
sar_parm_contact_bounds_spherical_struct *pv =
- (sar_parm_contact_bounds_spherical_struct *)p = SARParmNew(
- SAR_PARM_CONTACT_BOUNDS_SPHERICAL
- );
+ (sar_parm_contact_bounds_spherical_struct *)p;
/* Radius in meters */
cstrptr = val_str;
@@ -1502,10 +1460,9 @@
FILTER_CHECK(SAR_PARM_CONTACT_BOUNDS_CYLENDRICAL)
)
{
+ p = SARParmNew(SAR_PARM_CONTACT_BOUNDS_CYLENDRICAL);
sar_parm_contact_bounds_cylendrical_struct *pv =
- (sar_parm_contact_bounds_cylendrical_struct *)p = SARParmNew(
- SAR_PARM_CONTACT_BOUNDS_CYLENDRICAL
- );
+ (sar_parm_contact_bounds_cylendrical_struct *)p;
/* Radius in meters */
cstrptr = val_str;
@@ -1537,10 +1494,9 @@
FILTER_CHECK(SAR_PARM_CONTACT_BOUNDS_RECTANGULAR)
)
{
+ p = SARParmNew(SAR_PARM_CONTACT_BOUNDS_RECTANGULAR);
sar_parm_contact_bounds_rectangular_struct *pv =
- (sar_parm_contact_bounds_rectangular_struct *)p = SARParmNew(
- SAR_PARM_CONTACT_BOUNDS_RECTANGULAR
- );
+ (sar_parm_contact_bounds_rectangular_struct *)p;
/* X min and max */
cstrptr = val_str;
@@ -1588,10 +1544,9 @@
FILTER_CHECK(SAR_PARM_GROUND_ELEVATION)
)
{
+ p = SARParmNew(SAR_PARM_GROUND_ELEVATION);
sar_parm_ground_elevation_struct *pv =
- (sar_parm_ground_elevation_struct *)p = SARParmNew(
- SAR_PARM_GROUND_ELEVATION
- );
+ (sar_parm_ground_elevation_struct *)p;
/* Ground elevation in meters */
cstrptr = val_str;
@@ -1605,10 +1560,9 @@
) && FILTER_CHECK(SAR_PARM_OBJECT_NAME)
)
{
+ p = SARParmNew(SAR_PARM_OBJECT_NAME);
sar_parm_object_name_struct *pv =
- (sar_parm_object_name_struct *)p = SARParmNew(
- SAR_PARM_OBJECT_NAME
- );
+ (sar_parm_object_name_struct *)p;
cstrptr = val_str;
free(pv->name);
@@ -1626,10 +1580,9 @@
) && FILTER_CHECK(SAR_PARM_OBJECT_MAP_DESCRIPTION)
)
{
+ p = SARParmNew(SAR_PARM_OBJECT_MAP_DESCRIPTION);
sar_parm_object_map_description_struct *pv =
- (sar_parm_object_map_description_struct *)p = SARParmNew(
- SAR_PARM_OBJECT_MAP_DESCRIPTION
- );
+ (sar_parm_object_map_description_struct *)p;
cstrptr = val_str;
free(pv->description);
@@ -1644,10 +1597,9 @@
FILTER_CHECK(SAR_PARM_FUEL)
)
{
+ p = SARParmNew(SAR_PARM_FUEL);
sar_parm_fuel_struct *pv =
- (sar_parm_fuel_struct *)p = SARParmNew(
- SAR_PARM_FUEL
- );
+ (sar_parm_fuel_struct *)p;
/* Get fuel values in kg */
cstrptr = val_str;
@@ -1669,10 +1621,9 @@
FILTER_CHECK(SAR_PARM_HITPOINTS)
)
{
+ p = SARParmNew(SAR_PARM_HITPOINTS);
sar_parm_hitpoints_struct *pv =
- (sar_parm_hitpoints_struct *)p = SARParmNew(
- SAR_PARM_HITPOINTS
- );
+ (sar_parm_hitpoints_struct *)p;
/* Get hit point values */
cstrptr = val_str;
@@ -1694,10 +1645,9 @@
FILTER_CHECK(SAR_PARM_ENGINE_STATE)
)
{
+ p = SARParmNew(SAR_PARM_ENGINE_STATE);
sar_parm_engine_state_struct *pv =
- (sar_parm_engine_state_struct *)p = SARParmNew(
- SAR_PARM_ENGINE_STATE
- );
+ (sar_parm_engine_state_struct *)p;
/* Get engine state */
cstrptr = val_str;
@@ -1710,10 +1660,9 @@
FILTER_CHECK(SAR_PARM_PASSENGERS)
)
{
+ p = SARParmNew(SAR_PARM_PASSENGERS);
sar_parm_passengers_struct *pv =
- (sar_parm_passengers_struct *)p = SARParmNew(
- SAR_PARM_PASSENGERS
- );
+ (sar_parm_passengers_struct *)p;
/* Get passenger values */
cstrptr = val_str;
@@ -1737,10 +1686,9 @@
&& FILTER_CHECK(SAR_PARM_RUNWAY_APPROACH_LIGHTING_NORTH)
)
{
+ p = SARParmNew(SAR_PARM_RUNWAY_APPROACH_LIGHTING_NORTH);
sar_parm_runway_approach_lighting_north_struct *pv =
- (sar_parm_runway_approach_lighting_north_struct *)p = SARParmNew(
- SAR_PARM_RUNWAY_APPROACH_LIGHTING_NORTH
- );
+ (sar_parm_runway_approach_lighting_north_struct *)p;
/* Flags */
cstrptr = val_str;
@@ -1775,10 +1723,9 @@
&& FILTER_CHECK(SAR_PARM_RUNWAY_APPROACH_LIGHTING_SOUTH)
)
{
+ p = SARParmNew(SAR_PARM_RUNWAY_APPROACH_LIGHTING_SOUTH);
sar_parm_runway_approach_lighting_south_struct *pv =
- (sar_parm_runway_approach_lighting_south_struct *)p = SARParmNew(
- SAR_PARM_RUNWAY_APPROACH_LIGHTING_SOUTH
- );
+ (sar_parm_runway_approach_lighting_south_struct *)p;
/* Flags */
cstrptr = val_str;
@@ -1814,10 +1761,9 @@
) && FILTER_CHECK(SAR_PARM_HUMAN_MESSAGE_ENTER)
)
{
+ p = SARParmNew(SAR_PARM_HUMAN_MESSAGE_ENTER);
sar_parm_human_message_enter_struct *pv =
- (sar_parm_human_message_enter_struct *)p = SARParmNew(
- SAR_PARM_HUMAN_MESSAGE_ENTER
- );
+ (sar_parm_human_message_enter_struct *)p;
cstrptr = val_str;
free(pv->message);
@@ -1833,10 +1779,9 @@
) && FILTER_CHECK(SAR_PARM_HUMAN_REFERENCE)
)
{
+ p = SARParmNew(SAR_PARM_HUMAN_REFERENCE);
sar_parm_human_reference_struct *pv =
- (sar_parm_human_reference_struct *)p = SARParmNew(
- SAR_PARM_HUMAN_REFERENCE
- );
+ (sar_parm_human_reference_struct *)p;
/* Begin parsing line, format:
*
@@ -2029,9 +1974,9 @@
*/
if(FILTER_CHECK(SAR_PARM_MISSION_LOG_HEADER))
{
+ p = SARParmNew(SAR_PARM_MISSION_LOG_HEADER);
p_mission_log_header =
- (sar_parm_mission_log_header_struct *)p =
- SARParmNew(SAR_PARM_MISSION_LOG_HEADER);
+ (sar_parm_mission_log_header_struct *)p;
DO_ADD_PARM
}
diff -Naur SearchAndRescue-0.8.2/sar/sound.c SearchAndRescue-0.8.2.gcc4/sar/sound.c
--- SearchAndRescue-0.8.2/sar/sound.c 2004-08-06 00:34:18.000000000 +0200
+++ SearchAndRescue-0.8.2.gcc4/sar/sound.c 2006-08-01 11:52:31.000000000 +0200
@@ -230,7 +230,7 @@
* YIDNULL.
*/
#define SET_SND_PLAY_YID_NULL(p) \
- { if((p) != NULL) (snd_play_struct *)(p)->data = (void *)YIDNULL; }
+ { if((p) != NULL) (p)->data = (void *)YIDNULL; }
if(recorder->con != NULL)
{
diff -Naur SearchAndRescue-0.8.2/sar/string.cpp SearchAndRescue-0.8.2.gcc4/sar/string.cpp
--- SearchAndRescue-0.8.2/sar/string.cpp 2004-08-06 00:34:18.000000000 +0200
+++ SearchAndRescue-0.8.2.gcc4/sar/string.cpp 2006-08-01 12:01:11.000000000 +0200
@@ -3,7 +3,6 @@
#include <stdlib.h>
#include <ctype.h>
-extern char *tzname[2];
#include <time.h>
#include "../include/os.h"
